From 53d9528bdb884091b9b0fa7214b2c1a0e8005dd4 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 29 Oct 2019 17:35:07 +0100
Subject: [PATCH] disable overwriteOnAccept for now, #10266

---
 src/vs/editor/common/config/editorOptions.ts  | 10 +++----
 .../contrib/suggest/suggestController.ts      | 27 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
index a439164b04d..49379f89ceb 100644
--- a/src/vs/editor/common/config/editorOptions.ts
+++ b/src/vs/editor/common/config/editorOptions.ts
@@ -2354,11 +2354,11 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
 		super(
 			EditorOption.suggest, 'suggest', defaults,
 			{
-				'editor.suggest.overwriteOnAccept': {
-					type: 'boolean',
-					default: defaults.overwriteOnAccept,
-					description: nls.localize('suggest.overwriteOnAccept', "Controls whether words are overwritten when accepting completions.")
-				},
+				// 'editor.suggest.overwriteOnAccept': {
+				// 	type: 'boolean',
+				// 	default: defaults.overwriteOnAccept,
+				// 	description: nls.localize('suggest.overwriteOnAccept', "Controls whether words are overwritten when accepting completions.")
+				// },
 				'editor.suggest.filterGraceful': {
 					type: 'boolean',
 					default: defaults.filterGraceful,
diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index 007b89d7203..083c64b123d 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -263,9 +263,10 @@ export class SuggestController implements IEditorContribution {
 			insertText = SnippetParser.escape(insertText);
 		}
 
-		const overwriteConfig = flags & InsertFlags.AlternativeOverwriteConfig
-			? !this._editor.getOption(EditorOption.suggest).overwriteOnAccept
-			: this._editor.getOption(EditorOption.suggest).overwriteOnAccept;
+		// const overwriteConfig = flags & InsertFlags.AlternativeOverwriteConfig
+		// 	? !this._editor.getOption(EditorOption.suggest).overwriteOnAccept
+		// 	: this._editor.getOption(EditorOption.suggest).overwriteOnAccept;
+		const overwriteConfig = false;
 
 		const overwriteBefore = position.column - item.editStart.column;
 		const overwriteAfter = (overwriteConfig ? item.editReplaceEnd.column : item.editInsertEnd.column) - position.column;
@@ -532,16 +533,16 @@ KeybindingsRegistry.registerKeybindingRule({
 	weight
 });
 
-// shift+enter and shift+tab use the alternative-flag so that the suggest controller
-// is doing the opposite of the editor.suggest.overwriteOnAccept-configuration
-KeybindingsRegistry.registerKeybindingRule({
-	id: 'acceptSelectedSuggestion',
-	when: ContextKeyExpr.and(SuggestContext.Visible, EditorContextKeys.textInputFocus),
-	primary: KeyMod.Shift | KeyCode.Tab,
-	secondary: [KeyMod.Shift | KeyCode.Enter],
-	args: { alternative: true },
-	weight
-});
+// // shift+enter and shift+tab use the alternative-flag so that the suggest controller
+// // is doing the opposite of the editor.suggest.overwriteOnAccept-configuration
+// KeybindingsRegistry.registerKeybindingRule({
+// 	id: 'acceptSelectedSuggestion',
+// 	when: ContextKeyExpr.and(SuggestContext.Visible, EditorContextKeys.textInputFocus),
+// 	primary: KeyMod.Shift | KeyCode.Tab,
+// 	secondary: [KeyMod.Shift | KeyCode.Enter],
+// 	args: { alternative: true },
+// 	weight
+// });
 
 // continue to support the old command
 CommandsRegistry.registerCommandAlias('acceptSelectedSuggestionOnEnter', 'acceptSelectedSuggestion');
-- 
GitLab