Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3fa0a5b1
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 搜索 >>
提交
3fa0a5b1
编写于
5月 25, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #3516: Keep editor selection steady when doing replaceAll
上级
d1220909
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
14 deletion
+42
-14
src/vs/editor/contrib/find/common/findModel.ts
src/vs/editor/contrib/find/common/findModel.ts
+1
-1
src/vs/editor/contrib/find/common/replaceAllCommand.ts
src/vs/editor/contrib/find/common/replaceAllCommand.ts
+7
-9
src/vs/editor/contrib/find/test/common/findModel.test.ts
src/vs/editor/contrib/find/test/common/findModel.test.ts
+34
-4
未找到文件。
src/vs/editor/contrib/find/common/findModel.ts
浏览文件 @
3fa0a5b1
...
...
@@ -350,7 +350,7 @@ export class FindModelBoundToEditorModel {
replaceStrings
.
push
(
this
.
getReplaceString
(
model
.
getValueInRange
(
ranges
[
i
])));
}
let
command
=
new
ReplaceAllCommand
(
ranges
,
replaceStrings
);
let
command
=
new
ReplaceAllCommand
(
this
.
_editor
.
getSelection
(),
ranges
,
replaceStrings
);
this
.
_executeEditorCommand
(
'
replaceAll
'
,
command
);
this
.
research
(
false
);
...
...
src/vs/editor/contrib/find/common/replaceAllCommand.ts
浏览文件 @
3fa0a5b1
...
...
@@ -15,10 +15,13 @@ interface IEditOperation {
export
class
ReplaceAllCommand
implements
editorCommon
.
ICommand
{
private
_editorSelection
:
Selection
;
private
_trackedEditorSelectionId
:
string
;
private
_ranges
:
Range
[];
private
_replaceStrings
:
string
[];
constructor
(
ranges
:
Range
[],
replaceStrings
:
string
[])
{
constructor
(
editorSelection
:
Selection
,
ranges
:
Range
[],
replaceStrings
:
string
[])
{
this
.
_editorSelection
=
editorSelection
;
this
.
_ranges
=
ranges
;
this
.
_replaceStrings
=
replaceStrings
;
}
...
...
@@ -58,16 +61,11 @@ export class ReplaceAllCommand implements editorCommon.ICommand {
builder
.
addEditOperation
(
resultOps
[
i
].
range
,
resultOps
[
i
].
text
);
}
}
this
.
_trackedEditorSelectionId
=
builder
.
trackSelection
(
this
.
_editorSelection
);
}
public
computeCursorState
(
model
:
editorCommon
.
ITokenizedModel
,
helper
:
editorCommon
.
ICursorStateComputerData
):
Selection
{
var
inverseEditOperations
=
helper
.
getInverseEditOperations
();
var
srcRange
=
inverseEditOperations
[
inverseEditOperations
.
length
-
1
].
range
;
return
Selection
.
createSelection
(
srcRange
.
endLineNumber
,
srcRange
.
endColumn
,
srcRange
.
endLineNumber
,
srcRange
.
endColumn
);
return
helper
.
getTrackedSelection
(
this
.
_trackedEditorSelectionId
);
}
}
src/vs/editor/contrib/find/test/common/findModel.test.ts
浏览文件 @
3fa0a5b1
...
...
@@ -1212,7 +1212,7 @@ suite('FindModel', () => {
findModel
.
replaceAll
();
assertFindState
(
editor
,
[
8
,
16
,
8
,
16
],
[
6
,
17
,
6
,
17
],
null
,
[
]
);
...
...
@@ -1248,7 +1248,7 @@ suite('FindModel', () => {
findModel
.
replaceAll
();
assertFindState
(
editor
,
[
9
,
3
,
9
,
3
],
[
1
,
1
,
1
,
1
],
null
,
[
[
6
,
1
,
6
,
3
],
...
...
@@ -1285,7 +1285,7 @@ suite('FindModel', () => {
findModel
.
replaceAll
();
assertFindState
(
editor
,
[
1
1
,
16
,
11
,
16
],
[
1
,
1
,
1
,
1
],
null
,
[]
);
...
...
@@ -1314,7 +1314,7 @@ suite('FindModel', () => {
findModel
.
replaceAll
();
assertFindState
(
editor
,
[
1
4
,
3
,
14
,
3
],
[
1
,
1
,
1
,
1
],
null
,
[]
);
...
...
@@ -1327,6 +1327,36 @@ suite('FindModel', () => {
findState
.
dispose
();
});
findTest
(
'
issue #3516: "replace all" moves page/cursor/focus/scroll to the place of the last replacement
'
,
(
editor
,
cursor
)
=>
{
let
findState
=
new
FindReplaceState
();
findState
.
change
({
searchString
:
'
include
'
,
replaceString
:
'
bar
'
},
false
);
let
findModel
=
new
FindModelBoundToEditorModel
(
editor
,
findState
);
assertFindState
(
editor
,
[
1
,
1
,
1
,
1
],
null
,
[
[
2
,
2
,
2
,
9
],
[
3
,
2
,
3
,
9
]
]
);
findModel
.
replaceAll
();
assertFindState
(
editor
,
[
1
,
1
,
1
,
1
],
null
,
[]
);
assert
.
equal
(
editor
.
getModel
().
getLineContent
(
2
),
'
#bar "cool.h"
'
);
assert
.
equal
(
editor
.
getModel
().
getLineContent
(
3
),
'
#bar <iostream>
'
);
findModel
.
dispose
();
findState
.
dispose
();
});
findTest
(
'
finds only in editable range if replace is shown
'
,
(
editor
,
cursor
)
=>
{
editor
.
getModel
().
setEditableRange
({
startLineNumber
:
6
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录