Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a46554c8
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,发现更多精彩内容 >>
提交
a46554c8
编写于
9月 17, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use the fast variant of TextEditor.setDecorations
上级
f22940a2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
9 deletion
+9
-9
extensions/merge-conflict/src/mergeDecorator.ts
extensions/merge-conflict/src/mergeDecorator.ts
+9
-9
未找到文件。
extensions/merge-conflict/src/mergeDecorator.ts
浏览文件 @
a46554c8
...
...
@@ -188,9 +188,9 @@ export default class MergeDecorator implements vscode.Disposable {
// Store decorations keyed by the type of decoration, set decoration wants a "style"
// to go with it, which will match this key (see constructor);
let
matchDecorations
:
{
[
key
:
string
]:
vscode
.
DecorationOptions
[]
}
=
{};
let
matchDecorations
:
{
[
key
:
string
]:
vscode
.
Range
[]
}
=
{};
let
pushDecoration
=
(
key
:
string
,
d
:
vscode
.
DecorationOptions
)
=>
{
let
pushDecoration
=
(
key
:
string
,
d
:
vscode
.
Range
)
=>
{
matchDecorations
[
key
]
=
matchDecorations
[
key
]
||
[];
matchDecorations
[
key
].
push
(
d
);
};
...
...
@@ -198,25 +198,25 @@ export default class MergeDecorator implements vscode.Disposable {
conflicts
.
forEach
(
conflict
=>
{
// TODO, this could be more effective, just call getMatchPositions once with a map of decoration to position
if
(
!
conflict
.
current
.
decoratorContent
.
isEmpty
)
{
pushDecoration
(
'
current.content
'
,
{
range
:
conflict
.
current
.
decoratorContent
}
);
pushDecoration
(
'
current.content
'
,
conflict
.
current
.
decoratorContent
);
}
if
(
!
conflict
.
incoming
.
decoratorContent
.
isEmpty
)
{
pushDecoration
(
'
incoming.content
'
,
{
range
:
conflict
.
incoming
.
decoratorContent
}
);
pushDecoration
(
'
incoming.content
'
,
conflict
.
incoming
.
decoratorContent
);
}
conflict
.
commonAncestors
.
forEach
(
commonAncestorsRegion
=>
{
if
(
!
commonAncestorsRegion
.
decoratorContent
.
isEmpty
)
{
pushDecoration
(
'
commonAncestors.content
'
,
{
range
:
commonAncestorsRegion
.
decoratorContent
}
);
pushDecoration
(
'
commonAncestors.content
'
,
commonAncestorsRegion
.
decoratorContent
);
}
});
if
(
this
.
config
!
.
enableDecorations
)
{
pushDecoration
(
'
current.header
'
,
{
range
:
conflict
.
current
.
header
}
);
pushDecoration
(
'
splitter
'
,
{
range
:
conflict
.
splitter
}
);
pushDecoration
(
'
incoming.header
'
,
{
range
:
conflict
.
incoming
.
header
}
);
pushDecoration
(
'
current.header
'
,
conflict
.
current
.
header
);
pushDecoration
(
'
splitter
'
,
conflict
.
splitter
);
pushDecoration
(
'
incoming.header
'
,
conflict
.
incoming
.
header
);
conflict
.
commonAncestors
.
forEach
(
commonAncestorsRegion
=>
{
pushDecoration
(
'
commonAncestors.header
'
,
{
range
:
commonAncestorsRegion
.
header
}
);
pushDecoration
(
'
commonAncestors.header
'
,
commonAncestorsRegion
.
header
);
});
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录