Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6ceefbe5
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6ceefbe5
编写于
11月 11, 2017
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #37556 - remove redundant action
上级
fa4ca603
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
27 deletion
+4
-27
src/vs/workbench/parts/search/browser/search.contribution.ts
src/vs/workbench/parts/search/browser/search.contribution.ts
+2
-1
src/vs/workbench/parts/search/browser/searchActions.ts
src/vs/workbench/parts/search/browser/searchActions.ts
+2
-26
未找到文件。
src/vs/workbench/parts/search/browser/search.contribution.ts
浏览文件 @
6ceefbe5
...
...
@@ -264,7 +264,8 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
const
registry
=
Registry
.
as
<
IWorkbenchActionRegistry
>
(
ActionExtensions
.
WorkbenchActions
);
const
category
=
nls
.
localize
(
'
search
'
,
"
Search
"
);
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
searchActions
.
OpenSearchViewletAction
,
Constants
.
VIEWLET_ID
,
searchActions
.
OpenSearchViewletAction
.
LABEL
,
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyCode
.
KEY_F
},
// "Show Search" and "Find in Files" are redundant, but we will inevitably break keybindings if we remove one
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
searchActions
.
FindInFilesAction
,
Constants
.
VIEWLET_ID
,
searchActions
.
SHOW_SEARCH_LABEL
,
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyCode
.
KEY_F
},
ContextKeyExpr
.
and
(
Constants
.
SearchViewletVisibleKey
.
toNegated
(),
EditorContextKeys
.
focus
.
toNegated
())),
'
View: Show Search
'
,
nls
.
localize
(
'
view
'
,
"
View
"
));
registry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
searchActions
.
FindInFilesAction
,
Constants
.
FindInFilesActionId
,
searchActions
.
FindInFilesAction
.
LABEL
,
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyCode
.
KEY_F
},
ContextKeyExpr
.
and
(
Constants
.
SearchInputBoxFocusedKey
.
toNegated
(),
EditorContextKeys
.
focus
.
toNegated
())),
'
Find in Files
'
,
category
);
...
...
src/vs/workbench/parts/search/browser/searchActions.ts
浏览文件 @
6ceefbe5
...
...
@@ -221,32 +221,6 @@ export class FocusPreviousInputAction extends Action {
}
}
export
class
OpenSearchViewletAction
extends
ToggleViewletAction
{
public
static
LABEL
=
nls
.
localize
(
'
showSearchViewlet
'
,
"
Show Search
"
);
constructor
(
id
:
string
,
label
:
string
,
@
IViewletService
viewletService
:
IViewletService
,
@
IWorkbenchEditorService
editorService
:
IWorkbenchEditorService
)
{
super
(
id
,
label
,
Constants
.
VIEWLET_ID
,
viewletService
,
editorService
);
}
public
run
():
TPromise
<
any
>
{
const
activeViewlet
=
this
.
viewletService
.
getActiveViewlet
();
const
searchViewletWasOpen
=
activeViewlet
&&
activeViewlet
.
getId
()
===
Constants
.
VIEWLET_ID
;
return
super
.
run
().
then
(()
=>
{
if
(
!
searchViewletWasOpen
)
{
// Get the search viewlet and ensure that 'replace' is collapsed
const
searchViewlet
=
this
.
viewletService
.
getActiveViewlet
();
if
(
searchViewlet
&&
searchViewlet
.
getId
()
===
Constants
.
VIEWLET_ID
)
{
const
searchAndReplaceWidget
=
(
<
SearchViewlet
>
searchViewlet
).
searchAndReplaceWidget
;
searchAndReplaceWidget
.
toggleReplace
(
false
);
}
}
});
}
}
export
const
FocusActiveEditorCommand
=
(
accessor
:
ServicesAccessor
)
=>
{
const
editorService
=
accessor
.
get
(
IWorkbenchEditorService
);
const
editor
=
editorService
.
getActiveEditor
();
...
...
@@ -289,6 +263,8 @@ export abstract class FindOrReplaceInFilesAction extends Action {
}
}
export
const
SHOW_SEARCH_LABEL
=
nls
.
localize
(
'
showSearchViewlet
'
,
"
Show Search
"
);
export
class
FindInFilesAction
extends
FindOrReplaceInFilesAction
{
public
static
LABEL
=
nls
.
localize
(
'
findInFiles
'
,
"
Find in Files
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录