Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
879a4091
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,发现更多精彩内容 >>
提交
879a4091
编写于
2月 22, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
search: do not make assumptions that search view is in viewlet area
上级
d97e1aba
变更
2
展开全部
显示空白变更内容
内联
并排
Showing
2 changed file
with
70 addition
and
57 deletion
+70
-57
src/vs/workbench/parts/search/browser/searchActions.ts
src/vs/workbench/parts/search/browser/searchActions.ts
+22
-8
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
...ench/parts/search/electron-browser/search.contribution.ts
+48
-49
未找到文件。
src/vs/workbench/parts/search/browser/searchActions.ts
浏览文件 @
879a4091
...
...
@@ -37,6 +37,14 @@ export function appendKeyBindingLabel(label: string, keyBinding: number | Resolv
}
}
export
function
openSearchView
(
viewletService
:
IViewletService
,
panelService
:
IPanelService
,
focus
?:
boolean
):
TPromise
<
SearchView
>
{
if
(
viewletService
.
getViewlets
().
filter
(
v
=>
v
.
id
===
Constants
.
VIEW_ID
).
length
)
{
return
viewletService
.
openViewlet
(
Constants
.
VIEW_ID
,
focus
).
then
(
viewlet
=>
<
SearchView
>
viewlet
);
}
return
panelService
.
openPanel
(
Constants
.
VIEW_ID
,
focus
).
then
(
panel
=>
<
SearchView
>
panel
);
}
export
function
getSearchView
(
viewletService
:
IViewletService
,
panelService
:
IPanelService
):
SearchView
{
const
activeViewlet
=
viewletService
.
getActiveViewlet
();
if
(
activeViewlet
&&
activeViewlet
.
getId
()
===
Constants
.
VIEW_ID
)
{
...
...
@@ -256,9 +264,9 @@ export abstract class FindOrReplaceInFilesAction extends Action {
public
run
():
TPromise
<
any
>
{
const
searchView
=
getSearchView
(
this
.
viewletService
,
this
.
panelService
);
return
this
.
viewletService
.
openViewlet
(
Constants
.
VIEW_ID
,
true
).
then
((
viewlet
)
=>
{
return
openSearchView
(
this
.
viewletService
,
this
.
panelService
,
true
).
then
(
openedView
=>
{
if
(
!
searchView
||
this
.
expandSearchReplaceWidget
)
{
const
searchAndReplaceWidget
=
(
<
SearchView
>
viewlet
)
.
searchAndReplaceWidget
;
const
searchAndReplaceWidget
=
openedView
.
searchAndReplaceWidget
;
searchAndReplaceWidget
.
toggleReplace
(
this
.
expandSearchReplaceWidget
);
// Focus replace only when there is text in the searchInput box
const
focusReplace
=
this
.
focusReplace
&&
searchAndReplaceWidget
.
searchInput
.
getValue
();
...
...
@@ -434,13 +442,16 @@ export class FocusNextSearchResultAction extends Action {
public
static
readonly
ID
=
'
search.action.focusNextSearchResult
'
;
public
static
readonly
LABEL
=
nls
.
localize
(
'
FocusNextSearchResult.label
'
,
"
Focus Next Search Result
"
);
constructor
(
id
:
string
,
label
:
string
,
@
IViewletService
private
viewletService
:
IViewletService
)
{
constructor
(
id
:
string
,
label
:
string
,
@
IViewletService
private
viewletService
:
IViewletService
,
@
IPanelService
private
panelService
:
IPanelService
)
{
super
(
id
,
label
);
}
public
run
():
TPromise
<
any
>
{
return
this
.
viewletService
.
openViewlet
(
Constants
.
VIEW_ID
).
then
(
searchViewlet
=>
{
(
searchViewlet
as
SearchView
)
.
selectNextMatch
();
return
openSearchView
(
this
.
viewletService
,
this
.
panelService
).
then
(
searchView
=>
{
searchView
.
selectNextMatch
();
});
}
}
...
...
@@ -449,13 +460,16 @@ export class FocusPreviousSearchResultAction extends Action {
public
static
readonly
ID
=
'
search.action.focusPreviousSearchResult
'
;
public
static
readonly
LABEL
=
nls
.
localize
(
'
FocusPreviousSearchResult.label
'
,
"
Focus Previous Search Result
"
);
constructor
(
id
:
string
,
label
:
string
,
@
IViewletService
private
viewletService
:
IViewletService
)
{
constructor
(
id
:
string
,
label
:
string
,
@
IViewletService
private
viewletService
:
IViewletService
,
@
IPanelService
private
panelService
:
IPanelService
)
{
super
(
id
,
label
);
}
public
run
():
TPromise
<
any
>
{
return
this
.
viewletService
.
openViewlet
(
Constants
.
VIEW_ID
).
then
(
searchViewlet
=>
{
(
searchViewlet
as
SearchView
)
.
selectPreviousMatch
();
return
openSearchView
(
this
.
viewletService
,
this
.
panelService
).
then
(
searchView
=>
{
searchView
.
selectPreviousMatch
();
});
}
}
...
...
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
浏览文件 @
879a4091
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录