editorReplacer -> editorOverride (#16041)

* editorReplacer -> editorOverride

* Update lifecycle phsae

* add back input factories

* Add comment

* add back tests

* comments

* fix log

* comments
This commit is contained in:
Charles Gagnon
2021-07-09 08:46:50 -07:00
committed by GitHub
parent 7ba0e49673
commit 8f202d91b6
19 changed files with 253 additions and 509 deletions

View File

@@ -45,6 +45,7 @@ import { isPromiseCanceledError } from 'vs/base/common/errors';
import { toAction } from 'vs/base/common/actions';
import { EditorOverride } from 'vs/platform/editor/common/editor';
import { hash } from 'vs/base/common/hash';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; // {{SQL CARBON EDIT}} New query command
// Commands
@@ -676,16 +677,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
]
},
handler: async (accessor, args?: { viewType: string }) => {
const editorService = accessor.get(IEditorService);
if (typeof args?.viewType === 'string') {
const editorGroupsService = accessor.get(IEditorGroupsService);
const group = editorGroupsService.activeGroup;
await editorService.openEditor({ options: { override: args.viewType, pinned: true } }, group);
} else {
await editorService.openEditor({ options: { pinned: true } }); // untitled are always pinned
}
// {{SQL CARBON EDIT}} Modify to open untitled query editor
// We don't use the viewType arg since we always want to open a query editor
const queryEditorService = accessor.get(IQueryEditorService);
await queryEditorService.newSqlEditor({ connectWithGlobal: true });
}
});

View File

@@ -438,9 +438,6 @@ import 'sql/workbench/contrib/query/common/resultsGrid.contribution';
import 'sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution';
import 'sql/workbench/contrib/dataExplorer/browser/nodeActions.common.contribution';
//editor replacement
import 'sql/workbench/contrib/editorReplacement/common/editorReplacer.contribution';
//configurationUpgrader replacement
import 'sql/workbench/contrib/configuration/common/configurationUpgrader.contribution';