Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
fc50b4e4
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,发现更多精彩内容 >>
提交
fc50b4e4
编写于
12月 31, 2019
作者:
R
rzj17
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add additionalTextEdit and command conversion to CompletionItem
上级
656fff3b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
4 deletion
+8
-4
src/vs/workbench/api/common/extHostApiCommands.ts
src/vs/workbench/api/common/extHostApiCommands.ts
+1
-1
src/vs/workbench/api/common/extHostTypeConverters.ts
src/vs/workbench/api/common/extHostTypeConverters.ts
+7
-3
未找到文件。
src/vs/workbench/api/common/extHostApiCommands.ts
浏览文件 @
fc50b4e4
...
@@ -417,7 +417,7 @@ export class ExtHostApiCommands {
...
@@ -417,7 +417,7 @@ export class ExtHostApiCommands {
};
};
return
this
.
_commands
.
executeCommand
<
modes
.
CompletionList
>
(
'
_executeCompletionItemProvider
'
,
args
).
then
(
result
=>
{
return
this
.
_commands
.
executeCommand
<
modes
.
CompletionList
>
(
'
_executeCompletionItemProvider
'
,
args
).
then
(
result
=>
{
if
(
result
)
{
if
(
result
)
{
const
items
=
result
.
suggestions
.
map
(
suggestion
=>
typeConverters
.
CompletionItem
.
to
(
suggestion
));
const
items
=
result
.
suggestions
.
map
(
suggestion
=>
typeConverters
.
CompletionItem
.
to
(
suggestion
,
this
.
_commands
.
converter
));
return
new
types
.
CompletionList
(
items
,
result
.
incomplete
);
return
new
types
.
CompletionList
(
items
,
result
.
incomplete
);
}
}
return
undefined
;
return
undefined
;
...
...
src/vs/workbench/api/common/extHostTypeConverters.ts
浏览文件 @
fc50b4e4
...
@@ -30,6 +30,7 @@ import { cloneAndChange } from 'vs/base/common/objects';
...
@@ -30,6 +30,7 @@ import { cloneAndChange } from 'vs/base/common/objects';
import
{
LogLevel
as
_MainLogLevel
}
from
'
vs/platform/log/common/log
'
;
import
{
LogLevel
as
_MainLogLevel
}
from
'
vs/platform/log/common/log
'
;
import
{
coalesce
,
isNonEmptyArray
}
from
'
vs/base/common/arrays
'
;
import
{
coalesce
,
isNonEmptyArray
}
from
'
vs/base/common/arrays
'
;
import
{
RenderLineNumbersType
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
RenderLineNumbersType
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
CommandsConverter
}
from
'
vs/workbench/api/common/extHostCommands
'
;
export
interface
PositionLike
{
export
interface
PositionLike
{
line
:
number
;
line
:
number
;
...
@@ -830,7 +831,7 @@ export namespace CompletionItemKind {
...
@@ -830,7 +831,7 @@ export namespace CompletionItemKind {
export
namespace
CompletionItem
{
export
namespace
CompletionItem
{
export
function
to
(
suggestion
:
modes
.
CompletionItem
):
types
.
CompletionItem
{
export
function
to
(
suggestion
:
modes
.
CompletionItem
,
converter
?:
CommandsConverter
):
types
.
CompletionItem
{
const
result
=
new
types
.
CompletionItem
(
suggestion
.
label
);
const
result
=
new
types
.
CompletionItem
(
suggestion
.
label
);
result
.
insertText
=
suggestion
.
insertText
;
result
.
insertText
=
suggestion
.
insertText
;
result
.
kind
=
CompletionItemKind
.
to
(
suggestion
.
kind
);
result
.
kind
=
CompletionItemKind
.
to
(
suggestion
.
kind
);
...
@@ -844,14 +845,17 @@ export namespace CompletionItem {
...
@@ -844,14 +845,17 @@ export namespace CompletionItem {
result
.
range
=
editorRange
.
Range
.
isIRange
(
suggestion
.
range
)
?
Range
.
to
(
suggestion
.
range
)
:
undefined
;
result
.
range
=
editorRange
.
Range
.
isIRange
(
suggestion
.
range
)
?
Range
.
to
(
suggestion
.
range
)
:
undefined
;
result
.
range2
=
editorRange
.
Range
.
isIRange
(
suggestion
.
range
)
?
undefined
:
{
inserting
:
Range
.
to
(
suggestion
.
range
.
insert
),
replacing
:
Range
.
to
(
suggestion
.
range
.
replace
)
};
result
.
range2
=
editorRange
.
Range
.
isIRange
(
suggestion
.
range
)
?
undefined
:
{
inserting
:
Range
.
to
(
suggestion
.
range
.
insert
),
replacing
:
Range
.
to
(
suggestion
.
range
.
replace
)
};
result
.
keepWhitespace
=
typeof
suggestion
.
insertTextRules
===
'
undefined
'
?
false
:
Boolean
(
suggestion
.
insertTextRules
&
modes
.
CompletionItemInsertTextRule
.
KeepWhitespace
);
result
.
keepWhitespace
=
typeof
suggestion
.
insertTextRules
===
'
undefined
'
?
false
:
Boolean
(
suggestion
.
insertTextRules
&
modes
.
CompletionItemInsertTextRule
.
KeepWhitespace
);
// 'inserText'-logic
// 'inser
t
Text'-logic
if
(
typeof
suggestion
.
insertTextRules
!==
'
undefined
'
&&
suggestion
.
insertTextRules
&
modes
.
CompletionItemInsertTextRule
.
InsertAsSnippet
)
{
if
(
typeof
suggestion
.
insertTextRules
!==
'
undefined
'
&&
suggestion
.
insertTextRules
&
modes
.
CompletionItemInsertTextRule
.
InsertAsSnippet
)
{
result
.
insertText
=
new
types
.
SnippetString
(
suggestion
.
insertText
);
result
.
insertText
=
new
types
.
SnippetString
(
suggestion
.
insertText
);
}
else
{
}
else
{
result
.
insertText
=
suggestion
.
insertText
;
result
.
insertText
=
suggestion
.
insertText
;
result
.
textEdit
=
result
.
range
instanceof
types
.
Range
?
new
types
.
TextEdit
(
result
.
range
,
result
.
insertText
)
:
undefined
;
result
.
textEdit
=
result
.
range
instanceof
types
.
Range
?
new
types
.
TextEdit
(
result
.
range
,
result
.
insertText
)
:
undefined
;
}
}
// TODO additionalEdits, command
if
(
suggestion
.
additionalTextEdits
&&
suggestion
.
additionalTextEdits
.
length
>
0
)
{
result
.
additionalTextEdits
=
suggestion
.
additionalTextEdits
.
map
(
e
=>
TextEdit
.
to
(
e
as
modes
.
TextEdit
));
}
result
.
command
=
converter
&&
suggestion
.
command
?
converter
.
fromInternal
(
suggestion
.
command
)
:
undefined
;
return
result
;
return
result
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录