Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2b5b63b0
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,发现更多精彩内容 >>
提交
2b5b63b0
编写于
11月 11, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add ISuggestion#snippetType, #3210
上级
e04179d6
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
27 addition
and
9 deletion
+27
-9
src/vs/editor/browser/standalone/standaloneLanguages.ts
src/vs/editor/browser/standalone/standaloneLanguages.ts
+2
-1
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+3
-1
src/vs/editor/common/modes/snippetsRegistry.ts
src/vs/editor/common/modes/snippetsRegistry.ts
+1
-1
src/vs/editor/contrib/snippet/common/snippet.ts
src/vs/editor/contrib/snippet/common/snippet.ts
+6
-0
src/vs/editor/contrib/suggest/browser/suggestController.ts
src/vs/editor/contrib/suggest/browser/suggestController.ts
+11
-3
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+2
-0
src/vs/workbench/api/node/extHostLanguageFeatures.ts
src/vs/workbench/api/node/extHostLanguageFeatures.ts
+2
-3
未找到文件。
src/vs/editor/browser/standalone/standaloneLanguages.ts
浏览文件 @
2b5b63b0
...
...
@@ -397,7 +397,8 @@ class SuggestAdapter {
detail
:
item
.
detail
,
documentation
:
item
.
documentation
,
sortText
:
item
.
sortText
,
filterText
:
item
.
filterText
filterText
:
item
.
filterText
,
snippetType
:
'
internal
'
};
}
...
...
src/vs/editor/common/modes.ts
浏览文件 @
2b5b63b0
...
...
@@ -169,6 +169,8 @@ export type SuggestionType = 'method'
|
'
reference
'
|
'
customcolor
'
;
export
type
SnippetType
=
'
internal
'
|
'
textmate
'
;
/**
* @internal
*/
...
...
@@ -185,7 +187,7 @@ export interface ISuggestion {
overwriteAfter
?:
number
;
additionalTextEdits
?:
editorCommon
.
ISingleEditOperation
[];
command
?:
Command
;
isTMSnippet
?:
boolean
;
snippetType
?:
SnippetType
;
_extensionId
?:
string
;
}
...
...
src/vs/editor/common/modes/snippetsRegistry.ts
浏览文件 @
2b5b63b0
...
...
@@ -107,7 +107,7 @@ class SnippetsRegistry implements ISnippetsRegistry {
documentation
:
s
.
description
,
insertText
:
s
.
codeSnippet
,
noAutoAccept
:
true
,
isTMSnippet
:
true
,
snippetType
:
'
textmate
'
,
overwriteBefore
});
...
...
src/vs/editor/contrib/snippet/common/snippet.ts
浏览文件 @
2b5b63b0
...
...
@@ -43,6 +43,12 @@ export class CodeSnippet implements ICodeSnippet {
return
snippet
;
}
static
plain
(
template
:
string
):
CodeSnippet
{
const
snippet
=
new
CodeSnippet
();
snippet
.
lines
=
template
.
split
(
/
\r\n
|
\n
|
\r
/
);
return
snippet
;
}
static
fromEmmet
(
template
:
string
):
CodeSnippet
{
return
EmmetSnippetParser
.
parse
(
template
);
}
...
...
src/vs/editor/contrib/suggest/browser/suggestController.ts
浏览文件 @
2b5b63b0
...
...
@@ -76,6 +76,16 @@ export class SuggestController implements IEditorContribution {
}
}
private
static
_codeSnippetForSuggestion
({
suggestion
}:
ICompletionItem
):
CodeSnippet
{
if
(
suggestion
.
snippetType
===
'
textmate
'
)
{
return
CodeSnippet
.
fromTextmate
(
suggestion
.
insertText
);
}
else
if
(
suggestion
.
snippetType
===
'
internal
'
)
{
return
CodeSnippet
.
fromInternal
(
suggestion
.
insertText
);
}
else
{
return
CodeSnippet
.
plain
(
suggestion
.
insertText
);
}
}
private
onDidSelectItem
(
item
:
ICompletionItem
):
void
{
if
(
item
)
{
const
{
suggestion
,
position
}
=
item
;
...
...
@@ -87,9 +97,7 @@ export class SuggestController implements IEditorContribution {
this
.
editor
.
pushUndoStop
();
}
const
snippet
=
suggestion
.
isTMSnippet
?
CodeSnippet
.
fromTextmate
(
suggestion
.
insertText
)
:
CodeSnippet
.
fromInternal
(
suggestion
.
insertText
);
const
snippet
=
SuggestController
.
_codeSnippetForSuggestion
(
item
);
SnippetController
.
get
(
this
.
editor
).
run
(
snippet
,
...
...
src/vs/monaco.d.ts
浏览文件 @
2b5b63b0
...
...
@@ -4334,6 +4334,8 @@ declare module monaco.languages {
provideHover
(
model
:
editor
.
IReadOnlyModel
,
position
:
Position
,
token
:
CancellationToken
):
Hover
|
Thenable
<
Hover
>
;
}
export
type
SnippetType
=
'
internal
'
|
'
textmate
'
;
/**
* Interface used to quick fix typing errors while accesing member fields.
*/
...
...
src/vs/workbench/api/node/extHostLanguageFeatures.ts
浏览文件 @
2b5b63b0
...
...
@@ -479,9 +479,8 @@ class SuggestAdapter {
suggestion
.
overwriteAfter
=
0
;
}
if
(
this
.
_extensionId
)
{
suggestion
.
_extensionId
=
this
.
_extensionId
;
}
suggestion
.
_extensionId
=
this
.
_extensionId
;
suggestion
.
snippetType
=
'
internal
'
;
// store suggestion
result
.
suggestions
.
push
(
suggestion
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录