Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d431ec51
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,发现更多精彩内容 >>
提交
d431ec51
编写于
3月 03, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #91962
上级
5dc11a21
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
src/vs/workbench/contrib/search/browser/searchActions.ts
src/vs/workbench/contrib/search/browser/searchActions.ts
+7
-7
未找到文件。
src/vs/workbench/contrib/search/browser/searchActions.ts
浏览文件 @
d431ec51
...
...
@@ -19,7 +19,7 @@ import { getSelectionKeyboardEvent, WorkbenchObjectTree } from 'vs/platform/list
import
{
SearchView
}
from
'
vs/workbench/contrib/search/browser/searchView
'
;
import
*
as
Constants
from
'
vs/workbench/contrib/search/common/constants
'
;
import
{
IReplaceService
}
from
'
vs/workbench/contrib/search/common/replace
'
;
import
{
FolderMatch
,
FileMatch
,
F
ileMatchOrMatch
,
F
olderMatchWithResource
,
Match
,
RenderableMatch
,
searchMatchComparer
,
SearchResult
}
from
'
vs/workbench/contrib/search/common/searchModel
'
;
import
{
FolderMatch
,
FileMatch
,
FolderMatchWithResource
,
Match
,
RenderableMatch
,
searchMatchComparer
,
SearchResult
}
from
'
vs/workbench/contrib/search/common/searchModel
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
ISearchConfiguration
,
VIEW_ID
}
from
'
vs/workbench/services/search/common/search
'
;
...
...
@@ -711,16 +711,16 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
});
}
private
getElementToFocusAfterReplace
():
Match
{
const
navigator
:
ITreeNavigator
<
any
>
=
this
.
viewer
.
navigate
();
private
getElementToFocusAfterReplace
():
Renderable
Match
{
const
navigator
:
ITreeNavigator
<
RenderableMatch
|
null
>
=
this
.
viewer
.
navigate
();
let
fileMatched
=
false
;
let
elementToFocus
:
any
=
null
;
let
elementToFocus
:
RenderableMatch
|
null
=
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
()))
{
if
(
this
.
element
.
range
().
getStartPosition
().
isBeforeOrEqual
(
elementToFocus
.
range
().
getStartPosition
()))
{
// Closest next match in the same file
break
;
}
...
...
@@ -735,10 +735,10 @@ export class ReplaceAction extends AbstractSearchAndReplaceAction {
}
}
}
while
(
!!
navigator
.
next
());
return
elementToFocus
;
return
elementToFocus
!
;
}
private
async
getElementToShowReplacePreview
(
elementToFocus
:
FileMatchOr
Match
):
Promise
<
Match
|
null
>
{
private
async
getElementToShowReplacePreview
(
elementToFocus
:
Renderable
Match
):
Promise
<
Match
|
null
>
{
if
(
this
.
hasSameParent
(
elementToFocus
))
{
return
<
Match
>
elementToFocus
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录