Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
36961289
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,发现更多精彩内容 >>
提交
36961289
编写于
12月 10, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add leading/trailing line part to bracket selection #64004
上级
47661d4e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
47 addition
and
2 deletion
+47
-2
src/vs/editor/contrib/smartSelect/bracketSelections.ts
src/vs/editor/contrib/smartSelect/bracketSelections.ts
+33
-2
src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts
...or/contrib/smartSelect/test/tokenSelectionSupport.test.ts
+14
-0
未找到文件。
src/vs/editor/contrib/smartSelect/bracketSelections.ts
浏览文件 @
36961289
...
...
@@ -105,12 +105,43 @@ export class BracketSelectionRangeProvider implements SelectionRangeProvider {
if
(
arr
.
length
===
0
)
{
ranges
.
delete
(
key
);
}
bucket
.
push
(
Range
.
fromPositions
(
bracket
.
range
.
getEndPosition
(),
closing
!
.
getStartPosition
()));
bucket
.
push
(
Range
.
fromPositions
(
bracket
.
range
.
getStartPosition
(),
closing
!
.
getEndPosition
()));
const
innerBracket
=
Range
.
fromPositions
(
bracket
.
range
.
getEndPosition
(),
closing
!
.
getStartPosition
());
const
outerBracket
=
Range
.
fromPositions
(
bracket
.
range
.
getStartPosition
(),
closing
!
.
getEndPosition
());
bucket
.
push
(
innerBracket
);
bucket
.
push
(
outerBracket
);
BracketSelectionRangeProvider
.
_addBracketLeading
(
model
,
outerBracket
,
bucket
);
}
}
}
pos
=
bracket
.
range
.
getStartPosition
();
}
}
private
static
_addBracketLeading
(
model
:
ITextModel
,
bracket
:
Range
,
bucket
:
Range
[]):
void
{
if
(
bracket
.
startLineNumber
===
bracket
.
endLineNumber
)
{
return
;
}
// xxxxxxxx {
//
// }
const
startLine
=
bracket
.
startLineNumber
;
const
column
=
model
.
getLineFirstNonWhitespaceColumn
(
startLine
);
if
(
column
!==
0
&&
column
!==
bracket
.
startColumn
)
{
bucket
.
push
(
Range
.
fromPositions
(
new
Position
(
startLine
,
column
),
bracket
.
getEndPosition
()));
bucket
.
push
(
Range
.
fromPositions
(
new
Position
(
startLine
,
1
),
bracket
.
getEndPosition
()));
}
// xxxxxxxx
// {
//
// }
const
aboveLine
=
startLine
-
1
;
if
(
aboveLine
>
0
)
{
const
column
=
model
.
getLineFirstNonWhitespaceColumn
(
aboveLine
);
if
(
column
===
bracket
.
startColumn
&&
column
!==
model
.
getLineLastNonWhitespaceColumn
(
aboveLine
))
{
bucket
.
push
(
Range
.
fromPositions
(
new
Position
(
aboveLine
,
column
),
bracket
.
getEndPosition
()));
bucket
.
push
(
Range
.
fromPositions
(
new
Position
(
aboveLine
,
1
),
bracket
.
getEndPosition
()));
}
}
}
}
src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts
浏览文件 @
36961289
...
...
@@ -234,4 +234,18 @@ suite('SmartSelect', () => {
await
assertRanges
(
'
(aaa(aaa)bbb(bIb)ccc(ccc))
'
,
new
Range
(
1
,
14
,
1
,
17
),
new
Range
(
1
,
13
,
1
,
18
),
new
Range
(
1
,
2
,
1
,
26
),
new
Range
(
1
,
1
,
1
,
27
));
});
test
(
'
bracket with leading/trailing
'
,
async
()
=>
{
await
assertRanges
(
'
for(a of b){
\n
foo(I);
\n
}
'
,
new
Range
(
2
,
7
,
2
,
8
),
new
Range
(
2
,
6
,
2
,
9
),
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
(
'
for(a of b)
\n
{
\n
foo(I);
\n
}
'
,
new
Range
(
3
,
7
,
3
,
8
),
new
Range
(
3
,
6
,
3
,
9
),
new
Range
(
2
,
2
,
4
,
1
),
new
Range
(
2
,
1
,
4
,
2
),
new
Range
(
1
,
1
,
4
,
2
),
new
Range
(
1
,
1
,
4
,
2
),
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录