From 9c40bd1a23bf3f37d959d484da8862c40257eabd Mon Sep 17 00:00:00 2001
From: Kevin Cunnane <kcunnane@microsoft.com>
Date: Mon, 20 Aug 2018 11:58:40 -0700
Subject: [PATCH] Fix error where rename controller wasn't in
 InstantiationService (#2243)

---
 src/sql/parts/modelComponents/queryTextEditor.ts | 4 ++--
 src/vs/editor/contrib/rename/rename.ts           | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sql/parts/modelComponents/queryTextEditor.ts b/src/sql/parts/modelComponents/queryTextEditor.ts
index b9e006816c..88bfb20738 100644
--- a/src/sql/parts/modelComponents/queryTextEditor.ts
+++ b/src/sql/parts/modelComponents/queryTextEditor.ts
@@ -24,16 +24,16 @@ import { EditorOptions } from 'vs/workbench/common/editor';
 import { CodeEditor } from 'vs/editor/browser/codeEditor';
 import { IEditorContributionCtor } from 'vs/editor/browser/editorExtensions';
 import { FoldingController } from 'vs/editor/contrib/folding/folding';
+import { RenameController } from 'vs/editor/contrib/rename/rename';
 
 class QueryCodeEditor extends CodeEditor {
 
 	protected _getContributions(): IEditorContributionCtor[] {
 		let contributions = super._getContributions();
-		let skipContributions = [FoldingController.prototype];
+		let skipContributions = [FoldingController.prototype, RenameController.prototype];
 		contributions = contributions.filter(c => skipContributions.indexOf(c.prototype) === -1);
 		return contributions;
 	}
-
 }
 
 /**
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index 8946b8d4ec..bcd8cce15b 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -97,7 +97,8 @@ export async function rename(model: ITextModel, position: Position, newName: str
 
 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';