Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
beffdb67
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,发现更多精彩内容 >>
提交
beffdb67
编写于
9月 10, 2019
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Also use ctrl+enter for multiline search
Fix #80361
上级
b0351168
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
32 addition
and
26 deletion
+32
-26
src/vs/base/browser/ui/inputbox/inputBox.ts
src/vs/base/browser/ui/inputbox/inputBox.ts
+13
-0
src/vs/editor/contrib/find/findWidget.ts
src/vs/editor/contrib/find/findWidget.ts
+6
-26
src/vs/workbench/contrib/search/browser/searchWidget.ts
src/vs/workbench/contrib/search/browser/searchWidget.ts
+13
-0
未找到文件。
src/vs/base/browser/ui/inputbox/inputBox.ts
浏览文件 @
beffdb67
...
...
@@ -581,6 +581,19 @@ export class InputBox extends Widget {
}
}
public
insertAtCursor
(
text
:
string
):
void
{
const
inputElement
=
this
.
inputElement
;
const
start
=
inputElement
.
selectionStart
;
const
end
=
inputElement
.
selectionEnd
;
const
content
=
inputElement
.
value
;
if
(
start
!==
null
&&
end
!==
null
)
{
this
.
value
=
content
.
substr
(
0
,
start
)
+
text
+
content
.
substr
(
end
);
inputElement
.
setSelectionRange
(
start
+
1
,
start
+
1
);
this
.
layout
();
}
}
public
dispose
():
void
{
this
.
_hideMessage
();
...
...
src/vs/editor/contrib/find/findWidget.ts
浏览文件 @
beffdb67
...
...
@@ -778,19 +778,9 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
private
_onFindInputKeyDown
(
e
:
IKeyboardEvent
):
void
{
if
(
e
.
equals
(
ctrlKeyMod
|
KeyCode
.
Enter
))
{
const
inputElement
=
this
.
_findInput
.
inputBox
.
inputElement
;
const
start
=
inputElement
.
selectionStart
;
const
end
=
inputElement
.
selectionEnd
;
const
content
=
inputElement
.
value
;
if
(
start
!==
null
&&
end
!==
null
)
{
const
value
=
content
.
substr
(
0
,
start
)
+
'
\n
'
+
content
.
substr
(
end
);
this
.
_findInput
.
inputBox
.
value
=
value
;
inputElement
.
setSelectionRange
(
start
+
1
,
start
+
1
);
this
.
_findInput
.
inputBox
.
layout
();
e
.
preventDefault
();
return
;
}
this
.
_findInput
.
inputBox
.
insertAtCursor
(
'
\n
'
);
e
.
preventDefault
();
return
;
}
if
(
e
.
equals
(
KeyCode
.
Tab
))
{
...
...
@@ -832,19 +822,9 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
}
const
inputElement
=
this
.
_replaceInput
.
inputBox
.
inputElement
;
const
start
=
inputElement
.
selectionStart
;
const
end
=
inputElement
.
selectionEnd
;
const
content
=
inputElement
.
value
;
if
(
start
!==
null
&&
end
!==
null
)
{
const
value
=
content
.
substr
(
0
,
start
)
+
'
\n
'
+
content
.
substr
(
end
);
this
.
_replaceInput
.
inputBox
.
value
=
value
;
inputElement
.
setSelectionRange
(
start
+
1
,
start
+
1
);
this
.
_replaceInput
.
inputBox
.
layout
();
e
.
preventDefault
();
return
;
}
this
.
_replaceInput
.
inputBox
.
insertAtCursor
(
'
\n
'
);
e
.
preventDefault
();
return
;
}
if
(
e
.
equals
(
KeyCode
.
Tab
))
{
...
...
src/vs/workbench/contrib/search/browser/searchWidget.ts
浏览文件 @
beffdb67
...
...
@@ -34,6 +34,7 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import
{
IEditorOptions
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
IAccessibilityService
,
AccessibilitySupport
}
from
'
vs/platform/accessibility/common/accessibility
'
;
import
{
Checkbox
}
from
'
vs/base/browser/ui/checkbox/checkbox
'
;
import
{
isMacintosh
}
from
'
vs/base/common/platform
'
;
export
interface
ISearchWidgetOptions
{
value
?:
string
;
...
...
@@ -76,6 +77,8 @@ class ReplaceAllAction extends Action {
}
}
const
ctrlKeyMod
=
(
isMacintosh
?
KeyMod
.
WinCtrl
:
KeyMod
.
CtrlCmd
);
export
class
SearchWidget
extends
Widget
{
private
static
readonly
REPLACE_ALL_DISABLED_LABEL
=
nls
.
localize
(
'
search.action.replaceAll.disabled.label
'
,
"
Replace All (Submit Search to Enable)
"
);
...
...
@@ -446,6 +449,11 @@ export class SearchWidget extends Widget {
}
private
onSearchInputKeyDown
(
keyboardEvent
:
IKeyboardEvent
)
{
if
(
keyboardEvent
.
equals
(
ctrlKeyMod
|
KeyCode
.
Enter
))
{
this
.
searchInput
.
inputBox
.
insertAtCursor
(
'
\n
'
);
keyboardEvent
.
preventDefault
();
}
if
(
keyboardEvent
.
equals
(
KeyCode
.
Enter
))
{
this
.
submitSearch
();
keyboardEvent
.
preventDefault
();
...
...
@@ -503,6 +511,11 @@ export class SearchWidget extends Widget {
}
private
onReplaceInputKeyDown
(
keyboardEvent
:
IKeyboardEvent
)
{
if
(
keyboardEvent
.
equals
(
ctrlKeyMod
|
KeyCode
.
Enter
))
{
this
.
searchInput
.
inputBox
.
insertAtCursor
(
'
\n
'
);
keyboardEvent
.
preventDefault
();
}
if
(
keyboardEvent
.
equals
(
KeyCode
.
Enter
))
{
this
.
submitSearch
();
keyboardEvent
.
preventDefault
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录