Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
53d9528b
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
53d9528b
编写于
10月 29, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
disable overwriteOnAccept for now, #10266
上级
0d0ea4b1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
18 deletion
+19
-18
src/vs/editor/common/config/editorOptions.ts
src/vs/editor/common/config/editorOptions.ts
+5
-5
src/vs/editor/contrib/suggest/suggestController.ts
src/vs/editor/contrib/suggest/suggestController.ts
+14
-13
未找到文件。
src/vs/editor/common/config/editorOptions.ts
浏览文件 @
53d9528b
...
...
@@ -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
,
...
...
src/vs/editor/contrib/suggest/suggestController.ts
浏览文件 @
53d9528b
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录