Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

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

View File

@@ -36,7 +36,7 @@ export class QueryPlanEditorOverrideContribution extends Disposable implements I
}
private registerEditorOverride(): void {
this._editorOverrideService.registerContributionPoint(
this._editorOverrideService.registerEditor(
'*.sqlplan',
{
id: QueryPlanEditor.ID,

View File

@@ -5,7 +5,7 @@
import * as DOM from 'vs/base/browser/dom';
import { localize } from 'vs/nls';
import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
import { IEditorOpenContext } from 'vs/workbench/common/editor';
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -13,6 +13,7 @@ import { QueryPlanInput } from 'sql/workbench/contrib/queryPlan/common/queryPlan
import { CancellationToken } from 'vs/base/common/cancellation';
import { IStorageService } from 'vs/platform/storage/common/storage';
import { QueryPlanView } from 'sql/workbench/contrib/queryPlan/browser/queryPlan';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
export class QueryPlanEditor extends EditorPane {
@@ -55,7 +56,7 @@ export class QueryPlanEditor extends EditorPane {
this.view.layout(dimension);
}
public override async setInput(input: QueryPlanInput, options: EditorOptions, context: IEditorOpenContext): Promise<void> {
public override async setInput(input: QueryPlanInput, options: IEditorOptions, context: IEditorOpenContext): Promise<void> {
if (this.input instanceof QueryPlanInput && this.input.matches(input)) {
return Promise.resolve(undefined);
}

View File

@@ -4,7 +4,8 @@
*--------------------------------------------------------------------------------------------*/
import { URI } from 'vs/base/common/uri';
import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';