Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6fc75bf6
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,发现更多精彩内容 >>
提交
6fc75bf6
编写于
11月 07, 2016
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #14167
- Fix navigation when replacing a single match
上级
d4baf8a3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
30 addition
and
3 deletion
+30
-3
src/vs/workbench/parts/search/browser/searchActions.ts
src/vs/workbench/parts/search/browser/searchActions.ts
+30
-3
未找到文件。
src/vs/workbench/parts/search/browser/searchActions.ts
浏览文件 @
6fc75bf6
...
@@ -305,7 +305,7 @@ export abstract class AbstractSearchAndReplaceAction extends Action {
...
@@ -305,7 +305,7 @@ export abstract class AbstractSearchAndReplaceAction extends Action {
private
getNavigatorAt
(
element
:
FileMatchOrMatch
,
viewer
:
ITree
):
INavigator
<
any
>
{
private
getNavigatorAt
(
element
:
FileMatchOrMatch
,
viewer
:
ITree
):
INavigator
<
any
>
{
let
navigator
:
INavigator
<
any
>
=
viewer
.
getNavigator
();
let
navigator
:
INavigator
<
any
>
=
viewer
.
getNavigator
();
while
(
navigator
.
current
()
!==
element
&&
!!
navigator
.
next
())
{
}
;
while
(
navigator
.
current
()
!==
element
&&
!!
navigator
.
next
())
{
}
return
navigator
;
return
navigator
;
}
}
}
}
...
@@ -382,13 +382,13 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
...
@@ -382,13 +382,13 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
public
run
():
TPromise
<
any
>
{
public
run
():
TPromise
<
any
>
{
this
.
enabled
=
false
;
this
.
enabled
=
false
;
this
.
telemetryService
.
publicLog
(
'
replace.action.selected
'
);
this
.
telemetryService
.
publicLog
(
'
replace.action.selected
'
);
let
elementToFocus
=
this
.
getElementToFocusAfterRemoved
(
this
.
viewer
,
this
.
element
);
let
elementToShowReplacePreview
=
this
.
getElementToShowReplacePreview
(
elementToFocus
);
return
this
.
element
.
parent
().
replace
(
this
.
element
).
then
(()
=>
{
return
this
.
element
.
parent
().
replace
(
this
.
element
).
then
(()
=>
{
let
elementToFocus
=
this
.
getElementToFocusAfterReplace
();
if
(
elementToFocus
)
{
if
(
elementToFocus
)
{
this
.
viewer
.
setFocus
(
elementToFocus
);
this
.
viewer
.
setFocus
(
elementToFocus
);
}
}
let
elementToShowReplacePreview
=
this
.
getElementToShowReplacePreview
(
elementToFocus
);
this
.
viewer
.
DOMFocus
();
this
.
viewer
.
DOMFocus
();
if
(
!
elementToShowReplacePreview
||
this
.
hasToOpenFile
())
{
if
(
!
elementToShowReplacePreview
||
this
.
hasToOpenFile
())
{
this
.
viewlet
.
open
(
this
.
element
,
true
);
this
.
viewlet
.
open
(
this
.
element
,
true
);
...
@@ -398,6 +398,33 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
...
@@ -398,6 +398,33 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
});
});
}
}
private
getElementToFocusAfterReplace
():
Match
{
let
navigator
:
INavigator
<
any
>
=
this
.
viewer
.
getNavigator
();
let
fileMatched
=
false
;
let
elementToFocus
=
null
;
do
{
elementToFocus
=
navigator
.
current
();
if
(
elementToFocus
instanceof
Match
)
{
if
(
elementToFocus
.
parent
().
id
()
===
this
.
element
.
parent
().
id
())
{
fileMatched
=
true
;
if
(
this
.
element
.
range
().
getStartPosition
().
isBeforeOrEqual
((
<
Match
>
elementToFocus
).
range
().
getStartPosition
()))
{
// Closest next match in the same file
break
;
}
}
else
if
(
fileMatched
)
{
// First match in the next file (if expanded)
break
;
}
}
else
if
(
fileMatched
)
{
if
(
!
this
.
viewer
.
isExpanded
(
elementToFocus
))
{
// Next file match (if collapsed)
break
;
}
}
}
while
(
!!
navigator
.
next
());
return
elementToFocus
;
}
private
getElementToShowReplacePreview
(
elementToFocus
:
FileMatchOrMatch
):
Match
{
private
getElementToShowReplacePreview
(
elementToFocus
:
FileMatchOrMatch
):
Match
{
if
(
this
.
hasSameParent
(
elementToFocus
))
{
if
(
this
.
hasSameParent
(
elementToFocus
))
{
return
<
Match
>
elementToFocus
;
return
<
Match
>
elementToFocus
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录