Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
13dd8273
V
vscode
项目概览
掘金者说
/
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,发现更多精彩内容 >>
提交
13dd8273
编写于
9月 28, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "allow to define gutter and content icons paths as string OR uri, #12111"
This reverts commit
6afb0f47
.
上级
2bb86f89
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
17 deletion
+10
-17
src/vs/editor/browser/services/codeEditorServiceImpl.ts
src/vs/editor/browser/services/codeEditorServiceImpl.ts
+3
-9
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+2
-2
src/vs/vscode.d.ts
src/vs/vscode.d.ts
+4
-5
src/vs/workbench/api/node/extHostTypeConverters.ts
src/vs/workbench/api/node/extHostTypeConverters.ts
+1
-1
未找到文件。
src/vs/editor/browser/services/codeEditorServiceImpl.ts
浏览文件 @
13dd8273
...
...
@@ -301,10 +301,8 @@ class DecorationRenderHelper {
if
(
typeof
opts
!==
'
undefined
'
)
{
DecorationRenderHelper
.
collectBorderSettingsCSSText
(
opts
,
cssTextArr
);
if
(
typeof
opts
.
contentIconPath
===
'
string
'
)
{
cssTextArr
.
push
(
strings
.
format
(
this
.
_CSS_MAP
.
contentIconPath
,
URI
.
file
(
opts
.
contentIconPath
).
toString
()));
}
else
if
(
opts
.
contentIconPath
instanceof
URI
)
{
cssTextArr
.
push
(
strings
.
format
(
this
.
_CSS_MAP
.
contentIconPath
,
opts
.
contentIconPath
.
toString
()));
if
(
typeof
opts
.
contentIconPath
!==
'
undefined
'
)
{
cssTextArr
.
push
(
strings
.
format
(
this
.
_CSS_MAP
.
contentIconPath
,
URI
.
parse
(
opts
.
contentIconPath
).
toString
()));
}
if
(
typeof
opts
.
contentText
!==
'
undefined
'
)
{
let
escaped
=
opts
.
contentText
.
replace
(
/
\"
/g
,
'
\\\
"
'
);
...
...
@@ -326,11 +324,7 @@ class DecorationRenderHelper {
let
cssTextArr
=
[];
if
(
typeof
opts
.
gutterIconPath
!==
'
undefined
'
)
{
if
(
typeof
opts
.
gutterIconPath
===
'
string
'
)
{
cssTextArr
.
push
(
strings
.
format
(
this
.
_CSS_MAP
.
gutterIconPath
,
URI
.
file
(
opts
.
gutterIconPath
).
toString
()));
}
else
{
cssTextArr
.
push
(
strings
.
format
(
this
.
_CSS_MAP
.
gutterIconPath
,
opts
.
gutterIconPath
.
toString
()));
}
cssTextArr
.
push
(
strings
.
format
(
this
.
_CSS_MAP
.
gutterIconPath
,
URI
.
parse
(
opts
.
gutterIconPath
).
toString
()));
if
(
typeof
opts
.
gutterIconSize
!==
'
undefined
'
)
{
cssTextArr
.
push
(
strings
.
format
(
this
.
_CSS_MAP
.
gutterIconSize
,
opts
.
gutterIconSize
));
}
...
...
src/vs/editor/common/editorCommon.ts
浏览文件 @
13dd8273
...
...
@@ -3788,7 +3788,7 @@ export interface IThemeDecorationRenderOptions {
color
?:
string
;
letterSpacing
?:
string
;
gutterIconPath
?:
string
|
URI
;
gutterIconPath
?:
string
;
gutterIconSize
?:
string
;
overviewRulerColor
?:
string
;
...
...
@@ -3802,7 +3802,7 @@ export interface IThemeDecorationRenderOptions {
*/
export
interface
IContentDecorationRenderOptions
{
contentText
?:
string
;
contentIconPath
?:
string
|
URI
;
contentIconPath
?:
string
;
border
?:
string
;
textDecoration
?:
string
;
...
...
src/vs/vscode.d.ts
浏览文件 @
13dd8273
...
...
@@ -782,10 +782,9 @@ declare namespace vscode {
letterSpacing
?:
string
;
/**
* An **absolute path** to an image to be rendered in the gutterIconPath or
* an URI.
* An **absolute path** to an image to be rendered in the gutterIconPath.
*/
gutterIconPath
?:
string
|
Uri
;
gutterIconPath
?:
string
;
/**
* Specifies the size of the gutter icon.
...
...
@@ -816,9 +815,9 @@ declare namespace vscode {
*/
contentText
?:
string
;
/**
* An **absolute path** to an image to be rendered in the attachment
or an URI
. Either an icon or a text can be shown, but not both.
* An **absolute path** to an image to be rendered in the attachment. Either an icon or a text can be shown, but not both.
*/
contentIconPath
?:
string
|
Uri
;
contentIconPath
?:
string
;
/**
* CSS styling property that will be applied to the decoration attachment.
*/
...
...
src/vs/workbench/api/node/extHostTypeConverters.ts
浏览文件 @
13dd8273
...
...
@@ -143,7 +143,7 @@ export function fromRangeOrRangeWithMessage(ranges: vscode.Range[] | vscode.Deco
return
{
range
:
fromRange
(
r
.
range
),
hoverMessage
:
r
.
hoverMessage
,
renderOptions
:
<
any
>
/* URI vs Uri*/
r
.
renderOptions
renderOptions
:
r
.
renderOptions
};
});
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录