Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
旅途_2012
vscode
提交
e91637a1
V
vscode
项目概览
旅途_2012
/
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,发现更多精彩内容 >>
提交
e91637a1
编写于
4月 30, 2020
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove word widget from commands and context keys
Fixes #96679
上级
ff4d9658
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
29 deletion
+29
-29
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
+15
-15
src/vs/workbench/contrib/terminal/browser/terminalFindWidget.ts
.../workbench/contrib/terminal/browser/terminalFindWidget.ts
+3
-3
src/vs/workbench/contrib/terminal/browser/terminalService.ts
src/vs/workbench/contrib/terminal/browser/terminalService.ts
+2
-2
src/vs/workbench/contrib/terminal/common/terminal.ts
src/vs/workbench/contrib/terminal/common/terminal.ts
+9
-9
未找到文件。
src/vs/workbench/contrib/terminal/browser/terminalActions.ts
浏览文件 @
e91637a1
...
...
@@ -6,7 +6,7 @@
import
{
Action
,
IAction
}
from
'
vs/base/common/actions
'
;
import
{
EndOfLinePreference
}
from
'
vs/editor/common/model
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/browser/services/codeEditorService
'
;
import
{
TERMINAL_VIEW_ID
,
ITerminalConfigHelper
,
TitleEventSource
,
TERMINAL_COMMAND_ID
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_FOCUSED
,
TERMINAL_ACTION_CATEGORY
,
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE
,
KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED
,
KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET
_NOT_VISIBLE
,
KEYBINDING_CONTEXT_TERMINAL_A11Y_TREE_FOCUS
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
TERMINAL_VIEW_ID
,
ITerminalConfigHelper
,
TitleEventSource
,
TERMINAL_COMMAND_ID
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
FOCUSED
,
TERMINAL_ACTION_CATEGORY
,
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE
,
KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED
,
KEYBINDING_CONTEXT_TERMINAL_FIND
_NOT_VISIBLE
,
KEYBINDING_CONTEXT_TERMINAL_A11Y_TREE_FOCUS
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
SelectActionViewItem
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
IWorkbenchLayoutService
}
from
'
vs/workbench/services/layout/browser/layoutService
'
;
import
{
attachSelectBoxStyler
,
attachStylerCallback
}
from
'
vs/platform/theme/common/styler
'
;
...
...
@@ -834,7 +834,7 @@ export function registerTerminalActions() {
category
,
keybinding
:
{
primary
:
KeyCode
.
Escape
,
when
:
ContextKeyExpr
.
and
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
NOT_VISIBLE
),
when
:
ContextKeyExpr
.
and
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED
,
KEYBINDING_CONTEXT_TERMINAL_FIND_NOT_VISIBLE
),
weight
:
KeybindingWeight
.
WorkbenchContrib
}
});
...
...
@@ -883,13 +883,13 @@ export function registerTerminalActions() {
registerAction2
(
class
extends
Action2
{
constructor
()
{
super
({
id
:
TERMINAL_COMMAND_ID
.
FIND_
WIDGET_
FOCUS
,
title
:
localize
(
'
workbench.action.terminal.focusFind
Widget
'
,
"
Focus Find Widget
"
),
id
:
TERMINAL_COMMAND_ID
.
FIND_FOCUS
,
title
:
localize
(
'
workbench.action.terminal.focusFind
'
,
"
Focus Find
"
),
f1
:
true
,
category
,
keybinding
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_F
,
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
,
KEYBINDING_CONTEXT_TERMINAL_FOCUS
),
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
,
KEYBINDING_CONTEXT_TERMINAL_FOCUS
),
weight
:
KeybindingWeight
.
WorkbenchContrib
}
});
...
...
@@ -901,14 +901,14 @@ export function registerTerminalActions() {
registerAction2
(
class
extends
Action2
{
constructor
()
{
super
({
id
:
TERMINAL_COMMAND_ID
.
FIND_
WIDGET_
HIDE
,
title
:
localize
(
'
workbench.action.terminal.hideFind
Widget
'
,
"
Hide Find Widget
"
),
id
:
TERMINAL_COMMAND_ID
.
FIND_HIDE
,
title
:
localize
(
'
workbench.action.terminal.hideFind
'
,
"
Hide Find
"
),
f1
:
true
,
category
,
keybinding
:
{
primary
:
KeyCode
.
Escape
,
secondary
:
[
KeyMod
.
Shift
|
KeyCode
.
Escape
],
when
:
ContextKeyExpr
.
and
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
VISIBLE
),
when
:
ContextKeyExpr
.
and
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE
),
weight
:
KeybindingWeight
.
WorkbenchContrib
}
});
...
...
@@ -1165,7 +1165,7 @@ export function registerTerminalActions() {
keybinding
:
{
primary
:
KeyMod
.
Alt
|
KeyCode
.
KEY_R
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Alt
|
KeyCode
.
KEY_R
},
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
),
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
),
weight
:
KeybindingWeight
.
WorkbenchContrib
}
});
...
...
@@ -1185,7 +1185,7 @@ export function registerTerminalActions() {
keybinding
:
{
primary
:
KeyMod
.
Alt
|
KeyCode
.
KEY_W
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Alt
|
KeyCode
.
KEY_W
},
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
),
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
),
weight
:
KeybindingWeight
.
WorkbenchContrib
},
});
...
...
@@ -1205,7 +1205,7 @@ export function registerTerminalActions() {
keybinding
:
{
primary
:
KeyMod
.
Alt
|
KeyCode
.
KEY_C
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Alt
|
KeyCode
.
KEY_C
},
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
),
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
),
weight
:
KeybindingWeight
.
WorkbenchContrib
}
});
...
...
@@ -1226,12 +1226,12 @@ export function registerTerminalActions() {
{
primary
:
KeyCode
.
F3
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_G
,
secondary
:
[
KeyCode
.
F3
]
},
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
),
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
),
weight
:
KeybindingWeight
.
WorkbenchContrib
},
{
primary
:
KeyMod
.
Shift
|
KeyCode
.
Enter
,
when
:
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
,
when
:
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
,
weight
:
KeybindingWeight
.
WorkbenchContrib
}
]
...
...
@@ -1252,12 +1252,12 @@ export function registerTerminalActions() {
{
primary
:
KeyMod
.
Shift
|
KeyCode
.
F3
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyCode
.
KEY_G
,
secondary
:
[
KeyMod
.
Shift
|
KeyCode
.
F3
]
},
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
),
when
:
ContextKeyExpr
.
or
(
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
),
weight
:
KeybindingWeight
.
WorkbenchContrib
},
{
primary
:
KeyCode
.
Enter
,
when
:
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
,
when
:
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
,
weight
:
KeybindingWeight
.
WorkbenchContrib
}
]
...
...
src/vs/workbench/contrib/terminal/browser/terminalFindWidget.ts
浏览文件 @
e91637a1
...
...
@@ -5,7 +5,7 @@
import
{
SimpleFindWidget
}
from
'
vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_INPUT_FOCUSED
,
KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET
_FOCUSED
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
KEYBINDING_CONTEXT_TERMINAL_FIND_
INPUT_FOCUSED
,
KEYBINDING_CONTEXT_TERMINAL_FIND
_FOCUSED
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
FindReplaceState
}
from
'
vs/editor/contrib/find/findState
'
;
import
{
ITerminalService
}
from
'
vs/workbench/contrib/terminal/browser/terminal
'
;
...
...
@@ -24,8 +24,8 @@ export class TerminalFindWidget extends SimpleFindWidget {
this
.
_register
(
findState
.
onFindReplaceStateChange
(()
=>
{
this
.
show
();
}));
this
.
_findInputFocused
=
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
INPUT_FOCUSED
.
bindTo
(
this
.
_contextKeyService
);
this
.
_findWidgetFocused
=
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
FOCUSED
.
bindTo
(
this
.
_contextKeyService
);
this
.
_findInputFocused
=
KEYBINDING_CONTEXT_TERMINAL_FIND_INPUT_FOCUSED
.
bindTo
(
this
.
_contextKeyService
);
this
.
_findWidgetFocused
=
KEYBINDING_CONTEXT_TERMINAL_FIND_FOCUSED
.
bindTo
(
this
.
_contextKeyService
);
}
public
find
(
previous
:
boolean
)
{
...
...
src/vs/workbench/contrib/terminal/browser/terminalService.ts
浏览文件 @
e91637a1
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
*
as
nls
from
'
vs/nls
'
;
import
{
TERMINAL_VIEW_ID
,
IShellLaunchConfig
,
ITerminalConfigHelper
,
ITerminalNativeService
,
ISpawnExtHostProcessRequest
,
IStartExtensionTerminalRequest
,
IAvailableShellsRequest
,
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
VISIBLE
,
KEYBINDING_CONTEXT_TERMINAL_IS_OPEN
,
ITerminalProcessExtHostProxy
,
IShellDefinition
,
LinuxDistro
,
KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
TERMINAL_VIEW_ID
,
IShellLaunchConfig
,
ITerminalConfigHelper
,
ITerminalNativeService
,
ISpawnExtHostProcessRequest
,
IStartExtensionTerminalRequest
,
IAvailableShellsRequest
,
KEYBINDING_CONTEXT_TERMINAL_FOCUS
,
KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE
,
KEYBINDING_CONTEXT_TERMINAL_IS_OPEN
,
ITerminalProcessExtHostProxy
,
IShellDefinition
,
LinuxDistro
,
KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE
}
from
'
vs/workbench/contrib/terminal/common/terminal
'
;
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IWorkbenchLayoutService
}
from
'
vs/workbench/services/layout/browser/layoutService
'
;
import
{
ILifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
...
...
@@ -121,7 +121,7 @@ export class TerminalService implements ITerminalService {
}
this
.
_terminalFocusContextKey
=
KEYBINDING_CONTEXT_TERMINAL_FOCUS
.
bindTo
(
this
.
_contextKeyService
);
this
.
_terminalShellTypeContextKey
=
KEYBINDING_CONTEXT_TERMINAL_SHELL_TYPE
.
bindTo
(
this
.
_contextKeyService
);
this
.
_findWidgetVisible
=
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_
VISIBLE
.
bindTo
(
this
.
_contextKeyService
);
this
.
_findWidgetVisible
=
KEYBINDING_CONTEXT_TERMINAL_FIND_VISIBLE
.
bindTo
(
this
.
_contextKeyService
);
this
.
_configHelper
=
this
.
_instantiationService
.
createInstance
(
TerminalConfigHelper
,
this
.
_terminalNativeService
?.
linuxDistro
||
LinuxDistro
.
Unknown
);
this
.
onTabDisposed
(
tab
=>
this
.
_removeTab
(
tab
));
this
.
onActiveTabChanged
(()
=>
{
...
...
src/vs/workbench/contrib/terminal/common/terminal.ts
浏览文件 @
e91637a1
...
...
@@ -37,15 +37,15 @@ export const KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED = new RawContextKey<boole
export
const
KEYBINDING_CONTEXT_TERMINAL_TEXT_NOT_SELECTED
=
KEYBINDING_CONTEXT_TERMINAL_TEXT_SELECTED
.
toNegated
();
/** A context key that is set when the find widget in integrated terminal is visible. */
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_VISIBLE
=
new
RawContextKey
<
boolean
>
(
'
terminalFindWidget
Visible
'
,
false
);
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
VISIBLE
=
new
RawContextKey
<
boolean
>
(
'
terminalFind
Visible
'
,
false
);
/** A context key that is set when the find widget in integrated terminal is not visible. */
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_NOT_VISIBLE
=
KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET
_VISIBLE
.
toNegated
();
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
NOT_VISIBLE
=
KEYBINDING_CONTEXT_TERMINAL_FIND
_VISIBLE
.
toNegated
();
/** A context key that is set when the find widget find input in integrated terminal is focused. */
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_INPUT_FOCUSED
=
new
RawContextKey
<
boolean
>
(
'
terminalFindWidget
InputFocused
'
,
false
);
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
INPUT_FOCUSED
=
new
RawContextKey
<
boolean
>
(
'
terminalFind
InputFocused
'
,
false
);
/** A context key that is set when the find widget in integrated terminal is focused. */
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_FOCUSED
=
new
RawContextKey
<
boolean
>
(
'
terminalFindWidget
Focused
'
,
false
);
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
FOCUSED
=
new
RawContextKey
<
boolean
>
(
'
terminalFind
Focused
'
,
false
);
/** A context key that is set when the find widget find input in integrated terminal is not focused. */
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
WIDGET_INPUT_NOT_FOCUSED
=
KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET
_INPUT_FOCUSED
.
toNegated
();
export
const
KEYBINDING_CONTEXT_TERMINAL_FIND_
INPUT_NOT_FOCUSED
=
KEYBINDING_CONTEXT_TERMINAL_FIND
_INPUT_FOCUSED
.
toNegated
();
export
const
IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY
=
'
terminal.integrated.isWorkspaceShellAllowed
'
;
export
const
NEVER_MEASURE_RENDER_TIME_STORAGE_KEY
=
'
terminal.integrated.neverMeasureRenderTime
'
;
...
...
@@ -474,8 +474,8 @@ export const enum TERMINAL_COMMAND_ID {
MANAGE_WORKSPACE_SHELL_PERMISSIONS
=
'
workbench.action.terminal.manageWorkspaceShellPermissions
'
,
RENAME
=
'
workbench.action.terminal.rename
'
,
RENAME_WITH_ARG
=
'
workbench.action.terminal.renameWithArg
'
,
FIND_
WIDGET_FOCUS
=
'
workbench.action.terminal.focusFindWidget
'
,
FIND_
WIDGET_HIDE
=
'
workbench.action.terminal.hideFindWidget
'
,
FIND_
FOCUS
=
'
workbench.action.terminal.focusFind
'
,
FIND_
HIDE
=
'
workbench.action.terminal.hideFind
'
,
QUICK_OPEN_TERM
=
'
workbench.action.quickOpenTerm
'
,
SCROLL_TO_PREVIOUS_COMMAND
=
'
workbench.action.terminal.scrollToPreviousCommand
'
,
SCROLL_TO_NEXT_COMMAND
=
'
workbench.action.terminal.scrollToNextCommand
'
,
...
...
@@ -501,8 +501,8 @@ export const DEFAULT_COMMANDS_TO_SKIP_SHELL: string[] = [
TERMINAL_COMMAND_ID
.
DELETE_TO_LINE_START
,
TERMINAL_COMMAND_ID
.
DELETE_WORD_LEFT
,
TERMINAL_COMMAND_ID
.
DELETE_WORD_RIGHT
,
TERMINAL_COMMAND_ID
.
FIND_
WIDGET_
FOCUS
,
TERMINAL_COMMAND_ID
.
FIND_
WIDGET_
HIDE
,
TERMINAL_COMMAND_ID
.
FIND_FOCUS
,
TERMINAL_COMMAND_ID
.
FIND_HIDE
,
TERMINAL_COMMAND_ID
.
FIND_NEXT
,
TERMINAL_COMMAND_ID
.
FIND_PREVIOUS
,
TERMINAL_COMMAND_ID
.
TOGGLE_FIND_REGEX
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录