Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3c4ae57c
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3c4ae57c
编写于
7月 20, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - remove unsed 'shouldAutotriggerSuggest'
上级
4d37b861
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
1 addition
and
31 deletion
+1
-31
src/vs/editor/browser/standalone/standaloneLanguages.ts
src/vs/editor/browser/standalone/standaloneLanguages.ts
+0
-1
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+0
-2
src/vs/editor/common/modes/supports/suggestSupport.ts
src/vs/editor/common/modes/supports/suggestSupport.ts
+0
-4
src/vs/editor/contrib/suggest/browser/suggest.ts
src/vs/editor/contrib/suggest/browser/suggest.ts
+1
-11
src/vs/editor/contrib/suggest/common/suggestModel.ts
src/vs/editor/contrib/suggest/common/suggestModel.ts
+0
-8
src/vs/editor/contrib/suggest/test/common/suggest.test.ts
src/vs/editor/contrib/suggest/test/common/suggest.test.ts
+0
-1
src/vs/languages/handlebars/common/handlebars.ts
src/vs/languages/handlebars/common/handlebars.ts
+0
-1
src/vs/languages/html/common/html.ts
src/vs/languages/html/common/html.ts
+0
-1
src/vs/languages/razor/common/razor.ts
src/vs/languages/razor/common/razor.ts
+0
-1
src/vs/workbench/api/node/mainThreadLanguageFeatures.ts
src/vs/workbench/api/node/mainThreadLanguageFeatures.ts
+0
-1
未找到文件。
src/vs/editor/browser/standalone/standaloneLanguages.ts
浏览文件 @
3c4ae57c
...
@@ -197,7 +197,6 @@ export function registerCompletionItemProvider(languageId:string, provider:Compl
...
@@ -197,7 +197,6 @@ export function registerCompletionItemProvider(languageId:string, provider:Compl
let
adapter
=
new
SuggestAdapter
(
provider
);
let
adapter
=
new
SuggestAdapter
(
provider
);
return
modes
.
SuggestRegistry
.
register
(
languageId
,
{
return
modes
.
SuggestRegistry
.
register
(
languageId
,
{
triggerCharacters
:
provider
.
triggerCharacters
,
triggerCharacters
:
provider
.
triggerCharacters
,
shouldAutotriggerSuggest
:
true
,
provideCompletionItems
:
(
model
:
editorCommon
.
IReadOnlyModel
,
position
:
Position
,
token
:
CancellationToken
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
provideCompletionItems
:
(
model
:
editorCommon
.
IReadOnlyModel
,
position
:
Position
,
token
:
CancellationToken
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
return
adapter
.
provideCompletionItems
(
model
,
position
,
token
);
return
adapter
.
provideCompletionItems
(
model
,
position
,
token
);
},
},
...
...
src/vs/editor/common/modes.ts
浏览文件 @
3c4ae57c
...
@@ -397,8 +397,6 @@ export interface ISuggestSupport {
...
@@ -397,8 +397,6 @@ export interface ISuggestSupport {
triggerCharacters
:
string
[];
triggerCharacters
:
string
[];
shouldAutotriggerSuggest
:
boolean
;
filter
?:
IFilter
;
filter
?:
IFilter
;
provideCompletionItems
(
model
:
editorCommon
.
IReadOnlyModel
,
position
:
Position
,
token
:
CancellationToken
):
ISuggestResult
[]
|
Thenable
<
ISuggestResult
[]
>
;
provideCompletionItems
(
model
:
editorCommon
.
IReadOnlyModel
,
position
:
Position
,
token
:
CancellationToken
):
ISuggestResult
[]
|
Thenable
<
ISuggestResult
[]
>
;
...
...
src/vs/editor/common/modes/supports/suggestSupport.ts
浏览文件 @
3c4ae57c
...
@@ -19,10 +19,6 @@ export class TextualSuggestSupport implements ISuggestSupport {
...
@@ -19,10 +19,6 @@ export class TextualSuggestSupport implements ISuggestSupport {
return
[];
return
[];
}
}
public
get
shouldAutotriggerSuggest
():
boolean
{
return
true
;
}
public
get
filter
():
IFilter
{
public
get
filter
():
IFilter
{
return
matchesPrefix
;
return
matchesPrefix
;
}
}
...
...
src/vs/editor/contrib/suggest/browser/suggest.ts
浏览文件 @
3c4ae57c
...
@@ -119,21 +119,11 @@ export class SuggestController implements IEditorContribution {
...
@@ -119,21 +119,11 @@ export class SuggestController implements IEditorContribution {
Object
.
keys
(
triggerCharacters
).
forEach
(
ch
=>
{
Object
.
keys
(
triggerCharacters
).
forEach
(
ch
=>
{
this
.
triggerCharacterListeners
.
push
(
this
.
editor
.
addTypingListener
(
ch
,
()
=>
{
this
.
triggerCharacterListeners
.
push
(
this
.
editor
.
addTypingListener
(
ch
,
()
=>
{
this
.
trigger
CharacterHandler
(
ch
,
triggerCharacters
[
ch
]
);
this
.
trigger
Suggest
(
ch
,
triggerCharacters
[
ch
]).
done
(
null
,
onUnexpectedError
);
}));
}));
});
});
}
}
private
triggerCharacterHandler
(
character
:
string
,
groups
:
ISuggestSupport
[][]):
void
{
groups
=
groups
.
map
(
supports
=>
{
return
supports
.
filter
(
support
=>
support
.
shouldAutotriggerSuggest
);
});
if
(
groups
.
length
>
0
)
{
this
.
triggerSuggest
(
character
,
groups
).
done
(
null
,
onUnexpectedError
);
}
}
triggerSuggest
(
triggerCharacter
?:
string
,
groups
?:
ISuggestSupport
[][]):
TPromise
<
boolean
>
{
triggerSuggest
(
triggerCharacter
?:
string
,
groups
?:
ISuggestSupport
[][]):
TPromise
<
boolean
>
{
this
.
model
.
trigger
(
false
,
triggerCharacter
,
false
,
groups
);
this
.
model
.
trigger
(
false
,
triggerCharacter
,
false
,
groups
);
this
.
editor
.
focus
();
this
.
editor
.
focus
();
...
...
src/vs/editor/contrib/suggest/common/suggestModel.ts
浏览文件 @
3c4ae57c
...
@@ -45,7 +45,6 @@ class Context {
...
@@ -45,7 +45,6 @@ class Context {
column
:
number
;
column
:
number
;
isInEditableRange
:
boolean
;
isInEditableRange
:
boolean
;
private
isAutoTriggerEnabled
:
boolean
;
lineContentBefore
:
string
;
lineContentBefore
:
string
;
lineContentAfter
:
string
;
lineContentAfter
:
string
;
...
@@ -78,16 +77,9 @@ class Context {
...
@@ -78,16 +77,9 @@ class Context {
this
.
isInEditableRange
=
false
;
this
.
isInEditableRange
=
false
;
}
}
}
}
const
supports
=
SuggestRegistry
.
all
(
model
);
this
.
isAutoTriggerEnabled
=
supports
.
some
(
s
=>
s
.
shouldAutotriggerSuggest
);
}
}
shouldAutoTrigger
():
boolean
{
shouldAutoTrigger
():
boolean
{
if
(
!
this
.
isAutoTriggerEnabled
)
{
// Support disallows it
return
false
;
}
if
(
this
.
wordBefore
.
length
===
0
)
{
if
(
this
.
wordBefore
.
length
===
0
)
{
// Word before position is empty
// Word before position is empty
...
...
src/vs/editor/contrib/suggest/test/common/suggest.test.ts
浏览文件 @
3c4ae57c
...
@@ -23,7 +23,6 @@ suite('Suggest', function () {
...
@@ -23,7 +23,6 @@ suite('Suggest', function () {
model
=
Model
.
createFromString
(
'
FOO
\n
bar
\
BAR
\n
foo
'
,
undefined
,
undefined
,
URI
.
parse
(
'
foo:bar/path
'
));
model
=
Model
.
createFromString
(
'
FOO
\n
bar
\
BAR
\n
foo
'
,
undefined
,
undefined
,
URI
.
parse
(
'
foo:bar/path
'
));
registration
=
SuggestRegistry
.
register
({
pattern
:
'
bar/path
'
},
{
registration
=
SuggestRegistry
.
register
({
pattern
:
'
bar/path
'
},
{
triggerCharacters
:
[],
triggerCharacters
:
[],
shouldAutotriggerSuggest
:
true
,
provideCompletionItems
()
{
provideCompletionItems
()
{
return
[{
return
[{
currentWord
:
''
,
currentWord
:
''
,
...
...
src/vs/languages/handlebars/common/handlebars.ts
浏览文件 @
3c4ae57c
...
@@ -164,7 +164,6 @@ export class HandlebarsMode extends htmlMode.HTMLMode<htmlWorker.HTMLWorker> {
...
@@ -164,7 +164,6 @@ export class HandlebarsMode extends htmlMode.HTMLMode<htmlWorker.HTMLWorker> {
protected
_registerSupports
():
void
{
protected
_registerSupports
():
void
{
modes
.
SuggestRegistry
.
register
(
this
.
getId
(),
{
modes
.
SuggestRegistry
.
register
(
this
.
getId
(),
{
triggerCharacters
:
[
'
.
'
,
'
:
'
,
'
<
'
,
'
"
'
,
'
=
'
,
'
/
'
],
triggerCharacters
:
[
'
.
'
,
'
:
'
,
'
<
'
,
'
"
'
,
'
=
'
,
'
/
'
],
shouldAutotriggerSuggest
:
true
,
provideCompletionItems
:
(
model
,
position
,
token
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
provideCompletionItems
:
(
model
,
position
,
token
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
return
wireCancellationToken
(
token
,
this
.
_provideCompletionItems
(
model
.
uri
,
position
));
return
wireCancellationToken
(
token
,
this
.
_provideCompletionItems
(
model
.
uri
,
position
));
}
}
...
...
src/vs/languages/html/common/html.ts
浏览文件 @
3c4ae57c
...
@@ -358,7 +358,6 @@ export class HTMLMode<W extends htmlWorker.HTMLWorker> extends CompatMode implem
...
@@ -358,7 +358,6 @@ export class HTMLMode<W extends htmlWorker.HTMLWorker> extends CompatMode implem
modes
.
SuggestRegistry
.
register
(
this
.
getId
(),
{
modes
.
SuggestRegistry
.
register
(
this
.
getId
(),
{
triggerCharacters
:
[
'
.
'
,
'
:
'
,
'
<
'
,
'
"
'
,
'
=
'
,
'
/
'
],
triggerCharacters
:
[
'
.
'
,
'
:
'
,
'
<
'
,
'
"
'
,
'
=
'
,
'
/
'
],
shouldAutotriggerSuggest
:
true
,
provideCompletionItems
:
(
model
,
position
,
token
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
provideCompletionItems
:
(
model
,
position
,
token
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
return
wireCancellationToken
(
token
,
this
.
_provideCompletionItems
(
model
.
uri
,
position
));
return
wireCancellationToken
(
token
,
this
.
_provideCompletionItems
(
model
.
uri
,
position
));
}
}
...
...
src/vs/languages/razor/common/razor.ts
浏览文件 @
3c4ae57c
...
@@ -112,7 +112,6 @@ export class RAZORMode extends htmlMode.HTMLMode<RAZORWorker> {
...
@@ -112,7 +112,6 @@ export class RAZORMode extends htmlMode.HTMLMode<RAZORWorker> {
protected
_registerSupports
():
void
{
protected
_registerSupports
():
void
{
modes
.
SuggestRegistry
.
register
(
this
.
getId
(),
{
modes
.
SuggestRegistry
.
register
(
this
.
getId
(),
{
triggerCharacters
:
[
'
.
'
,
'
:
'
,
'
<
'
,
'
"
'
,
'
=
'
,
'
/
'
],
triggerCharacters
:
[
'
.
'
,
'
:
'
,
'
<
'
,
'
"
'
,
'
=
'
,
'
/
'
],
shouldAutotriggerSuggest
:
true
,
provideCompletionItems
:
(
model
,
position
,
token
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
provideCompletionItems
:
(
model
,
position
,
token
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
return
wireCancellationToken
(
token
,
this
.
_provideCompletionItems
(
model
.
uri
,
position
));
return
wireCancellationToken
(
token
,
this
.
_provideCompletionItems
(
model
.
uri
,
position
));
}
}
...
...
src/vs/workbench/api/node/mainThreadLanguageFeatures.ts
浏览文件 @
3c4ae57c
...
@@ -176,7 +176,6 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape
...
@@ -176,7 +176,6 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape
$registerSuggestSupport
(
handle
:
number
,
selector
:
vscode
.
DocumentSelector
,
triggerCharacters
:
string
[]):
TPromise
<
any
>
{
$registerSuggestSupport
(
handle
:
number
,
selector
:
vscode
.
DocumentSelector
,
triggerCharacters
:
string
[]):
TPromise
<
any
>
{
this
.
_registrations
[
handle
]
=
modes
.
SuggestRegistry
.
register
(
selector
,
<
modes
.
ISuggestSupport
>
{
this
.
_registrations
[
handle
]
=
modes
.
SuggestRegistry
.
register
(
selector
,
<
modes
.
ISuggestSupport
>
{
triggerCharacters
:
triggerCharacters
,
triggerCharacters
:
triggerCharacters
,
shouldAutotriggerSuggest
:
true
,
provideCompletionItems
:
(
model
:
IReadOnlyModel
,
position
:
EditorPosition
,
token
:
CancellationToken
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
provideCompletionItems
:
(
model
:
IReadOnlyModel
,
position
:
EditorPosition
,
token
:
CancellationToken
):
Thenable
<
modes
.
ISuggestResult
[]
>
=>
{
return
wireCancellationToken
(
token
,
this
.
_proxy
.
$provideCompletionItems
(
handle
,
model
.
uri
,
position
));
return
wireCancellationToken
(
token
,
this
.
_proxy
.
$provideCompletionItems
(
handle
,
model
.
uri
,
position
));
},
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录