Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
eb4161ee
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,发现更多精彩内容 >>
提交
eb4161ee
编写于
9月 12, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use null when a decoration does not use overviewRuler
上级
ae670f0d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
7 deletion
+9
-7
src/vs/editor/common/model/intervalTree.ts
src/vs/editor/common/model/intervalTree.ts
+1
-1
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+3
-3
src/vs/editor/common/viewModel/splitLinesCollection.ts
src/vs/editor/common/viewModel/splitLinesCollection.ts
+2
-2
src/vs/editor/common/viewModel/viewModelImpl.ts
src/vs/editor/common/viewModel/viewModelImpl.ts
+3
-1
未找到文件。
src/vs/editor/common/model/intervalTree.ts
浏览文件 @
eb4161ee
...
...
@@ -198,7 +198,7 @@ export class IntervalNode implements IModelDecoration {
||
className
===
ClassName
.
EditorInfoDecoration
));
_setNodeStickiness
(
this
,
<
number
>
this
.
options
.
stickiness
);
setNodeIsInOverviewRuler
(
this
,
this
.
options
.
overviewRuler
.
color
?
true
:
false
);
setNodeIsInOverviewRuler
(
this
,
(
this
.
options
.
overviewRuler
&&
this
.
options
.
overviewRuler
.
color
)
?
true
:
false
);
}
public
setCachedOffsets
(
absoluteStart
:
number
,
absoluteEnd
:
number
,
cachedVersionId
:
number
):
void
{
...
...
src/vs/editor/common/model/textModel.ts
浏览文件 @
eb4161ee
...
...
@@ -1676,8 +1676,8 @@ export class TextModel extends Disposable implements model.ITextModel {
return
;
}
const
nodeWasInOverviewRuler
=
(
node
.
options
.
overviewRuler
.
color
?
true
:
false
);
const
nodeIsInOverviewRuler
=
(
options
.
overviewRuler
.
color
?
true
:
false
);
const
nodeWasInOverviewRuler
=
(
node
.
options
.
overviewRuler
&&
node
.
options
.
overviewRuler
.
color
?
true
:
false
);
const
nodeIsInOverviewRuler
=
(
options
.
overviewRuler
&&
options
.
overviewRuler
.
color
?
true
:
false
);
if
(
nodeWasInOverviewRuler
!==
nodeIsInOverviewRuler
)
{
// Delete + Insert due to an overview ruler status change
...
...
@@ -2846,7 +2846,7 @@ export class ModelDecorationOptions implements model.IModelDecorationOptions {
this
.
glyphMarginHoverMessage
=
options
.
glyphMarginHoverMessage
||
null
;
this
.
isWholeLine
=
options
.
isWholeLine
||
false
;
this
.
showIfCollapsed
=
options
.
showIfCollapsed
||
false
;
this
.
overviewRuler
=
new
ModelDecorationOverviewRulerOptions
(
options
.
overviewRuler
)
;
this
.
overviewRuler
=
options
.
overviewRuler
?
new
ModelDecorationOverviewRulerOptions
(
options
.
overviewRuler
)
:
null
;
this
.
glyphMarginClassName
=
options
.
glyphMarginClassName
?
cleanClassName
(
options
.
glyphMarginClassName
)
:
null
;
this
.
linesDecorationsClassName
=
options
.
linesDecorationsClassName
?
cleanClassName
(
options
.
linesDecorationsClassName
)
:
null
;
this
.
marginClassName
=
options
.
marginClassName
?
cleanClassName
(
options
.
marginClassName
)
:
null
;
...
...
src/vs/editor/common/viewModel/splitLinesCollection.ts
浏览文件 @
eb4161ee
...
...
@@ -793,7 +793,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection {
for
(
let
i
=
0
,
len
=
decorations
.
length
;
i
<
len
;
i
++
)
{
const
decoration
=
decorations
[
i
];
const
opts
=
<
ModelDecorationOverviewRulerOptions
>
decoration
.
options
.
overviewRuler
;
const
lane
=
opts
.
position
;
const
lane
=
opts
?
opts
.
position
:
0
;
if
(
lane
===
0
)
{
continue
;
}
...
...
@@ -1356,7 +1356,7 @@ export class IdentityLinesCollection implements IViewModelLinesCollection {
for
(
let
i
=
0
,
len
=
decorations
.
length
;
i
<
len
;
i
++
)
{
const
decoration
=
decorations
[
i
];
const
opts
=
<
ModelDecorationOverviewRulerOptions
>
decoration
.
options
.
overviewRuler
;
const
lane
=
opts
.
position
;
const
lane
=
opts
?
opts
.
position
:
0
;
if
(
lane
===
0
)
{
continue
;
}
...
...
src/vs/editor/common/viewModel/viewModelImpl.ts
浏览文件 @
eb4161ee
...
...
@@ -539,7 +539,9 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
for
(
let
i
=
0
,
len
=
decorations
.
length
;
i
<
len
;
i
++
)
{
const
decoration
=
decorations
[
i
];
const
opts
=
<
ModelDecorationOverviewRulerOptions
>
decoration
.
options
.
overviewRuler
;
opts
.
_resolvedColor
=
null
;
if
(
opts
)
{
opts
.
_resolvedColor
=
null
;
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录