Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
41327843
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,发现更多精彩内容 >>
提交
41327843
编写于
10月 26, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix
https://github.com/microsoft/vscode/issues/108894
上级
475cff63
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
8 deletion
+12
-8
src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
...nch/contrib/snippets/browser/snippetCompletionProvider.ts
+11
-7
src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
...nch/contrib/snippets/test/browser/snippetsService.test.ts
+1
-1
未找到文件。
src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.ts
浏览文件 @
41327843
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
MarkdownString
}
from
'
vs/base/common/htmlContent
'
;
import
{
compare
}
from
'
vs/base/common/strings
'
;
import
{
compare
,
compareSubstring
}
from
'
vs/base/common/strings
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
IRange
,
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
...
...
@@ -102,12 +102,16 @@ export class SnippetCompletionProvider implements CompletionItemProvider {
const
availableSnippets
=
new
Set
<
Snippet
>
(
snippets
);
const
suggestions
:
SnippetCompletion
[]
=
[];
for
(
let
start
of
lineOffsets
)
{
const
columnOffset
=
position
.
column
-
1
;
for
(
const
start
of
lineOffsets
)
{
availableSnippets
.
forEach
(
snippet
=>
{
if
(
isPatternInWord
(
lineContent
,
start
,
position
.
column
-
1
,
snippet
.
prefixLow
,
0
,
snippet
.
prefixLow
.
length
))
{
const
snippetPrefixSubstr
=
snippet
.
prefixLow
.
substr
(
position
.
column
-
(
1
+
start
));
const
endColumn
=
lineContent
.
indexOf
(
snippetPrefixSubstr
,
position
.
column
-
1
)
>=
0
?
position
.
column
+
snippetPrefixSubstr
.
length
:
position
.
column
;
const
replace
=
Range
.
fromPositions
(
position
.
delta
(
0
,
-
(
position
.
column
-
(
1
+
start
))),
{
lineNumber
:
position
.
lineNumber
,
column
:
endColumn
});
if
(
isPatternInWord
(
lineContent
,
start
,
columnOffset
,
snippet
.
prefixLow
,
0
,
snippet
.
prefixLow
.
length
))
{
const
prefixPos
=
position
.
column
-
(
1
+
start
);
const
prefixRestLen
=
snippet
.
prefixLow
.
length
-
prefixPos
;
const
endsWithPrefixRest
=
compareSubstring
(
lineContent
,
snippet
.
prefixLow
,
columnOffset
,
(
columnOffset
)
+
prefixRestLen
,
prefixPos
,
prefixPos
+
prefixRestLen
);
const
endColumn
=
endsWithPrefixRest
===
0
?
position
.
column
+
prefixRestLen
:
position
.
column
;
const
replace
=
Range
.
fromPositions
(
position
.
delta
(
0
,
-
prefixPos
),
{
lineNumber
:
position
.
lineNumber
,
column
:
endColumn
});
const
insert
=
replace
.
setEndPosition
(
position
.
lineNumber
,
position
.
column
);
suggestions
.
push
(
new
SnippetCompletion
(
snippet
,
{
replace
,
insert
}));
...
...
@@ -120,7 +124,7 @@ export class SnippetCompletionProvider implements CompletionItemProvider {
// interesting positions have been found
availableSnippets
.
forEach
(
snippet
=>
{
const
insert
=
Range
.
fromPositions
(
position
);
const
replace
=
lineContent
.
indexOf
(
snippet
.
prefixLow
,
position
.
column
-
1
)
>=
0
?
insert
.
setEndPosition
(
position
.
lineNumber
,
position
.
column
+
snippet
.
prefixLow
.
length
)
:
insert
;
const
replace
=
lineContent
.
indexOf
(
snippet
.
prefixLow
,
columnOffset
)
===
columnOffset
?
insert
.
setEndPosition
(
position
.
lineNumber
,
position
.
column
+
snippet
.
prefixLow
.
length
)
:
insert
;
suggestions
.
push
(
new
SnippetCompletion
(
snippet
,
{
replace
,
insert
}));
});
}
...
...
src/vs/workbench/contrib/snippets/test/browser/snippetsService.test.ts
浏览文件 @
41327843
...
...
@@ -476,7 +476,7 @@ suite('SnippetsService', function () {
});
test
(
'
Snippet replace-range incorrect #108894
'
,
async
function
()
{
this
.
skip
();
snippetService
=
new
SimpleSnippetService
([
new
Snippet
(
[
'
fooLang
'
],
'
eng
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录