Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b2092325
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,发现更多精彩内容 >>
提交
b2092325
编写于
3月 16, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
revert wordBasedSuggestions-settings to boolean
上级
b976bcd7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
55 deletion
+9
-55
src/vs/editor/common/config/commonEditorConfig.ts
src/vs/editor/common/config/commonEditorConfig.ts
+1
-20
src/vs/editor/common/config/defaultConfig.ts
src/vs/editor/common/config/defaultConfig.ts
+1
-1
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+3
-3
src/vs/editor/common/services/editorWorkerServiceImpl.ts
src/vs/editor/common/services/editorWorkerServiceImpl.ts
+2
-21
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+2
-10
未找到文件。
src/vs/editor/common/config/commonEditorConfig.ts
浏览文件 @
b2092325
...
...
@@ -780,26 +780,7 @@ const editorConfiguration: IConfigurationNode = {
'
description
'
:
nls
.
localize
(
'
emptySelectionClipboard
'
,
"
Controls whether copying without a selection copies the current line.
"
)
},
'
editor.wordBasedSuggestions
'
:
{
'
anyOf
'
:
[
'
boolean
'
,
{
type
:
'
object
'
,
properties
:
{
strings
:
{
type
:
'
boolean
'
,
description
:
nls
.
localize
(
'
wordBasedSuggestions.strings
'
,
"
Enable word based suggestions inside strings.
"
)
},
comments
:
{
type
:
'
boolean
'
,
description
:
nls
.
localize
(
'
wordBasedSuggestions.comments
'
,
"
Enable word based suggestions inside comments.
"
)
},
other
:
{
type
:
'
boolean
'
,
description
:
nls
.
localize
(
'
wordBasedSuggestions.other
'
,
"
Enable word based suggestions outside of strings and comments.
"
)
},
}
}
],
'
type
'
:
'
boolean
'
,
'
default
'
:
DefaultConfig
.
editor
.
wordBasedSuggestions
,
'
description
'
:
nls
.
localize
(
'
wordBasedSuggestions
'
,
"
Controls whether completions should be computed based on words in the document.
"
)
},
...
...
src/vs/editor/common/config/defaultConfig.ts
浏览文件 @
b2092325
...
...
@@ -98,7 +98,7 @@ class ConfigClass implements IConfiguration {
acceptSuggestionOnCommitCharacter
:
true
,
snippetSuggestions
:
'
bottom
'
,
emptySelectionClipboard
:
true
,
wordBasedSuggestions
:
{
other
:
true
,
strings
:
false
,
comments
:
false
}
,
wordBasedSuggestions
:
true
,
suggestFontSize
:
0
,
suggestLineHeight
:
0
,
selectionHighlight
:
true
,
...
...
src/vs/editor/common/editorCommon.ts
浏览文件 @
b2092325
...
...
@@ -482,7 +482,7 @@ export interface IEditorOptions {
/**
* Enable word based suggestions. Defaults to 'true'
*/
wordBasedSuggestions
?:
boolean
|
{
strings
?:
boolean
,
comments
?:
boolean
,
other
?:
boolean
}
;
wordBasedSuggestions
?:
boolean
;
/**
* The font size for the suggest widget.
* Defaults to the editor font size.
...
...
@@ -1016,7 +1016,7 @@ export class EditorContribOptions {
readonly
acceptSuggestionOnCommitCharacter
:
boolean
;
readonly
snippetSuggestions
:
'
top
'
|
'
bottom
'
|
'
inline
'
|
'
none
'
;
readonly
emptySelectionClipboard
:
boolean
;
readonly
wordBasedSuggestions
:
boolean
|
{
strings
?:
boolean
,
comments
?:
boolean
,
default
?:
boolean
}
;
readonly
wordBasedSuggestions
:
boolean
;
readonly
suggestFontSize
:
number
;
readonly
suggestLineHeight
:
number
;
readonly
selectionHighlight
:
boolean
;
...
...
@@ -1043,7 +1043,7 @@ export class EditorContribOptions {
acceptSuggestionOnCommitCharacter
:
boolean
;
snippetSuggestions
:
'
top
'
|
'
bottom
'
|
'
inline
'
|
'
none
'
;
emptySelectionClipboard
:
boolean
;
wordBasedSuggestions
:
boolean
|
{
strings
?:
boolean
,
comments
?:
boolean
,
default
?:
boolean
}
;
wordBasedSuggestions
:
boolean
;
suggestFontSize
:
number
;
suggestLineHeight
:
number
;
selectionHighlight
:
boolean
;
...
...
src/vs/editor/common/services/editorWorkerServiceImpl.ts
浏览文件 @
b2092325
...
...
@@ -90,29 +90,10 @@ class WordBasedCompletionItemProvider implements modes.ISuggestSupport {
provideCompletionItems
(
model
:
editorCommon
.
IModel
,
position
:
Position
):
TPromise
<
modes
.
ISuggestResult
>
{
const
{
wordBasedSuggestions
}
=
this
.
_configurationService
.
getConfiguration
<
editorCommon
.
IEditorOptions
>
(
'
editor
'
);
if
(
wordBasedSuggestions
===
false
)
{
// simple -> disabled everywhere
if
(
!
wordBasedSuggestions
)
{
return
undefined
;
}
else
if
(
wordBasedSuggestions
===
true
)
{
// simple -> enabled for all tokens
return
this
.
_workerManager
.
withWorker
().
then
(
client
=>
client
.
textualSuggest
(
model
.
uri
,
position
));
}
else
{
// check with token type and config
const
tokens
=
model
.
getLineTokens
(
position
.
lineNumber
);
const
{
tokenType
}
=
tokens
.
findTokenAtOffset
(
position
.
column
-
1
);
const
shoudSuggestHere
=
(
tokenType
===
modes
.
StandardTokenType
.
Comment
&&
wordBasedSuggestions
.
comments
)
||
(
tokenType
===
modes
.
StandardTokenType
.
String
&&
wordBasedSuggestions
.
strings
)
||
(
tokenType
===
modes
.
StandardTokenType
.
Other
&&
wordBasedSuggestions
.
other
);
if
(
shoudSuggestHere
)
{
return
this
.
_workerManager
.
withWorker
().
then
(
client
=>
client
.
textualSuggest
(
model
.
uri
,
position
));
}
else
{
return
undefined
;
}
}
return
this
.
_workerManager
.
withWorker
().
then
(
client
=>
client
.
textualSuggest
(
model
.
uri
,
position
));
}
}
...
...
src/vs/monaco.d.ts
浏览文件 @
b2092325
...
...
@@ -1397,11 +1397,7 @@ declare module monaco.editor {
/**
* Enable word based suggestions. Defaults to 'true'
*/
wordBasedSuggestions
?:
boolean
|
{
strings
?:
boolean
;
comments
?:
boolean
;
other
?:
boolean
;
};
wordBasedSuggestions
?:
boolean
;
/**
* The font size for the suggest widget.
* Defaults to the editor font size.
...
...
@@ -1623,11 +1619,7 @@ declare module monaco.editor {
readonly
acceptSuggestionOnCommitCharacter
:
boolean
;
readonly
snippetSuggestions
:
'
top
'
|
'
bottom
'
|
'
inline
'
|
'
none
'
;
readonly
emptySelectionClipboard
:
boolean
;
readonly
wordBasedSuggestions
:
boolean
|
{
strings
?:
boolean
;
comments
?:
boolean
;
default
?:
boolean
;
};
readonly
wordBasedSuggestions
:
boolean
;
readonly
suggestFontSize
:
number
;
readonly
suggestLineHeight
:
number
;
readonly
selectionHighlight
:
boolean
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录