Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fa9e2aa8
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,发现更多精彩内容 >>
提交
fa9e2aa8
编写于
11月 21, 2017
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #36596. Cmd+e should always populate the search string
上级
7fe4bc2a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
9 deletion
+36
-9
src/vs/editor/contrib/find/findController.ts
src/vs/editor/contrib/find/findController.ts
+35
-9
src/vs/editor/contrib/find/findModel.ts
src/vs/editor/contrib/find/findModel.ts
+1
-0
未找到文件。
src/vs/editor/contrib/find/findController.ts
浏览文件 @
fa9e2aa8
...
...
@@ -101,7 +101,7 @@ export class CommonFindController extends Disposable implements editorCommon.IEd
if
(
shouldRestartFind
)
{
this
.
_start
({
forceRevealReplace
:
false
,
seedSearchStringFromSelection
:
false
,
seedSearchStringFromSelection
:
false
&&
this
.
_editor
.
getConfiguration
().
contribInfo
.
find
.
seedSearchStringFromSelection
,
shouldFocus
:
FindStartFocusAction
.
NoFocusChange
,
shouldAnimate
:
false
,
});
...
...
@@ -233,8 +233,7 @@ export class CommonFindController extends Disposable implements editorCommon.IEd
isRevealed
:
true
};
// Consider editor selection and overwrite the state with it
if
(
opts
.
seedSearchStringFromSelection
&&
this
.
_editor
.
getConfiguration
().
contribInfo
.
find
.
seedSearchStringFromSelection
)
{
if
(
opts
.
seedSearchStringFromSelection
)
{
let
selectionSearchString
=
getSelectionSearchString
(
this
.
_editor
);
if
(
selectionSearchString
)
{
if
(
this
.
_state
.
isRegex
)
{
...
...
@@ -379,10 +378,37 @@ export class StartFindAction extends EditorAction {
precondition
:
null
,
kbOpts
:
{
kbExpr
:
null
,
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_F
,
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_F
}
});
}
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
):
void
{
let
controller
=
CommonFindController
.
get
(
editor
);
if
(
controller
)
{
controller
.
start
({
forceRevealReplace
:
false
,
seedSearchStringFromSelection
:
editor
.
getConfiguration
().
contribInfo
.
find
.
seedSearchStringFromSelection
,
shouldFocus
:
FindStartFocusAction
.
FocusFindInput
,
shouldAnimate
:
true
});
}
}
}
export
class
StartFindWithSelectionAction
extends
EditorAction
{
constructor
()
{
super
({
id
:
FIND_IDS
.
StartFindWithSelection
,
label
:
nls
.
localize
(
'
startFindAction
'
,
"
Find
"
),
alias
:
'
Find
'
,
precondition
:
null
,
kbOpts
:
{
kbExpr
:
null
,
primary
:
null
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_F
,
secondary
:
[
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_E
]
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_E
,
}
}
});
...
...
@@ -400,14 +426,13 @@ export class StartFindAction extends EditorAction {
}
}
}
export
abstract
class
MatchFindAction
extends
EditorAction
{
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICodeEditor
):
void
{
let
controller
=
CommonFindController
.
get
(
editor
);
if
(
controller
&&
!
this
.
_run
(
controller
))
{
controller
.
start
({
forceRevealReplace
:
false
,
seedSearchStringFromSelection
:
(
controller
.
getState
().
searchString
.
length
===
0
),
seedSearchStringFromSelection
:
(
controller
.
getState
().
searchString
.
length
===
0
)
&&
editor
.
getConfiguration
().
contribInfo
.
find
.
seedSearchStringFromSelection
,
shouldFocus
:
FindStartFocusAction
.
NoFocusChange
,
shouldAnimate
:
true
});
...
...
@@ -549,7 +574,7 @@ export class StartFindReplaceAction extends EditorAction {
let
currentSelection
=
editor
.
getSelection
();
// we only seed search string from selection when the current selection is single line and not empty.
let
seedSearchStringFromSelection
=
!
currentSelection
.
isEmpty
()
&&
currentSelection
.
startLineNumber
===
currentSelection
.
endLineNumber
;
currentSelection
.
startLineNumber
===
currentSelection
.
endLineNumber
&&
editor
.
getConfiguration
().
contribInfo
.
find
.
seedSearchStringFromSelection
;
let
oldSearchString
=
controller
.
getState
().
searchString
;
// if the existing search string in find widget is empty and we don't seed search string from selection, it means the Find Input
// is still empty, so we should focus the Find Input instead of Replace Input.
...
...
@@ -618,6 +643,7 @@ export class ShowPreviousFindTermAction extends MatchFindAction {
registerEditorContribution
(
FindController
);
registerEditorAction
(
StartFindAction
);
registerEditorAction
(
StartFindWithSelectionAction
);
registerEditorAction
(
NextMatchFindAction
);
registerEditorAction
(
PreviousMatchFindAction
);
registerEditorAction
(
NextSelectionMatchFindAction
);
...
...
src/vs/editor/contrib/find/findModel.ts
浏览文件 @
fa9e2aa8
...
...
@@ -53,6 +53,7 @@ export const ShowNextFindTermKeybinding: IKeybindings = {
export
const
FIND_IDS
=
{
StartFindAction
:
'
actions.find
'
,
StartFindWithSelection
:
'
actions.findWithSelection
'
,
NextMatchFindAction
:
'
editor.action.nextMatchFindAction
'
,
PreviousMatchFindAction
:
'
editor.action.previousMatchFindAction
'
,
NextSelectionMatchFindAction
:
'
editor.action.nextSelectionMatchFindAction
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录