Revert "disable overwriteOnAccept for now, microsoft#10266"

jrieken · jrieken · commit 459d13885091 · 2019-11-01T15:17:20.000+01:00
This reverts commit 53d9528.
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
@@ -2474,11 +2474,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
@@ -263,10 +263,9 @@ 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 = false;
+		const overwriteConfig = flags & InsertFlags.AlternativeOverwriteConfig
+			? !this._editor.getOption(EditorOption.suggest).overwriteOnAccept
+			: this._editor.getOption(EditorOption.suggest).overwriteOnAccept;
 
 		const overwriteBefore = position.column - item.editStart.column;
 		const overwriteAfter = (overwriteConfig ? item.editReplaceEnd.column : item.editInsertEnd.column) - position.column;
@@ -533,16 +532,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');
