提交 53d9528b 编写于 作者: J Johannes Rieken

disable overwriteOnAccept for now, #10266

上级 0d0ea4b1
......@@ -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,
......
......@@ -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');
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册