Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
dc62a6ef
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,发现更多精彩内容 >>
提交
dc62a6ef
编写于
9月 14, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #17577
上级
23efb2fb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
26 addition
and
7 deletion
+26
-7
src/vs/workbench/browser/composite.ts
src/vs/workbench/browser/composite.ts
+17
-4
src/vs/workbench/parts/search/browser/searchView.ts
src/vs/workbench/parts/search/browser/searchView.ts
+5
-0
src/vs/workbench/parts/search/common/constants.ts
src/vs/workbench/parts/search/common/constants.ts
+1
-0
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
...ench/parts/search/electron-browser/search.contribution.ts
+3
-3
未找到文件。
src/vs/workbench/browser/composite.ts
浏览文件 @
dc62a6ef
...
...
@@ -32,13 +32,26 @@ export abstract class Composite extends Component implements IComposite {
private
_onDidFocus
:
Emitter
<
void
>
;
get
onDidFocus
():
Event
<
void
>
{
if
(
!
this
.
_onDidFocus
)
{
this
.
_onDidFocus
=
this
.
_register
(
new
Emitter
<
void
>
());
this
.
_registerFocusTrackEvents
();
}
return
this
.
_onDidFocus
.
event
;
}
const
focusTracker
=
this
.
_register
(
trackFocus
(
this
.
getContainer
()));
this
.
_register
(
focusTracker
.
onDidFocus
(()
=>
this
.
_onDidFocus
.
fire
()));
private
_onDidBlur
:
Emitter
<
void
>
;
get
onDidBlur
():
Event
<
void
>
{
if
(
!
this
.
_onDidBlur
)
{
this
.
_registerFocusTrackEvents
();
}
return
this
.
_onDidBlur
.
event
;
}
return
this
.
_onDidFocus
.
event
;
private
_registerFocusTrackEvents
():
void
{
this
.
_onDidFocus
=
this
.
_register
(
new
Emitter
<
void
>
());
this
.
_onDidBlur
=
this
.
_register
(
new
Emitter
<
void
>
());
const
focusTracker
=
this
.
_register
(
trackFocus
(
this
.
getContainer
()));
this
.
_register
(
focusTracker
.
onDidFocus
(()
=>
this
.
_onDidFocus
.
fire
()));
this
.
_register
(
focusTracker
.
onDidBlur
(()
=>
this
.
_onDidBlur
.
fire
()));
}
protected
actionRunner
:
IActionRunner
;
...
...
src/vs/workbench/parts/search/browser/searchView.ts
浏览文件 @
dc62a6ef
...
...
@@ -77,6 +77,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
private
viewModel
:
SearchModel
;
private
viewletVisible
:
IContextKey
<
boolean
>
;
private
viewletFocused
:
IContextKey
<
boolean
>
;
private
inputBoxFocused
:
IContextKey
<
boolean
>
;
private
inputPatternIncludesFocused
:
IContextKey
<
boolean
>
;
private
inputPatternExclusionsFocused
:
IContextKey
<
boolean
>
;
...
...
@@ -139,6 +140,7 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
super
(
VIEW_ID
,
partService
,
telemetryService
,
themeService
);
this
.
viewletVisible
=
Constants
.
SearchViewVisibleKey
.
bindTo
(
contextKeyService
);
this
.
viewletFocused
=
Constants
.
SearchViewFocusedKey
.
bindTo
(
contextKeyService
);
this
.
inputBoxFocused
=
Constants
.
InputBoxFocusedKey
.
bindTo
(
this
.
contextKeyService
);
this
.
inputPatternIncludesFocused
=
Constants
.
PatternIncludesFocusedKey
.
bindTo
(
this
.
contextKeyService
);
this
.
inputPatternExclusionsFocused
=
Constants
.
PatternExcludesFocusedKey
.
bindTo
(
this
.
contextKeyService
);
...
...
@@ -273,6 +275,9 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
this
.
_register
(
this
.
viewModel
.
searchResult
.
onChange
((
event
)
=>
this
.
onSearchResultsChanged
(
event
)));
this
.
_register
(
this
.
onDidFocus
(()
=>
this
.
viewletFocused
.
set
(
true
)));
this
.
_register
(
this
.
onDidBlur
(()
=>
this
.
viewletFocused
.
set
(
false
)));
return
TPromise
.
as
(
null
);
}
...
...
src/vs/workbench/parts/search/common/constants.ts
浏览文件 @
dc62a6ef
...
...
@@ -28,6 +28,7 @@ export const ToggleRegexCommandId = 'toggleSearchRegex';
export
const
ToggleSearchViewPositionCommandId
=
'
search.action.toggleSearchViewPosition
'
;
export
const
SearchViewVisibleKey
=
new
RawContextKey
<
boolean
>
(
'
searchViewletVisible
'
,
true
);
export
const
SearchViewFocusedKey
=
new
RawContextKey
<
boolean
>
(
'
searchViewletFocus
'
,
false
);
export
const
InputBoxFocusedKey
=
new
RawContextKey
<
boolean
>
(
'
inputBoxFocus
'
,
false
);
export
const
SearchInputBoxFocusedKey
=
new
RawContextKey
<
boolean
>
(
'
searchInputBoxFocus
'
,
false
);
export
const
ReplaceInputBoxFocusedKey
=
new
RawContextKey
<
boolean
>
(
'
replaceInputBoxFocus
'
,
false
);
...
...
src/vs/workbench/parts/search/electron-browser/search.contribution.ts
浏览文件 @
dc62a6ef
...
...
@@ -501,21 +501,21 @@ MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, {
KeybindingsRegistry
.
registerCommandAndKeybindingRule
(
objects
.
assign
({
id
:
Constants
.
ToggleCaseSensitiveCommandId
,
weight
:
KeybindingWeight
.
WorkbenchContrib
,
when
:
ContextKeyExpr
.
and
(
Constants
.
SearchViewVisibleKey
,
Constants
.
Search
InputBoxFocusedKey
),
when
:
ContextKeyExpr
.
and
(
Constants
.
SearchViewVisibleKey
,
Constants
.
Search
ViewFocusedKey
,
Constants
.
FileMatchOrFolderMatchFocusKey
.
toNegated
()
),
handler
:
toggleCaseSensitiveCommand
},
ToggleCaseSensitiveKeybinding
));
KeybindingsRegistry
.
registerCommandAndKeybindingRule
(
objects
.
assign
({
id
:
Constants
.
ToggleWholeWordCommandId
,
weight
:
KeybindingWeight
.
WorkbenchContrib
,
when
:
ContextKeyExpr
.
and
(
Constants
.
SearchViewVisibleKey
,
Constants
.
Search
InputBox
FocusedKey
),
when
:
ContextKeyExpr
.
and
(
Constants
.
SearchViewVisibleKey
,
Constants
.
Search
View
FocusedKey
),
handler
:
toggleWholeWordCommand
},
ToggleWholeWordKeybinding
));
KeybindingsRegistry
.
registerCommandAndKeybindingRule
(
objects
.
assign
({
id
:
Constants
.
ToggleRegexCommandId
,
weight
:
KeybindingWeight
.
WorkbenchContrib
,
when
:
ContextKeyExpr
.
and
(
Constants
.
SearchViewVisibleKey
,
Constants
.
Search
InputBox
FocusedKey
),
when
:
ContextKeyExpr
.
and
(
Constants
.
SearchViewVisibleKey
,
Constants
.
Search
View
FocusedKey
),
handler
:
toggleRegexCommand
},
ToggleRegexKeybinding
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录