Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b3041cbc
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,体验更适合开发者的 AI 搜索 >>
提交
b3041cbc
编写于
5月 19, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #6661: Relax cursor merging rules in case of touching ranges
上级
09300167
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
58 addition
and
2 deletion
+58
-2
src/vs/editor/common/controller/cursorCollection.ts
src/vs/editor/common/controller/cursorCollection.ts
+10
-1
src/vs/editor/contrib/find/test/common/findController.test.ts
...vs/editor/contrib/find/test/common/findController.test.ts
+48
-1
未找到文件。
src/vs/editor/common/controller/cursorCollection.ts
浏览文件 @
b3041cbc
...
@@ -202,7 +202,16 @@ export class CursorCollection {
...
@@ -202,7 +202,16 @@ export class CursorCollection {
const
currentViewSelection
=
current
.
viewSelection
;
const
currentViewSelection
=
current
.
viewSelection
;
const
nextViewSelection
=
next
.
viewSelection
;
const
nextViewSelection
=
next
.
viewSelection
;
if
(
nextViewSelection
.
getStartPosition
().
isBeforeOrEqual
(
currentViewSelection
.
getEndPosition
()))
{
let
shouldMergeCursors
:
boolean
;
if
(
nextViewSelection
.
isEmpty
()
||
currentViewSelection
.
isEmpty
())
{
// Merge touching cursors if one of them is collapsed
shouldMergeCursors
=
nextViewSelection
.
getStartPosition
().
isBeforeOrEqual
(
currentViewSelection
.
getEndPosition
());
}
else
{
// Merge only overlapping cursors (i.e. allow touching ranges)
shouldMergeCursors
=
nextViewSelection
.
getStartPosition
().
isBefore
(
currentViewSelection
.
getEndPosition
());
}
if
(
shouldMergeCursors
)
{
const
winnerSortedCursorIndex
=
current
.
index
<
next
.
index
?
sortedCursorIndex
:
sortedCursorIndex
+
1
;
const
winnerSortedCursorIndex
=
current
.
index
<
next
.
index
?
sortedCursorIndex
:
sortedCursorIndex
+
1
;
const
looserSortedCursorIndex
=
current
.
index
<
next
.
index
?
sortedCursorIndex
+
1
:
sortedCursorIndex
;
const
looserSortedCursorIndex
=
current
.
index
<
next
.
index
?
sortedCursorIndex
+
1
:
sortedCursorIndex
;
...
...
src/vs/editor/contrib/find/test/common/findController.test.ts
浏览文件 @
b3041cbc
...
@@ -11,7 +11,7 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
...
@@ -11,7 +11,7 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
EndOfLineSequence
,
ICommonCodeEditor
}
from
'
vs/editor/common/editorCommon
'
;
import
{
EndOfLineSequence
,
ICommonCodeEditor
,
Handler
}
from
'
vs/editor/common/editorCommon
'
;
import
{
import
{
CommonFindController
,
FindStartFocusAction
,
IFindStartOptions
,
CommonFindController
,
FindStartFocusAction
,
IFindStartOptions
,
NextMatchFindAction
,
StartFindAction
,
SelectHighlightsAction
,
NextMatchFindAction
,
StartFindAction
,
SelectHighlightsAction
,
...
@@ -412,6 +412,53 @@ suite('FindController', () => {
...
@@ -412,6 +412,53 @@ suite('FindController', () => {
});
});
});
});
test
(
'
issue #6661: AddSelectionToNextFindMatchAction can work with touching ranges
'
,
()
=>
{
withMockCodeEditor
([
'
abcabc
'
,
'
abc
'
,
'
abcabc
'
,
],
{
serviceCollection
:
serviceCollection
},
(
editor
,
cursor
)
=>
{
let
findController
=
editor
.
registerAndInstantiateContribution
<
TestFindController
>
(
TestFindController
);
let
addSelectionToNextFindMatch
=
new
AddSelectionToNextFindMatchAction
();
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
4
));
addSelectionToNextFindMatch
.
run
(
null
,
editor
);
assert
.
deepEqual
(
editor
.
getSelections
().
map
(
fromRange
),
[
[
1
,
1
,
1
,
4
],
[
1
,
4
,
1
,
7
]
]);
addSelectionToNextFindMatch
.
run
(
null
,
editor
);
addSelectionToNextFindMatch
.
run
(
null
,
editor
);
addSelectionToNextFindMatch
.
run
(
null
,
editor
);
assert
.
deepEqual
(
editor
.
getSelections
().
map
(
fromRange
),
[
[
1
,
1
,
1
,
4
],
[
1
,
4
,
1
,
7
],
[
2
,
1
,
2
,
4
],
[
3
,
1
,
3
,
4
],
[
3
,
4
,
3
,
7
]
]);
editor
.
trigger
(
'
test
'
,
Handler
.
Type
,
{
text
:
'
z
'
});
assert
.
deepEqual
(
editor
.
getSelections
().
map
(
fromRange
),
[
[
1
,
2
,
1
,
2
],
[
1
,
3
,
1
,
3
],
[
2
,
2
,
2
,
2
],
[
3
,
2
,
3
,
2
],
[
3
,
3
,
3
,
3
]
]);
assert
.
equal
(
editor
.
getValue
(),
[
'
zz
'
,
'
z
'
,
'
zz
'
,
].
join
(
'
\n
'
));
findController
.
dispose
();
});
});
test
(
'
issue #23541: Multiline Ctrl+D does not work in CRLF files
'
,
()
=>
{
test
(
'
issue #23541: Multiline Ctrl+D does not work in CRLF files
'
,
()
=>
{
withMockCodeEditor
([
withMockCodeEditor
([
''
,
''
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录