Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d55daa19
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,发现更多精彩内容 >>
提交
d55daa19
编写于
10月 26, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #14143: Maintain editor's selection as primary range if it is one of the find matches
上级
6dd7a04b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
58 addition
and
1 deletion
+58
-1
src/vs/editor/contrib/find/common/findModel.ts
src/vs/editor/contrib/find/common/findModel.ts
+12
-1
src/vs/editor/contrib/find/test/common/findModel.test.ts
src/vs/editor/contrib/find/test/common/findModel.test.ts
+46
-0
未找到文件。
src/vs/editor/contrib/find/common/findModel.ts
浏览文件 @
d55daa19
...
...
@@ -428,8 +428,19 @@ export class FindModelBoundToEditorModel {
// Get all the ranges (even more than the highlighted ones)
let
ranges
=
this
.
_findMatches
(
findScope
,
Number
.
MAX_VALUE
);
let
selections
=
ranges
.
map
(
r
=>
new
Selection
(
r
.
startLineNumber
,
r
.
startColumn
,
r
.
endLineNumber
,
r
.
endColumn
));
// If one of the ranges is the editor selection, then maintain it as primary
let
editorSelection
=
this
.
_editor
.
getSelection
();
for
(
let
i
=
0
,
len
=
selections
.
length
;
i
<
len
;
i
++
)
{
let
sel
=
selections
[
i
];
if
(
sel
.
equalsRange
(
editorSelection
))
{
selections
=
[
editorSelection
].
concat
(
selections
.
slice
(
0
,
i
)).
concat
(
selections
.
slice
(
i
+
1
));
break
;
}
}
this
.
_editor
.
setSelections
(
ranges
.
map
(
r
=>
new
Selection
(
r
.
startLineNumber
,
r
.
startColumn
,
r
.
endLineNumber
,
r
.
endColumn
))
);
this
.
_editor
.
setSelections
(
selections
);
}
private
_executeEditorCommand
(
source
:
string
,
command
:
editorCommon
.
ICommand
):
void
{
...
...
src/vs/editor/contrib/find/test/common/findModel.test.ts
浏览文件 @
d55daa19
...
...
@@ -1585,6 +1585,52 @@ suite('FindModel', () => {
findState
.
dispose
();
});
findTest
(
'
issue #14143 selectAllMatches should maintain primary cursor if feasible
'
,
(
editor
,
cursor
)
=>
{
let
findState
=
new
FindReplaceState
();
findState
.
change
({
searchString
:
'
hello
'
,
replaceString
:
'
hi
'
,
wholeWord
:
true
},
false
);
let
findModel
=
new
FindModelBoundToEditorModel
(
editor
,
findState
);
assertFindState
(
editor
,
[
1
,
1
,
1
,
1
],
null
,
[
[
6
,
14
,
6
,
19
],
[
6
,
27
,
6
,
32
],
[
7
,
14
,
7
,
19
],
[
8
,
14
,
8
,
19
]
]
);
editor
.
setSelection
(
new
Range
(
7
,
14
,
7
,
19
));
findModel
.
selectAllMatches
();
assert
.
deepEqual
(
editor
.
getSelections
().
map
(
s
=>
s
.
toString
()),
[
new
Selection
(
7
,
14
,
7
,
19
),
new
Selection
(
6
,
14
,
6
,
19
),
new
Selection
(
6
,
27
,
6
,
32
),
new
Selection
(
8
,
14
,
8
,
19
)
].
map
(
s
=>
s
.
toString
()));
assert
.
deepEqual
(
editor
.
getSelection
().
toString
(),
new
Selection
(
7
,
14
,
7
,
19
).
toString
());
assertFindState
(
editor
,
[
7
,
14
,
7
,
19
],
null
,
[
[
6
,
14
,
6
,
19
],
[
6
,
27
,
6
,
32
],
[
7
,
14
,
7
,
19
],
[
8
,
14
,
8
,
19
]
]
);
findModel
.
dispose
();
findState
.
dispose
();
});
findTest
(
'
issue #1914: NPE when there is only one find match
'
,
(
editor
,
cursor
)
=>
{
let
findState
=
new
FindReplaceState
();
findState
.
change
({
searchString
:
'
cool.h
'
},
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录