Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a152ae01
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,发现更多精彩内容 >>
提交
a152ae01
编写于
10月 30, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
deco - fix broken folder/file labels when multiple decorations apply
上级
63407253
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
6 deletion
+7
-6
src/vs/workbench/services/decorations/browser/decorationsService.ts
...kbench/services/decorations/browser/decorationsService.ts
+7
-6
未找到文件。
src/vs/workbench/services/decorations/browser/decorationsService.ts
浏览文件 @
a152ae01
...
@@ -15,6 +15,7 @@ import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector } fro
...
@@ -15,6 +15,7 @@ import { createStyleSheet, createCSSRule, removeCSSRulesContainingSelector } fro
import
{
IThemeService
,
ITheme
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IThemeService
,
ITheme
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
IdGenerator
}
from
'
vs/base/common/idGenerator
'
;
import
{
IdGenerator
}
from
'
vs/base/common/idGenerator
'
;
import
{
IIterator
}
from
'
vs/base/common/iterator
'
;
import
{
IIterator
}
from
'
vs/base/common/iterator
'
;
import
{
isFalsyOrWhitespace
}
from
'
vs/base/common/strings
'
;
class
DecorationRule
{
class
DecorationRule
{
...
@@ -63,7 +64,7 @@ class DecorationRule {
...
@@ -63,7 +64,7 @@ class DecorationRule {
createCSSRule
(
`.
${
this
.
labelClassName
}
`
,
`color:
${
theme
.
getColor
(
color
)
||
'
inherit
'
}
;`
,
element
);
createCSSRule
(
`.
${
this
.
labelClassName
}
`
,
`color:
${
theme
.
getColor
(
color
)
||
'
inherit
'
}
;`
,
element
);
// badge
// badge
const
letters
=
data
.
filter
(
d
=>
Boolean
(
d
)).
map
(
d
=>
d
.
letter
);
const
letters
=
data
.
filter
(
d
=>
!
isFalsyOrWhitespace
(
d
.
letter
)).
map
(
d
=>
d
.
letter
);
if
(
letters
.
length
)
{
if
(
letters
.
length
)
{
createCSSRule
(
`.
${
this
.
badgeClassName
}
::after`
,
`content: "
${
letters
.
join
(
'
,
'
)}
"; color:
${
theme
.
getColor
(
color
)
||
'
inherit
'
}
;`
,
element
);
createCSSRule
(
`.
${
this
.
badgeClassName
}
::after`
,
`content: "
${
letters
.
join
(
'
,
'
)}
"; color:
${
theme
.
getColor
(
color
)
||
'
inherit
'
}
;`
,
element
);
}
}
...
@@ -112,7 +113,7 @@ class DecorationStyles {
...
@@ -112,7 +113,7 @@ class DecorationStyles {
return
{
return
{
labelClassName
:
rule
.
labelClassName
,
labelClassName
:
rule
.
labelClassName
,
badgeClassName
:
!
onlyChildren
?
rule
.
badgeClassName
:
''
,
badgeClassName
:
!
onlyChildren
?
rule
.
badgeClassName
:
''
,
tooltip
:
!
onlyChildren
?
data
.
filter
(
d
=>
Boolean
(
d
.
tooltip
)).
map
(
d
=>
d
.
tooltip
).
join
(
'
,
'
)
:
''
,
tooltip
:
!
onlyChildren
?
data
.
filter
(
d
=>
!
isFalsyOrWhitespace
(
d
.
tooltip
)).
map
(
d
=>
d
.
tooltip
).
join
(
'
,
'
)
:
''
,
update
:
(
source
,
insert
)
=>
{
update
:
(
source
,
insert
)
=>
{
let
newData
=
data
.
slice
();
let
newData
=
data
.
slice
();
if
(
!
source
)
{
if
(
!
source
)
{
...
@@ -362,12 +363,12 @@ export class FileDecorationsService implements IDecorationsService {
...
@@ -362,12 +363,12 @@ export class FileDecorationsService implements IDecorationsService {
getDecoration
(
uri
:
URI
,
includeChildren
:
boolean
,
overwrite
?:
IDecorationData
):
IDecoration
{
getDecoration
(
uri
:
URI
,
includeChildren
:
boolean
,
overwrite
?:
IDecorationData
):
IDecoration
{
let
data
:
IDecorationData
[]
=
[];
let
data
:
IDecorationData
[]
=
[];
let
only
Children
:
boolean
;
let
contains
Children
:
boolean
;
for
(
let
iter
=
this
.
_data
.
iterator
(),
next
=
iter
.
next
();
!
next
.
done
;
next
=
iter
.
next
())
{
for
(
let
iter
=
this
.
_data
.
iterator
(),
next
=
iter
.
next
();
!
next
.
done
;
next
=
iter
.
next
())
{
next
.
value
.
getOrRetrieve
(
uri
,
includeChildren
,
(
deco
,
isChild
)
=>
{
next
.
value
.
getOrRetrieve
(
uri
,
includeChildren
,
(
deco
,
isChild
)
=>
{
if
(
!
isChild
||
deco
.
bubble
)
{
if
(
!
isChild
||
deco
.
bubble
)
{
data
.
push
(
deco
);
data
.
push
(
deco
);
onlyChildren
=
onlyChildren
===
undefined
?
isChild
:
onlyChildren
&&
isChild
;
containsChildren
=
isChild
||
containsChildren
;
}
}
});
});
}
}
...
@@ -375,13 +376,13 @@ export class FileDecorationsService implements IDecorationsService {
...
@@ -375,13 +376,13 @@ export class FileDecorationsService implements IDecorationsService {
if
(
data
.
length
===
0
)
{
if
(
data
.
length
===
0
)
{
// nothing, maybe overwrite data
// nothing, maybe overwrite data
if
(
overwrite
)
{
if
(
overwrite
)
{
return
this
.
_decorationStyles
.
asDecoration
([
overwrite
],
only
Children
);
return
this
.
_decorationStyles
.
asDecoration
([
overwrite
],
contains
Children
);
}
else
{
}
else
{
return
undefined
;
return
undefined
;
}
}
}
else
{
}
else
{
// result, maybe overwrite
// result, maybe overwrite
let
result
=
this
.
_decorationStyles
.
asDecoration
(
data
,
only
Children
);
let
result
=
this
.
_decorationStyles
.
asDecoration
(
data
,
contains
Children
);
if
(
overwrite
)
{
if
(
overwrite
)
{
return
result
.
update
(
overwrite
.
source
,
overwrite
);
return
result
.
update
(
overwrite
.
source
,
overwrite
);
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录