Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
31e7866e
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,发现更多精彩内容 >>
提交
31e7866e
编写于
11月 05, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change names to inserting/replacing #10266
上级
31e2dda3
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
10 deletion
+10
-10
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+1
-1
src/vs/workbench/api/common/extHostLanguageFeatures.ts
src/vs/workbench/api/common/extHostLanguageFeatures.ts
+7
-7
src/vs/workbench/api/common/extHostTypeConverters.ts
src/vs/workbench/api/common/extHostTypeConverters.ts
+1
-1
src/vs/workbench/api/common/extHostTypes.ts
src/vs/workbench/api/common/extHostTypes.ts
+1
-1
未找到文件。
src/vs/vscode.proposed.d.ts
浏览文件 @
31e7866e
...
...
@@ -992,7 +992,7 @@ declare module 'vscode' {
* [contain](#Range.contains) the position at which completion has been [requested](#CompletionItemProvider.provideCompletionItems).
* *Note 2:* A insert range must be a prefix of a replace range, that means it must be contained and starting at the same position.
*/
range2
?:
Range
|
{
insert
:
Range
;
replace
:
Range
;
};
range2
?:
Range
|
{
insert
ing
:
Range
;
replacing
:
Range
;
};
}
//#endregion
...
...
src/vs/workbench/api/common/extHostLanguageFeatures.ts
浏览文件 @
31e7866e
...
...
@@ -751,7 +751,7 @@ class SuggestAdapter {
}
// 'overwrite[Before|After]'-logic
let
range
:
vscode
.
Range
|
{
insert
:
vscode
.
Range
,
replace
:
vscode
.
Range
}
|
undefined
;
let
range
:
vscode
.
Range
|
{
insert
ing
:
vscode
.
Range
,
replacing
:
vscode
.
Range
}
|
undefined
;
if
(
item
.
textEdit
)
{
range
=
item
.
textEdit
.
range
;
}
else
if
(
item
.
range
)
{
...
...
@@ -770,17 +770,17 @@ class SuggestAdapter {
}
else
{
if
(
!
SuggestAdapter
.
_isValidRangeForCompletion
(
range
.
insert
,
position
)
||
!
SuggestAdapter
.
_isValidRangeForCompletion
(
range
.
replac
e
,
position
)
||
!
range
.
insert
.
start
.
isEqual
(
range
.
replace
.
start
)
||
!
range
.
replac
e
.
contains
(
range
.
insert
)
!
SuggestAdapter
.
_isValidRangeForCompletion
(
range
.
insert
ing
,
position
)
||
!
SuggestAdapter
.
_isValidRangeForCompletion
(
range
.
replac
ing
,
position
)
||
!
range
.
insert
ing
.
start
.
isEqual
(
range
.
replacing
.
start
)
||
!
range
.
replac
ing
.
contains
(
range
.
inserting
)
)
{
console
.
trace
(
'
INVALID range -> must be single line, on the same line, insert range must be a prefix of replace range
'
);
return
undefined
;
}
result
[
extHostProtocol
.
ISuggestDataDtoField
.
range
]
=
{
insert
:
typeConvert
.
Range
.
from
(
range
.
insert
),
replace
:
typeConvert
.
Range
.
from
(
range
.
replac
e
)
insert
:
typeConvert
.
Range
.
from
(
range
.
insert
ing
),
replace
:
typeConvert
.
Range
.
from
(
range
.
replac
ing
)
};
}
}
...
...
src/vs/workbench/api/common/extHostTypeConverters.ts
浏览文件 @
31e7866e
...
...
@@ -811,7 +811,7 @@ export namespace CompletionItem {
result
.
preselect
=
suggestion
.
preselect
;
result
.
commitCharacters
=
suggestion
.
commitCharacters
;
result
.
range
=
editorRange
.
Range
.
isIRange
(
suggestion
.
range
)
?
Range
.
to
(
suggestion
.
range
)
:
undefined
;
result
.
range2
=
editorRange
.
Range
.
isIRange
(
suggestion
.
range
)
?
undefined
:
{
insert
:
Range
.
to
(
suggestion
.
range
.
insert
),
replace
:
Range
.
to
(
suggestion
.
range
.
replace
)
};
result
.
range2
=
editorRange
.
Range
.
isIRange
(
suggestion
.
range
)
?
undefined
:
{
insert
ing
:
Range
.
to
(
suggestion
.
range
.
insert
),
replacing
:
Range
.
to
(
suggestion
.
range
.
replace
)
};
result
.
keepWhitespace
=
typeof
suggestion
.
insertTextRules
===
'
undefined
'
?
false
:
Boolean
(
suggestion
.
insertTextRules
&
modes
.
CompletionItemInsertTextRule
.
KeepWhitespace
);
// 'inserText'-logic
if
(
typeof
suggestion
.
insertTextRules
!==
'
undefined
'
&&
suggestion
.
insertTextRules
&
modes
.
CompletionItemInsertTextRule
.
InsertAsSnippet
)
{
...
...
src/vs/workbench/api/common/extHostTypes.ts
浏览文件 @
31e7866e
...
...
@@ -1344,7 +1344,7 @@ export class CompletionItem implements vscode.CompletionItem {
insertText
?:
string
|
SnippetString
;
keepWhitespace
?:
boolean
;
range
?:
Range
;
range2
?:
Range
|
{
insert
:
Range
;
replace
:
Range
;
};
range2
?:
Range
|
{
insert
ing
:
Range
;
replacing
:
Range
;
};
commitCharacters
?:
string
[];
textEdit
?:
TextEdit
;
additionalTextEdits
?:
TextEdit
[];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录