Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3e211597
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,发现更多精彩内容 >>
提交
3e211597
编写于
2月 19, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
also support single icon, not just ThemeIcon and {light, dark}-tuples, #77728
上级
cc4b95f7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
4 deletion
+22
-4
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+1
-1
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+1
-1
src/vs/workbench/api/common/extHost.protocol.ts
src/vs/workbench/api/common/extHost.protocol.ts
+13
-2
src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
+7
-0
未找到文件。
src/vs/editor/common/modes.ts
浏览文件 @
3e211597
...
...
@@ -1324,7 +1324,7 @@ export interface WorkspaceEditMetadata {
needsConfirmation
:
boolean
;
label
:
string
;
description
?:
string
;
iconPath
?:
{
id
:
string
}
|
{
light
:
URI
,
dark
:
URI
};
iconPath
?:
{
id
:
string
}
|
URI
|
{
light
:
URI
,
dark
:
URI
};
}
export
interface
WorkspaceFileEditOptions
{
...
...
src/vs/monaco.d.ts
浏览文件 @
3e211597
...
...
@@ -6044,7 +6044,7 @@ declare namespace monaco.languages {
description
?:
string
;
iconPath
?:
{
id
:
string
;
}
|
{
}
|
Uri
|
{
light
:
Uri
;
dark
:
Uri
;
};
...
...
src/vs/workbench/api/common/extHost.protocol.ts
浏览文件 @
3e211597
...
...
@@ -50,6 +50,7 @@ import { ExtensionActivationReason } from 'vs/workbench/api/common/extHostExtens
import
{
TunnelDto
}
from
'
vs/workbench/api/common/extHostTunnelService
'
;
import
{
TunnelOptions
}
from
'
vs/platform/remote/common/tunnel
'
;
import
{
Timeline
,
TimelineChangeEvent
,
TimelineCursor
,
TimelineProviderDescriptor
}
from
'
vs/workbench/contrib/timeline/common/timeline
'
;
import
{
revive
}
from
'
vs/base/common/marshalling
'
;
export
interface
IEnvironment
{
isExtensionDevelopmentDebug
:
boolean
;
...
...
@@ -1093,18 +1094,25 @@ export interface IWorkspaceSymbolsDto extends IdObject {
symbols
:
IWorkspaceSymbolDto
[];
}
export
interface
IWorkspaceEditEntryMetadataDto
{
needsConfirmation
:
boolean
;
label
:
string
;
description
?:
string
;
iconPath
?:
{
id
:
string
}
|
UriComponents
|
{
light
:
UriComponents
,
dark
:
UriComponents
};
}
export
interface
IWorkspaceFileEditDto
{
oldUri
?:
UriComponents
;
newUri
?:
UriComponents
;
options
?:
modes
.
WorkspaceFileEditOptions
metadata
?:
modes
.
WorkspaceEditMetadata
;
metadata
?:
IWorkspaceEditEntryMetadataDto
;
}
export
interface
IWorkspaceTextEditDto
{
resource
:
UriComponents
;
edit
:
modes
.
TextEdit
;
modelVersionId
?:
number
;
metadata
?:
modes
.
WorkspaceEditMetadata
;
metadata
?:
IWorkspaceEditEntryMetadataDto
;
}
export
interface
IWorkspaceEditDto
{
...
...
@@ -1123,6 +1131,9 @@ export function reviveWorkspaceEditDto(data: IWorkspaceEditDto | undefined): mod
(
<
IWorkspaceFileEditDto
>
edit
).
newUri
=
URI
.
revive
((
<
IWorkspaceFileEditDto
>
edit
).
newUri
);
(
<
IWorkspaceFileEditDto
>
edit
).
oldUri
=
URI
.
revive
((
<
IWorkspaceFileEditDto
>
edit
).
oldUri
);
}
if
(
edit
.
metadata
&&
edit
.
metadata
.
iconPath
)
{
edit
.
metadata
=
revive
(
edit
.
metadata
);
}
}
}
return
<
modes
.
WorkspaceEdit
>
data
;
...
...
src/vs/workbench/contrib/bulkEdit/browser/bulkEditTree.ts
浏览文件 @
3e211597
...
...
@@ -25,6 +25,7 @@ import { basename } from 'vs/base/common/resources';
import
{
ThemeIcon
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
WorkspaceFileEdit
}
from
'
vs/editor/common/modes
'
;
import
{
compare
}
from
'
vs/base/common/strings
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
// --- VIEW MODEL
...
...
@@ -420,6 +421,12 @@ export class CategoryElementRenderer implements ITreeRenderer<CategoryElement, F
const
className
=
ThemeIcon
.
asClassName
(
metadata
.
iconPath
);
template
.
icon
.
className
=
className
?
`theme-icon
${
className
}
`
:
''
;
}
else
if
(
URI
.
isUri
(
metadata
.
iconPath
))
{
// background-image
template
.
icon
.
className
=
'
uri-icon
'
;
template
.
icon
.
style
.
setProperty
(
'
--background-dark
'
,
`url("
${
metadata
.
iconPath
.
toString
(
true
)}
")`
);
template
.
icon
.
style
.
setProperty
(
'
--background-light
'
,
`url("
${
metadata
.
iconPath
.
toString
(
true
)}
")`
);
}
else
if
(
metadata
.
iconPath
)
{
// background-image
template
.
icon
.
className
=
'
uri-icon
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录