Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7d8c2f68
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,发现更多精彩内容 >>
提交
7d8c2f68
编写于
9月 10, 2019
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes for amd resource adoption (#80654)
上级
7bb6df93
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
18 deletion
+29
-18
src/vs/workbench/browser/parts/editor/editor.contribution.ts
src/vs/workbench/browser/parts/editor/editor.contribution.ts
+20
-12
src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
...vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
+7
-4
src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
...h/contrib/preferences/browser/preferences.contribution.ts
+2
-2
未找到文件。
src/vs/workbench/browser/parts/editor/editor.contribution.ts
浏览文件 @
7d8c2f68
...
...
@@ -479,21 +479,26 @@ function appendEditorToolItem(primary: IEditorToolItem, when: ContextKeyExpr | u
MenuRegistry
.
appendMenuItem
(
MenuId
.
EditorTitle
,
item
);
}
const
SPLIT_EDITOR_HORIZONTAL_DARK_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-horizontal-dark.svg
'
));
const
SPLIT_EDITOR_HORIZONTAL_LIGHT_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-horizontal-light.svg
'
));
const
SPLIT_EDITOR_VERTICAL_DARK_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-vertical-dark.svg
'
));
const
SPLIT_EDITOR_VERTICAL_LIGHT_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-vertical-light.svg
'
));
// Editor Title Menu: Split Editor
appendEditorToolItem
(
{
id
:
SplitEditorAction
.
ID
,
title
:
nls
.
localize
(
'
splitEditorRight
'
,
"
Split Editor Right
"
),
iconDark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-horizontal-dark.svg
'
))
,
iconLight
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-horizontal-light.svg
'
))
iconDark
:
SPLIT_EDITOR_HORIZONTAL_DARK_ICON
,
iconLight
:
SPLIT_EDITOR_HORIZONTAL_LIGHT_ICON
},
ContextKeyExpr
.
not
(
'
splitEditorsVertically
'
),
100000
,
// towards the end
{
id
:
editorCommands
.
SPLIT_EDITOR_DOWN
,
title
:
nls
.
localize
(
'
splitEditorDown
'
,
"
Split Editor Down
"
),
iconDark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-vertical-dark.svg
'
))
,
iconLight
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-vertical-light.svg
'
))
iconDark
:
SPLIT_EDITOR_VERTICAL_DARK_ICON
,
iconLight
:
SPLIT_EDITOR_VERTICAL_LIGHT_ICON
}
);
...
...
@@ -501,19 +506,22 @@ appendEditorToolItem(
{
id
:
SplitEditorAction
.
ID
,
title
:
nls
.
localize
(
'
splitEditorDown
'
,
"
Split Editor Down
"
),
iconDark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-vertical-dark.svg
'
))
,
iconLight
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-vertical-light.svg
'
))
iconDark
:
SPLIT_EDITOR_VERTICAL_DARK_ICON
,
iconLight
:
SPLIT_EDITOR_VERTICAL_LIGHT_ICON
},
ContextKeyExpr
.
has
(
'
splitEditorsVertically
'
),
100000
,
// towards the end
{
id
:
editorCommands
.
SPLIT_EDITOR_RIGHT
,
title
:
nls
.
localize
(
'
splitEditorRight
'
,
"
Split Editor Right
"
),
iconDark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-horizontal-dark.svg
'
))
,
iconLight
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/split-editor-horizontal-light.svg
'
))
iconDark
:
SPLIT_EDITOR_HORIZONTAL_DARK_ICON
,
iconLight
:
SPLIT_EDITOR_HORIZONTAL_LIGHT_ICON
}
);
const
CLOSE_ALL_DARK_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/close-all-dark.svg
'
));
const
CLOSE_ALL_LIGHT_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/close-all-light.svg
'
));
// Editor Title Menu: Close Group (tabs disabled)
appendEditorToolItem
(
{
...
...
@@ -527,8 +535,8 @@ appendEditorToolItem(
{
id
:
editorCommands
.
CLOSE_EDITORS_IN_GROUP_COMMAND_ID
,
title
:
nls
.
localize
(
'
closeAll
'
,
"
Close All
"
),
iconDark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/close-all-dark.svg
'
))
,
iconLight
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/close-all-light.svg
'
))
iconDark
:
CLOSE_ALL_DARK_ICON
,
iconLight
:
CLOSE_ALL_LIGHT_ICON
}
);
...
...
@@ -544,8 +552,8 @@ appendEditorToolItem(
{
id
:
editorCommands
.
CLOSE_EDITORS_IN_GROUP_COMMAND_ID
,
title
:
nls
.
localize
(
'
closeAll
'
,
"
Close All
"
),
iconDark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/close-all-dark.svg
'
))
,
iconLight
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/browser/parts/editor/media/close-all-light.svg
'
))
iconDark
:
CLOSE_ALL_DARK_ICON
,
iconLight
:
CLOSE_ALL_LIGHT_ICON
}
);
...
...
src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.ts
浏览文件 @
7d8c2f68
...
...
@@ -272,13 +272,16 @@ registerEditorContribution(ToggleWordWrapController);
registerEditorAction
(
ToggleWordWrapAction
);
const
WORD_WRAP_DARK_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg
'
));
const
WORD_WRAP_LIGHT_ICON
=
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg
'
));
MenuRegistry
.
appendMenuItem
(
MenuId
.
EditorTitle
,
{
command
:
{
id
:
TOGGLE_WORD_WRAP_ID
,
title
:
nls
.
localize
(
'
unwrapMinified
'
,
"
Disable wrapping for this file
"
),
iconLocation
:
{
dark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg
'
))
,
light
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg
'
))
dark
:
WORD_WRAP_DARK_ICON
,
light
:
WORD_WRAP_LIGHT_ICON
}
},
group
:
'
navigation
'
,
...
...
@@ -294,8 +297,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
id
:
TOGGLE_WORD_WRAP_ID
,
title
:
nls
.
localize
(
'
wrapMinified
'
,
"
Enable wrapping for this file
"
),
iconLocation
:
{
dark
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg
'
))
,
light
:
URI
.
parse
(
registerAndGetAmdImageURL
(
'
vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg
'
))
dark
:
WORD_WRAP_DARK_ICON
,
light
:
WORD_WRAP_LIGHT_ICON
}
},
group
:
'
navigation
'
,
...
...
src/vs/workbench/contrib/preferences/browser/preferences.contribution.ts
浏览文件 @
7d8c2f68
...
...
@@ -820,8 +820,8 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
id
:
SETTINGS_EDITOR_COMMAND_SWITCH_TO_JSON
,
title
:
nls
.
localize
(
'
openSettingsJson
'
,
"
Open Settings (JSON)
"
),
iconLocation
:
{
dark
:
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/preferences/browser/media/preferences-editor-dark.svg
'
))
,
light
:
URI
.
parse
(
require
.
toUrl
(
'
vs/workbench/contrib/preferences/browser/media/preferences-editor-light.svg
'
))
dark
:
PREFERENCES_EDITOR_DARK_ICON_URI
,
light
:
PREFERENCES_EDITOR_LIGHT_ICON_URI
}
},
group
:
'
navigation
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录