Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e7dfec77
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,发现更多精彩内容 >>
提交
e7dfec77
编写于
12月 17, 2017
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #39609 - search viewlet should use global search buffer
上级
a5b60ac9
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
29 addition
and
3 deletion
+29
-3
src/vs/workbench/parts/search/browser/searchViewlet.ts
src/vs/workbench/parts/search/browser/searchViewlet.ts
+3
-1
src/vs/workbench/parts/search/browser/searchWidget.ts
src/vs/workbench/parts/search/browser/searchWidget.ts
+26
-2
未找到文件。
src/vs/workbench/parts/search/browser/searchViewlet.ts
浏览文件 @
e7dfec77
...
...
@@ -672,15 +672,17 @@ export class SearchViewlet extends Viewlet {
public
focus
():
void
{
super
.
focus
();
let
updatedText
=
false
;
const
seedSearchStringFromSelection
=
this
.
configurationService
.
getValue
<
IEditorOptions
>
(
'
editor
'
).
find
.
seedSearchStringFromSelection
;
if
(
seedSearchStringFromSelection
)
{
const
selectedText
=
this
.
getSearchTextFromEditor
();
if
(
selectedText
)
{
this
.
searchWidget
.
searchInput
.
setValue
(
selectedText
);
updatedText
=
true
;
}
}
this
.
searchWidget
.
focus
();
this
.
searchWidget
.
focus
(
undefined
,
undefined
,
updatedText
);
}
public
focusNextInputBox
():
void
{
...
...
src/vs/workbench/parts/search/browser/searchWidget.ts
浏览文件 @
e7dfec77
...
...
@@ -29,6 +29,9 @@ import { attachInputBoxStyler, attachFindInputBoxStyler, attachButtonStyler } fr
import
{
IThemeService
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
SIDE_BAR_BACKGROUND
}
from
'
vs/workbench/common/theme
'
;
import
{
CONTEXT_FIND_WIDGET_NOT_VISIBLE
}
from
'
vs/editor/contrib/find/findModel
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
export
interface
ISearchWidgetOptions
{
value
?:
string
;
...
...
@@ -92,6 +95,8 @@ export class SearchWidget extends Widget {
private
replaceActionBar
:
ActionBar
;
private
searchHistory
:
HistoryNavigator
<
string
>
;
private
ignoreGlobalFindBufferOnNextFocus
=
false
;
private
previousGlobalFindBufferValue
:
string
;
private
_onSearchSubmit
=
this
.
_register
(
new
Emitter
<
boolean
>
());
public
onSearchSubmit
:
Event
<
boolean
>
=
this
.
_onSearchSubmit
.
event
;
...
...
@@ -118,6 +123,8 @@ export class SearchWidget extends Widget {
@
IThemeService
private
themeService
:
IThemeService
,
@
IContextKeyService
private
keyBindingService
:
IContextKeyService
,
@
IKeybindingService
private
keyBindingService2
:
IKeybindingService
,
@
IClipboardService
private
clipboardServce
:
IClipboardService
,
@
IConfigurationService
private
configurationService
:
IConfigurationService
)
{
super
();
this
.
searchHistory
=
new
HistoryNavigator
<
string
>
(
options
.
history
);
...
...
@@ -127,7 +134,9 @@ export class SearchWidget extends Widget {
this
.
render
(
container
,
options
);
}
public
focus
(
select
:
boolean
=
true
,
focusReplace
:
boolean
=
false
):
void
{
public
focus
(
select
:
boolean
=
true
,
focusReplace
:
boolean
=
false
,
suppressGlobalSearchBuffer
=
false
):
void
{
this
.
ignoreGlobalFindBufferOnNextFocus
=
suppressGlobalSearchBuffer
;
if
(
focusReplace
&&
this
.
isReplaceShown
())
{
this
.
replaceInput
.
focus
();
if
(
select
)
{
...
...
@@ -241,7 +250,22 @@ export class SearchWidget extends Widget {
}));
this
.
searchInputFocusTracker
=
this
.
_register
(
dom
.
trackFocus
(
this
.
searchInput
.
inputBox
.
inputElement
));
this
.
_register
(
this
.
searchInputFocusTracker
.
onDidFocus
(()
=>
this
.
searchInputBoxFocused
.
set
(
true
)));
this
.
_register
(
this
.
searchInputFocusTracker
.
onDidFocus
(()
=>
{
this
.
searchInputBoxFocused
.
set
(
true
);
const
useGlobalFindBuffer
=
this
.
configurationService
.
getValue
<
IEditorOptions
>
(
'
editor
'
).
find
.
globalFindClipboard
;
if
(
!
this
.
ignoreGlobalFindBufferOnNextFocus
&&
useGlobalFindBuffer
)
{
const
globalBufferText
=
this
.
clipboardServce
.
readFindText
();
if
(
this
.
previousGlobalFindBufferValue
!==
globalBufferText
)
{
this
.
searchInput
.
setValue
(
globalBufferText
);
this
.
searchInput
.
select
();
}
this
.
previousGlobalFindBufferValue
=
globalBufferText
;
}
this
.
ignoreGlobalFindBufferOnNextFocus
=
false
;
}));
this
.
_register
(
this
.
searchInputFocusTracker
.
onDidBlur
(()
=>
this
.
searchInputBoxFocused
.
set
(
false
)));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录