ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-17 09:35:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

Browse Source
This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
import { Emitter } from 'vs/base/common/event';
import { URI } from 'vs/base/common/uri';
import { EditorInput, GroupIdentifier, IRevertOptions, ISaveOptions, IEditorInput } from 'vs/workbench/common/editor';
import { GroupIdentifier, IRevertOptions, ISaveOptions, IEditorInput, EditorInputCapabilities } from 'vs/workbench/common/editor';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement';
@@ -15,10 +15,10 @@ import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResult
import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
import { ExecutionPlanOptions } from 'azdata';
import { startsWith } from 'vs/base/common/strings';
import { IRange } from 'vs/editor/common/core/range';
import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
import { IQueryEditorConfiguration } from 'sql/platform/query/common/query';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
const MAX_SIZE = 13;
@@ -183,8 +183,8 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
return this._text.revert(group, options);
}
public override isReadonly(): boolean {
return false;
public override get capabilities(): EditorInputCapabilities {
return EditorInputCapabilities.None;
}
public override matches(otherInput: any): boolean {
@@ -320,6 +320,6 @@ export abstract class QueryEditorInput extends EditorInput implements IConnectab
}
public get isSharedSession(): boolean {
return !!(this.uri && startsWith(this.uri, 'vsls:'));
return !!(this.uri && this.uri.startsWith('vsls:'));
}
}

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

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { localize } from 'vs/nls';
import { EditorInput } from 'vs/workbench/common/editor';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { TopOperationsState } from 'sql/workbench/common/editor/query/topOperationsState';
import { ChartState } from 'sql/workbench/common/editor/query/chartState';

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

@@ -13,6 +13,7 @@ import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverServ
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
import { EncodingMode, IEncodingSupport } from 'vs/workbench/services/textfile/common/textfiles';
import { EditorInputCapabilities } from 'vs/workbench/common/editor';
export class UntitledQueryEditorInput extends QueryEditorInput implements IEncodingSupport {
@@ -61,8 +62,8 @@ export class UntitledQueryEditorInput extends QueryEditorInput implements IEncod
return this.text.setEncoding(encoding, mode);
}
override isUntitled(): boolean {
override get capabilities(): EditorInputCapabilities {
// Subclasses need to explicitly opt-in to being untitled.
return true;
return EditorInputCapabilities.Untitled;
}
}