Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
56a962fd
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,发现更多精彩内容 >>
提交
56a962fd
编写于
7月 25, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move more menu bar registrations close to the actions
上级
27a7ad9f
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
82 addition
and
116 deletion
+82
-116
src/vs/editor/browser/controller/coreCommands.ts
src/vs/editor/browser/controller/coreCommands.ts
+6
-0
src/vs/editor/contrib/linesOperations/linesOperations.ts
src/vs/editor/contrib/linesOperations/linesOperations.ts
+25
-0
src/vs/editor/contrib/multicursor/multicursor.ts
src/vs/editor/contrib/multicursor/multicursor.ts
+38
-1
src/vs/editor/contrib/smartSelect/smartSelect.ts
src/vs/editor/contrib/smartSelect/smartSelect.ts
+13
-0
src/vs/workbench/parts/codeEditor/electron-browser/menubarRegistrations.ts
...parts/codeEditor/electron-browser/menubarRegistrations.ts
+0
-115
未找到文件。
src/vs/editor/browser/controller/coreCommands.ts
浏览文件 @
56a962fd
...
...
@@ -1711,6 +1711,12 @@ registerCommand(new EditorOrNativeTextInputCommand({
weight
:
CORE_WEIGHT
,
kbExpr
:
null
,
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_A
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
1_basic
'
,
title
:
nls
.
localize
({
key
:
'
miSelectAll
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Select All
"
),
order
:
1
}
}));
...
...
src/vs/editor/contrib/linesOperations/linesOperations.ts
浏览文件 @
56a962fd
...
...
@@ -24,6 +24,7 @@ import { TypeOperations } from 'vs/editor/common/controller/cursorTypeOperations
import
{
CoreEditingCommands
}
from
'
vs/editor/browser/controller/coreCommands
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
KeybindingWeight
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
MenuId
}
from
'
vs/platform/actions/common/actions
'
;
// copy lines
...
...
@@ -63,6 +64,12 @@ class CopyLinesUpAction extends AbstractCopyLinesAction {
primary
:
KeyMod
.
Alt
|
KeyMod
.
Shift
|
KeyCode
.
UpArrow
,
linux
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Alt
|
KeyMod
.
Shift
|
KeyCode
.
UpArrow
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
2_line
'
,
title
:
nls
.
localize
({
key
:
'
miCopyLinesUp
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Copy Line Up
"
),
order
:
1
}
});
}
...
...
@@ -80,6 +87,12 @@ class CopyLinesDownAction extends AbstractCopyLinesAction {
primary
:
KeyMod
.
Alt
|
KeyMod
.
Shift
|
KeyCode
.
DownArrow
,
linux
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Alt
|
KeyMod
.
Shift
|
KeyCode
.
DownArrow
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
2_line
'
,
title
:
nls
.
localize
({
key
:
'
miCopyLinesDown
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Co&&py Line Down
"
),
order
:
2
}
});
}
...
...
@@ -124,6 +137,12 @@ class MoveLinesUpAction extends AbstractMoveLinesAction {
primary
:
KeyMod
.
Alt
|
KeyCode
.
UpArrow
,
linux
:
{
primary
:
KeyMod
.
Alt
|
KeyCode
.
UpArrow
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
2_line
'
,
title
:
nls
.
localize
({
key
:
'
miMoveLinesUp
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Mo&&ve Line Up
"
),
order
:
3
}
});
}
...
...
@@ -141,6 +160,12 @@ class MoveLinesDownAction extends AbstractMoveLinesAction {
primary
:
KeyMod
.
Alt
|
KeyCode
.
DownArrow
,
linux
:
{
primary
:
KeyMod
.
Alt
|
KeyCode
.
DownArrow
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
2_line
'
,
title
:
nls
.
localize
({
key
:
'
miMoveLinesDown
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Move &&Line Down
"
),
order
:
4
}
});
}
...
...
src/vs/editor/contrib/multicursor/multicursor.ts
浏览文件 @
56a962fd
...
...
@@ -26,6 +26,7 @@ import { themeColorFromId } from 'vs/platform/theme/common/themeService';
import
{
INewFindReplaceState
,
FindOptionOverride
}
from
'
vs/editor/contrib/find/findState
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
KeybindingWeight
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
MenuId
}
from
'
vs/platform/actions/common/actions
'
;
export
class
InsertCursorAbove
extends
EditorAction
{
...
...
@@ -43,6 +44,12 @@ export class InsertCursorAbove extends EditorAction {
secondary
:
[
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyCode
.
UpArrow
]
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
3_multi
'
,
title
:
nls
.
localize
({
key
:
'
miInsertCursorAbove
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Add Cursor Above
"
),
order
:
2
}
});
}
...
...
@@ -82,6 +89,12 @@ export class InsertCursorBelow extends EditorAction {
secondary
:
[
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyCode
.
DownArrow
]
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
3_multi
'
,
title
:
nls
.
localize
({
key
:
'
miInsertCursorBelow
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
A&&dd Cursor Below
"
),
order
:
3
}
});
}
...
...
@@ -117,6 +130,12 @@ class InsertCursorAtEndOfEachLineSelected extends EditorAction {
kbExpr
:
EditorContextKeys
.
editorTextFocus
,
primary
:
KeyMod
.
Shift
|
KeyMod
.
Alt
|
KeyCode
.
KEY_I
,
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
3_multi
'
,
title
:
nls
.
localize
({
key
:
'
miInsertCursorAtEndOfEachLineSelected
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Add C&&ursors to Line Ends
"
),
order
:
4
}
});
}
...
...
@@ -528,6 +547,12 @@ export class AddSelectionToNextFindMatchAction extends MultiCursorSelectionContr
kbExpr
:
EditorContextKeys
.
focus
,
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_D
,
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
3_multi
'
,
title
:
nls
.
localize
({
key
:
'
miAddSelectionToNextFindMatch
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Add &&Next Occurrence
"
),
order
:
5
}
});
}
...
...
@@ -542,7 +567,13 @@ export class AddSelectionToPreviousFindMatchAction extends MultiCursorSelectionC
id
:
'
editor.action.addSelectionToPreviousFindMatch
'
,
label
:
nls
.
localize
(
'
addSelectionToPreviousFindMatch
'
,
"
Add Selection To Previous Find Match
"
),
alias
:
'
Add Selection To Previous Find Match
'
,
precondition
:
null
precondition
:
null
,
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
3_multi
'
,
title
:
nls
.
localize
({
key
:
'
miAddSelectionToPreviousFindMatch
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Add P&&revious Occurrence
"
),
order
:
6
}
});
}
protected
_run
(
multiCursorController
:
MultiCursorSelectionController
,
findController
:
CommonFindController
):
void
{
...
...
@@ -594,6 +625,12 @@ export class SelectHighlightsAction extends MultiCursorSelectionControllerAction
kbExpr
:
EditorContextKeys
.
focus
,
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyCode
.
KEY_L
,
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
3_multi
'
,
title
:
nls
.
localize
({
key
:
'
miSelectHighlights
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Select All &&Occurrences
"
),
order
:
7
}
});
}
...
...
src/vs/editor/contrib/smartSelect/smartSelect.ts
浏览文件 @
56a962fd
...
...
@@ -17,6 +17,7 @@ import { TokenSelectionSupport, ILogicalSelectionEntry } from './tokenSelectionS
import
{
ICursorPositionChangedEvent
}
from
'
vs/editor/common/controller/cursorEvents
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
KeybindingWeight
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
MenuId
}
from
'
vs/platform/actions/common/actions
'
;
// --- selection state machine
...
...
@@ -176,6 +177,12 @@ class GrowSelectionAction extends AbstractSmartSelect {
primary
:
KeyMod
.
Shift
|
KeyMod
.
Alt
|
KeyCode
.
RightArrow
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
WinCtrl
|
KeyMod
.
Shift
|
KeyCode
.
RightArrow
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
1_basic
'
,
title
:
nls
.
localize
({
key
:
'
miSmartSelectGrow
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Expand Selection
"
),
order
:
2
}
});
}
...
...
@@ -193,6 +200,12 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
primary
:
KeyMod
.
Shift
|
KeyMod
.
Alt
|
KeyCode
.
LeftArrow
,
mac
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyMod
.
WinCtrl
|
KeyMod
.
Shift
|
KeyCode
.
LeftArrow
},
weight
:
KeybindingWeight
.
EditorContrib
},
menubarOpts
:
{
menuId
:
MenuId
.
MenubarSelectionMenu
,
group
:
'
1_basic
'
,
title
:
nls
.
localize
({
key
:
'
miSmartSelectShrink
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Shrink Selection
"
),
order
:
3
}
});
}
...
...
src/vs/workbench/parts/codeEditor/electron-browser/menubarRegistrations.ts
浏览文件 @
56a962fd
...
...
@@ -10,68 +10,6 @@ import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
selectionMenuRegistration
();
function
selectionMenuRegistration
()
{
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
1_basic
'
,
command
:
{
id
:
'
editor.action.selectAll
'
,
title
:
nls
.
localize
({
key
:
'
miSelectAll
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Select All
"
)
},
order
:
1
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
1_basic
'
,
command
:
{
id
:
'
editor.action.smartSelect.grow
'
,
title
:
nls
.
localize
({
key
:
'
miSmartSelectGrow
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Expand Selection
"
)
},
order
:
2
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
1_basic
'
,
command
:
{
id
:
'
editor.action.smartSelect.shrink
'
,
title
:
nls
.
localize
({
key
:
'
miSmartSelectShrink
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Shrink Selection
"
)
},
order
:
3
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
2_line
'
,
command
:
{
id
:
'
editor.action.copyLinesUpAction
'
,
title
:
nls
.
localize
({
key
:
'
miCopyLinesUp
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Copy Line Up
"
)
},
order
:
1
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
2_line
'
,
command
:
{
id
:
'
editor.action.copyLinesDownAction
'
,
title
:
nls
.
localize
({
key
:
'
miCopyLinesDown
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Co&&py Line Down
"
)
},
order
:
2
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
2_line
'
,
command
:
{
id
:
'
editor.action.moveLinesUpAction
'
,
title
:
nls
.
localize
({
key
:
'
miMoveLinesUp
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Mo&&ve Line Up
"
)
},
order
:
3
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
2_line
'
,
command
:
{
id
:
'
editor.action.moveLinesDownAction
'
,
title
:
nls
.
localize
({
key
:
'
miMoveLinesDown
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Move &&Line Down
"
)
},
order
:
4
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
3_multi
'
,
...
...
@@ -82,57 +20,4 @@ function selectionMenuRegistration() {
order
:
1
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
3_multi
'
,
command
:
{
id
:
'
editor.action.insertCursorAbove
'
,
title
:
nls
.
localize
({
key
:
'
miInsertCursorAbove
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
&&Add Cursor Above
"
)
},
order
:
2
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
3_multi
'
,
command
:
{
id
:
'
editor.action.insertCursorBelow
'
,
title
:
nls
.
localize
({
key
:
'
miInsertCursorBelow
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
A&&dd Cursor Below
"
)
},
order
:
3
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
3_multi
'
,
command
:
{
id
:
'
editor.action.insertCursorAtEndOfEachLineSelected
'
,
title
:
nls
.
localize
({
key
:
'
miInsertCursorAtEndOfEachLineSelected
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Add C&&ursors to Line Ends
"
)
},
order
:
4
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
3_multi
'
,
command
:
{
id
:
'
editor.action.addSelectionToNextFindMatch
'
,
title
:
nls
.
localize
({
key
:
'
miAddSelectionToNextFindMatch
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Add &&Next Occurrence
"
)
},
order
:
5
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
3_multi
'
,
command
:
{
id
:
'
editor.action.addSelectionToPreviousFindMatch
'
,
title
:
nls
.
localize
({
key
:
'
miAddSelectionToPreviousFindMatch
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Add P&&revious Occurrence
"
)
},
order
:
6
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
MenubarSelectionMenu
,
{
group
:
'
3_multi
'
,
command
:
{
id
:
'
editor.action.selectHighlights
'
,
title
:
nls
.
localize
({
key
:
'
miSelectHighlights
'
,
comment
:
[
'
&& denotes a mnemonic
'
]
},
"
Select All &&Occurrences
"
)
},
order
:
7
});
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录