Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6c723d56
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,发现更多精彩内容 >>
未验证
提交
6c723d56
编写于
2月 17, 2020
作者:
J
Johannes Rieken
提交者:
GitHub
2月 17, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #90736 from vhpgomes/master
smartSelect fix
上级
1a344508
2a29b668
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
88 addition
and
41 deletion
+88
-41
src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
+87
-40
src/vs/editor/contrib/smartSelect/wordSelections.ts
src/vs/editor/contrib/smartSelect/wordSelections.ts
+1
-1
未找到文件。
src/vs/editor/contrib/smartSelect/test/smartSelect.test.ts
浏览文件 @
6c723d56
...
...
@@ -180,9 +180,11 @@ suite('SmartSelect', () => {
// -- bracket selections
async
function
assertRanges
(
provider
:
SelectionRangeProvider
,
value
:
string
,
...
expected
:
IRange
[]):
Promise
<
void
>
{
let
index
=
value
.
indexOf
(
'
|
'
);
value
=
value
.
replace
(
'
|
'
,
''
);
let
model
=
modelService
.
createModel
(
value
,
new
StaticLanguageSelector
(
mode
.
getLanguageIdentifier
()),
URI
.
parse
(
'
fake:lang
'
));
let
pos
=
model
.
getPositionAt
(
value
.
indexOf
(
'
|
'
)
);
let
pos
=
model
.
getPositionAt
(
index
);
let
all
=
await
provider
.
provideSelectionRanges
(
model
,
[
pos
],
CancellationToken
.
None
);
let
ranges
=
all
!
[
0
];
...
...
@@ -197,18 +199,18 @@ suite('SmartSelect', () => {
test
(
'
bracket selection
'
,
async
()
=>
{
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
(|)
'
,
new
Range
(
1
,
2
,
1
,
3
),
new
Range
(
1
,
1
,
1
,
4
)
new
Range
(
1
,
2
,
1
,
2
),
new
Range
(
1
,
1
,
1
,
3
)
);
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
[[[](|)]]
'
,
new
Range
(
1
,
6
,
1
,
7
),
new
Range
(
1
,
5
,
1
,
8
),
// ()
new
Range
(
1
,
3
,
1
,
8
),
new
Range
(
1
,
2
,
1
,
9
),
// [[]()]
new
Range
(
1
,
2
,
1
,
9
),
new
Range
(
1
,
1
,
1
,
10
),
// [[[]()]]
new
Range
(
1
,
6
,
1
,
6
),
new
Range
(
1
,
5
,
1
,
7
),
// ()
new
Range
(
1
,
3
,
1
,
7
),
new
Range
(
1
,
2
,
1
,
8
),
// [[]()]
new
Range
(
1
,
2
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
9
),
// [[[]()]]
);
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
[a[](|)a]
'
,
new
Range
(
1
,
6
,
1
,
7
),
new
Range
(
1
,
5
,
1
,
8
),
new
Range
(
1
,
2
,
1
,
9
),
new
Range
(
1
,
1
,
1
,
10
),
new
Range
(
1
,
6
,
1
,
6
),
new
Range
(
1
,
5
,
1
,
7
),
new
Range
(
1
,
2
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
9
),
);
// no bracket
...
...
@@ -219,23 +221,23 @@ suite('SmartSelect', () => {
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
|[[[]()]]
'
);
// edge
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
[|[[]()]]
'
,
new
Range
(
1
,
2
,
1
,
9
),
new
Range
(
1
,
1
,
1
,
10
));
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
[[[]()]|]
'
,
new
Range
(
1
,
2
,
1
,
9
),
new
Range
(
1
,
1
,
1
,
10
));
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
[|[[]()]]
'
,
new
Range
(
1
,
2
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
9
));
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
[[[]()]|]
'
,
new
Range
(
1
,
2
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
9
));
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
aaa(aaa)bbb(b|b)ccc(ccc)
'
,
new
Range
(
1
,
13
,
1
,
1
6
),
new
Range
(
1
,
12
,
1
,
17
));
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
(aaa(aaa)bbb(b|b)ccc(ccc))
'
,
new
Range
(
1
,
14
,
1
,
1
7
),
new
Range
(
1
,
13
,
1
,
18
),
new
Range
(
1
,
2
,
1
,
26
),
new
Range
(
1
,
1
,
1
,
27
));
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
aaa(aaa)bbb(b|b)ccc(ccc)
'
,
new
Range
(
1
,
13
,
1
,
1
5
),
new
Range
(
1
,
12
,
1
,
16
));
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
(aaa(aaa)bbb(b|b)ccc(ccc))
'
,
new
Range
(
1
,
14
,
1
,
1
6
),
new
Range
(
1
,
13
,
1
,
17
),
new
Range
(
1
,
2
,
1
,
25
),
new
Range
(
1
,
1
,
1
,
26
));
});
test
(
'
bracket with leading/trailing
'
,
async
()
=>
{
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
for(a of b){
\n
foo(|);
\n
}
'
,
new
Range
(
2
,
7
,
2
,
8
),
new
Range
(
2
,
6
,
2
,
9
),
new
Range
(
2
,
7
,
2
,
7
),
new
Range
(
2
,
6
,
2
,
8
),
new
Range
(
1
,
13
,
3
,
1
),
new
Range
(
1
,
12
,
3
,
2
),
new
Range
(
1
,
1
,
3
,
2
),
new
Range
(
1
,
1
,
3
,
2
),
);
await
assertRanges
(
new
BracketSelectionRangeProvider
(),
'
for(a of b)
\n
{
\n
foo(|);
\n
}
'
,
new
Range
(
3
,
7
,
3
,
8
),
new
Range
(
3
,
6
,
3
,
9
),
new
Range
(
3
,
7
,
3
,
7
),
new
Range
(
3
,
6
,
3
,
8
),
new
Range
(
2
,
2
,
4
,
1
),
new
Range
(
2
,
1
,
4
,
2
),
new
Range
(
1
,
1
,
4
,
2
),
new
Range
(
1
,
1
,
4
,
2
),
);
...
...
@@ -244,60 +246,60 @@ suite('SmartSelect', () => {
test
(
'
in-word ranges
'
,
async
()
=>
{
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
f|ooBar
'
,
new
Range
(
1
,
1
,
1
,
5
),
// foo
new
Range
(
1
,
1
,
1
,
8
),
// fooBar
new
Range
(
1
,
1
,
1
,
8
),
// doc
new
Range
(
1
,
1
,
1
,
4
),
// foo
new
Range
(
1
,
1
,
1
,
7
),
// fooBar
new
Range
(
1
,
1
,
1
,
7
),
// doc
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
f|oo_Ba
'
,
new
Range
(
1
,
1
,
1
,
5
),
new
Range
(
1
,
1
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
4
),
new
Range
(
1
,
1
,
1
,
7
),
new
Range
(
1
,
1
,
1
,
7
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
f|oo-Ba
'
,
new
Range
(
1
,
1
,
1
,
5
),
new
Range
(
1
,
1
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
8
),
new
Range
(
1
,
1
,
1
,
4
),
new
Range
(
1
,
1
,
1
,
7
),
new
Range
(
1
,
1
,
1
,
7
),
);
});
test
(
'
Default selection should select current word/hump first in camelCase #67493
'
,
async
function
()
{
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Abs|tractSmartSelect
'
,
new
Range
(
1
,
1
,
1
,
10
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
1
,
1
,
9
),
new
Range
(
1
,
1
,
1
,
2
0
),
new
Range
(
1
,
1
,
1
,
2
0
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
AbstractSma|rtSelect
'
,
new
Range
(
1
,
9
,
1
,
1
5
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
9
,
1
,
1
4
),
new
Range
(
1
,
1
,
1
,
2
0
),
new
Range
(
1
,
1
,
1
,
2
0
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Abstrac-Sma|rt-elect
'
,
new
Range
(
1
,
9
,
1
,
1
5
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
9
,
1
,
1
4
),
new
Range
(
1
,
1
,
1
,
2
0
),
new
Range
(
1
,
1
,
1
,
2
0
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Abstrac_Sma|rt_elect
'
,
new
Range
(
1
,
9
,
1
,
1
5
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
9
,
1
,
1
4
),
new
Range
(
1
,
1
,
1
,
2
0
),
new
Range
(
1
,
1
,
1
,
2
0
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Abstrac_Sma|rt-elect
'
,
new
Range
(
1
,
9
,
1
,
1
5
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
9
,
1
,
1
4
),
new
Range
(
1
,
1
,
1
,
2
0
),
new
Range
(
1
,
1
,
1
,
2
0
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Abstrac_Sma|rtSelect
'
,
new
Range
(
1
,
9
,
1
,
1
5
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
1
,
1
,
2
1
),
new
Range
(
1
,
9
,
1
,
1
4
),
new
Range
(
1
,
1
,
1
,
2
0
),
new
Range
(
1
,
1
,
1
,
2
0
),
);
});
...
...
@@ -321,4 +323,49 @@ suite('SmartSelect', () => {
reg
.
dispose
();
});
test
(
'
Expand selection in words with underscores is inconsistent #90589
'
,
async
function
()
{
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Hel|lo_World
'
,
new
Range
(
1
,
1
,
1
,
6
),
new
Range
(
1
,
1
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Hello_Wo|rld
'
,
new
Range
(
1
,
7
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Hello|_World
'
,
new
Range
(
1
,
1
,
1
,
6
),
new
Range
(
1
,
1
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Hello_|World
'
,
new
Range
(
1
,
7
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Hello|-World
'
,
new
Range
(
1
,
1
,
1
,
6
),
new
Range
(
1
,
1
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Hello-|World
'
,
new
Range
(
1
,
7
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
new
Range
(
1
,
1
,
1
,
12
),
);
await
assertRanges
(
new
WordSelectionRangeProvider
(),
'
Hello|World
'
,
new
Range
(
1
,
6
,
1
,
11
),
new
Range
(
1
,
1
,
1
,
11
),
new
Range
(
1
,
1
,
1
,
11
),
);
});
});
src/vs/editor/contrib/smartSelect/wordSelections.ts
浏览文件 @
6c723d56
...
...
@@ -40,7 +40,7 @@ export class WordSelectionRangeProvider implements SelectionRangeProvider {
// LEFT anchor (start)
for
(;
start
>=
0
;
start
--
)
{
let
ch
=
word
.
charCodeAt
(
start
);
if
(
ch
===
CharCode
.
Underline
||
ch
===
CharCode
.
Dash
)
{
if
(
(
start
!==
offset
)
&&
(
ch
===
CharCode
.
Underline
||
ch
===
CharCode
.
Dash
)
)
{
// foo-bar OR foo_bar
break
;
}
else
if
(
isLowerAsciiLetter
(
ch
)
&&
isUpperAsciiLetter
(
lastCh
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录