ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 9bc92b48d945144abb405b9e8df05e18accb9148

Browse Source
This commit is contained in:
ADS Merger
2020-02-19 03:11:35 +00:00
parent 98584d32a7
commit 1e308639e5
253 changed files with 6414 additions and 2296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/common/editor/query/queryEditorInput.ts
View File

@@ -166,7 +166,7 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
}
// Getters for private properties
public get uri(): string { return this.getResource()!.toString(true); }
public get uri(): string { return this.resource!.toString(true); }
public get text(): EditorInput { return this._text; }
public get results(): QueryResultsInput { return this._results; }
// Description is shown beside the tab name in the combobox of open editors
@@ -191,7 +191,7 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
// Forwarding resource functions to the inline sql file editor
public isDirty(): boolean { return this._text.isDirty(); }
public getResource(): URI | undefined { return this._text.getResource(); }
public get resource(): URI | undefined { return this._text.resource; }
public matchInputInstanceType(inputType: any): boolean {
return (this._text instanceof inputType);

5
src/sql/workbench/common/editor/query/queryResultsInput.ts
View File

@@ -12,6 +12,7 @@ import { QueryPlanState } from 'sql/workbench/common/editor/query/queryPlanState
import { MessagePanelState } from 'sql/workbench/common/editor/query/messagePanelState';
import { GridPanelState } from 'sql/workbench/common/editor/query/gridPanelState';
import { QueryModelViewState } from 'sql/workbench/common/editor/query/modelViewState';
import { URI } from 'vs/base/common/uri';
export class ResultsViewState {
public readonly gridPanelState: GridPanelState = new GridPanelState();
@@ -89,4 +90,8 @@ export class QueryResultsInput extends EditorInput {
get uri(): string {
return this._uri;
}
get resource(): URI | undefined {
return undefined;
}
}