Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
95096bdc
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,发现更多精彩内容 >>
提交
95096bdc
编写于
3月 09, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
implement settings proposal, #9504
上级
6d2013a6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
55 addition
and
35 deletion
+55
-35
src/vs/editor/common/config/commonEditorConfig.ts
src/vs/editor/common/config/commonEditorConfig.ts
+20
-1
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+5
-4
src/vs/editor/common/services/editorWorkerServiceImpl.ts
src/vs/editor/common/services/editorWorkerServiceImpl.ts
+20
-28
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+10
-2
未找到文件。
src/vs/editor/common/config/commonEditorConfig.ts
浏览文件 @
95096bdc
...
...
@@ -780,7 +780,26 @@ const editorConfiguration: IConfigurationNode = {
'
description
'
:
nls
.
localize
(
'
emptySelectionClipboard
'
,
"
Controls whether copying without a selection copies the current line.
"
)
},
'
editor.wordBasedSuggestions
'
:
{
'
type
'
:
'
boolean
'
,
'
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.
"
)
},
default
:
{
type
:
'
boolean
'
,
description
:
nls
.
localize
(
'
wordBasedSuggestions.default
'
,
"
Enable word based suggestions outside of strings and comments.
"
)
},
}
}
],
'
default
'
:
DefaultConfig
.
editor
.
wordBasedSuggestions
,
'
description
'
:
nls
.
localize
(
'
wordBasedSuggestions
'
,
"
Enable word based suggestions.
"
)
},
...
...
src/vs/editor/common/editorCommon.ts
浏览文件 @
95096bdc
...
...
@@ -7,6 +7,7 @@
import
{
BulkListenerCallback
}
from
'
vs/base/common/eventEmitter
'
;
import
{
MarkedString
}
from
'
vs/base/common/htmlContent
'
;
import
*
as
types
from
'
vs/base/common/types
'
;
import
*
as
objects
from
'
vs/base/common/objects
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ServicesAccessor
,
IConstructorSignature1
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
@@ -481,7 +482,7 @@ export interface IEditorOptions {
/**
* Enable word based suggestions. Defaults to 'true'
*/
wordBasedSuggestions
?:
boolean
;
wordBasedSuggestions
?:
boolean
|
{
strings
?:
boolean
,
comments
?:
boolean
,
default
?:
boolean
}
;
/**
* The font size for the suggest widget.
* Defaults to the editor font size.
...
...
@@ -1015,7 +1016,7 @@ export class EditorContribOptions {
readonly
acceptSuggestionOnCommitCharacter
:
boolean
;
readonly
snippetSuggestions
:
'
top
'
|
'
bottom
'
|
'
inline
'
|
'
none
'
;
readonly
emptySelectionClipboard
:
boolean
;
readonly
wordBasedSuggestions
:
boolean
;
readonly
wordBasedSuggestions
:
boolean
|
{
strings
?:
boolean
,
comments
?:
boolean
,
default
?:
boolean
}
;
readonly
suggestFontSize
:
number
;
readonly
suggestLineHeight
:
number
;
readonly
selectionHighlight
:
boolean
;
...
...
@@ -1042,7 +1043,7 @@ export class EditorContribOptions {
acceptSuggestionOnCommitCharacter
:
boolean
;
snippetSuggestions
:
'
top
'
|
'
bottom
'
|
'
inline
'
|
'
none
'
;
emptySelectionClipboard
:
boolean
;
wordBasedSuggestions
:
boolean
;
wordBasedSuggestions
:
boolean
|
{
strings
?:
boolean
,
comments
?:
boolean
,
default
?:
boolean
}
;
suggestFontSize
:
number
;
suggestLineHeight
:
number
;
selectionHighlight
:
boolean
;
...
...
@@ -1094,7 +1095,7 @@ export class EditorContribOptions {
&&
this
.
acceptSuggestionOnCommitCharacter
===
other
.
acceptSuggestionOnCommitCharacter
&&
this
.
snippetSuggestions
===
other
.
snippetSuggestions
&&
this
.
emptySelectionClipboard
===
other
.
emptySelectionClipboard
&&
this
.
wordBasedSuggestions
===
other
.
wordBasedSuggestions
&&
objects
.
equals
(
this
.
wordBasedSuggestions
,
other
.
wordBasedSuggestions
)
&&
this
.
suggestFontSize
===
other
.
suggestFontSize
&&
this
.
suggestLineHeight
===
other
.
suggestLineHeight
&&
this
.
selectionHighlight
===
other
.
selectionHighlight
...
...
src/vs/editor/common/services/editorWorkerServiceImpl.ts
浏览文件 @
95096bdc
...
...
@@ -77,27 +77,6 @@ export class EditorWorkerServiceImpl implements IEditorWorkerService {
}
}
class
WordBasedCompletionConfig
{
static
fromOldConfig
(
value
:
boolean
):
WordBasedCompletionConfig
{
return
new
WordBasedCompletionConfig
(
value
,
value
,
value
);
}
constructor
(
readonly
suggestInStrings
:
boolean
,
readonly
suggestInComments
:
boolean
,
readonly
suggestInCode
:
boolean
)
{
}
accept
(
tokenType
:
modes
.
StandardTokenType
):
boolean
{
return
(
tokenType
===
modes
.
StandardTokenType
.
String
&&
this
.
suggestInStrings
)
||
(
tokenType
===
modes
.
StandardTokenType
.
Comment
&&
this
.
suggestInComments
)
||
(
tokenType
===
modes
.
StandardTokenType
.
Other
&&
this
.
suggestInCode
);
}
}
class
WordBasedCompletionItemProvider
implements
modes
.
ISuggestSupport
{
private
readonly
_workerManager
:
WorkerManager
;
...
...
@@ -110,16 +89,29 @@ class WordBasedCompletionItemProvider implements modes.ISuggestSupport {
provideCompletionItems
(
model
:
editorCommon
.
IModel
,
position
:
Position
):
TPromise
<
modes
.
ISuggestResult
>
{
// TODO(joh) should we force tokenization?
// model.forceTokenization(position.lineNumber);
const
config
=
WordBasedCompletionConfig
.
fromOldConfig
(
this
.
_configurationService
.
lookup
<
boolean
>
(
'
editor.wordBasedSuggestions
'
).
value
);
const
tokens
=
model
.
getLineTokens
(
position
.
lineNumber
);
const
{
tokenType
}
=
tokens
.
findTokenAtOffset
(
position
.
column
-
1
)
;
const
{
wordBasedSuggestions
}
=
this
.
_configurationService
.
getConfiguration
<
editorCommon
.
IEditorOptions
>
(
'
editor
'
);
if
(
wordBasedSuggestions
===
false
)
{
// simple -> disabled everywhere
return
undefined
;
if
(
config
.
accept
(
tokenType
))
{
}
else
if
(
wordBasedSuggestions
===
true
)
{
// simple -> enabled for all tokens
return
this
.
_workerManager
.
withWorker
().
then
(
client
=>
client
.
textualSuggest
(
model
.
uri
,
position
));
}
else
{
return
undefined
;
// 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
.
default
);
if
(
shoudSuggestHere
)
{
return
this
.
_workerManager
.
withWorker
().
then
(
client
=>
client
.
textualSuggest
(
model
.
uri
,
position
));
}
else
{
return
undefined
;
}
}
}
}
...
...
src/vs/monaco.d.ts
浏览文件 @
95096bdc
...
...
@@ -1397,7 +1397,11 @@ declare module monaco.editor {
/**
* Enable word based suggestions. Defaults to 'true'
*/
wordBasedSuggestions
?:
boolean
;
wordBasedSuggestions
?:
boolean
|
{
strings
?:
boolean
;
comments
?:
boolean
;
default
?:
boolean
;
};
/**
* The font size for the suggest widget.
* Defaults to the editor font size.
...
...
@@ -1619,7 +1623,11 @@ declare module monaco.editor {
readonly
acceptSuggestionOnCommitCharacter
:
boolean
;
readonly
snippetSuggestions
:
'
top
'
|
'
bottom
'
|
'
inline
'
|
'
none
'
;
readonly
emptySelectionClipboard
:
boolean
;
readonly
wordBasedSuggestions
:
boolean
;
readonly
wordBasedSuggestions
:
boolean
|
{
strings
?:
boolean
;
comments
?:
boolean
;
default
?:
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录