Fix error where rename controller wasn't in InstantiationService (#2243)

This commit is contained in:
Kevin Cunnane
2018-08-20 11:58:40 -07:00
committed by GitHub
parent dc2193138d
commit 9c40bd1a23
2 changed files with 4 additions and 3 deletions

View File

@@ -24,16 +24,16 @@ import { EditorOptions } from 'vs/workbench/common/editor';
import { CodeEditor } from 'vs/editor/browser/codeEditor'; import { CodeEditor } from 'vs/editor/browser/codeEditor';
import { IEditorContributionCtor } from 'vs/editor/browser/editorExtensions'; import { IEditorContributionCtor } from 'vs/editor/browser/editorExtensions';
import { FoldingController } from 'vs/editor/contrib/folding/folding'; import { FoldingController } from 'vs/editor/contrib/folding/folding';
import { RenameController } from 'vs/editor/contrib/rename/rename';
class QueryCodeEditor extends CodeEditor { class QueryCodeEditor extends CodeEditor {
protected _getContributions(): IEditorContributionCtor[] { protected _getContributions(): IEditorContributionCtor[] {
let contributions = super._getContributions(); let contributions = super._getContributions();
let skipContributions = [FoldingController.prototype]; let skipContributions = [FoldingController.prototype, RenameController.prototype];
contributions = contributions.filter(c => skipContributions.indexOf(c.prototype) === -1); contributions = contributions.filter(c => skipContributions.indexOf(c.prototype) === -1);
return contributions; return contributions;
} }
} }
/** /**

View File

@@ -97,7 +97,8 @@ export async function rename(model: ITextModel, position: Position, newName: str
const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false); const CONTEXT_RENAME_INPUT_VISIBLE = new RawContextKey<boolean>('renameInputVisible', false);
class RenameController implements IEditorContribution { // {{SQL CARBON EDIT}}
export class RenameController implements IEditorContribution {
private static readonly ID = 'editor.contrib.renameController'; private static readonly ID = 'editor.contrib.renameController';