Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
c45f29b2
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
c45f29b2
编写于
5月 31, 2017
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Track pending updates per editor (fixes #27570)
上级
e0c1e7d2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
39 addition
and
31 deletion
+39
-31
extensions/merge-conflict/src/mergeDecorator.ts
extensions/merge-conflict/src/mergeDecorator.ts
+39
-31
未找到文件。
extensions/merge-conflict/src/mergeDecorator.ts
浏览文件 @
c45f29b2
...
...
@@ -15,6 +15,7 @@ export default class MergeDectorator implements vscode.Disposable {
private
config
:
interfaces
.
IExtensionConfiguration
;
private
tracker
:
interfaces
.
IDocumentMergeConflictTracker
;
private
updating
=
new
Map
<
vscode
.
TextEditor
,
boolean
>
();
constructor
(
private
context
:
vscode
.
ExtensionContext
,
trackerService
:
interfaces
.
IDocumentMergeConflictTrackerService
)
{
this
.
tracker
=
trackerService
.
createTracker
(
'
decorator
'
);
...
...
@@ -146,47 +147,54 @@ export default class MergeDectorator implements vscode.Disposable {
}
// If we have a pending scan from the same origin, exit early.
if
(
this
.
tracker
.
isPending
(
editor
.
document
))
{
if
(
this
.
updating
.
get
(
editor
))
{
return
;
}
let
conflicts
=
await
this
.
tracker
.
getConflicts
(
editor
.
document
);
try
{
this
.
updating
.
set
(
editor
,
true
);
if
(
conflicts
.
length
===
0
)
{
this
.
removeDecorations
(
editor
);
return
;
}
let
conflicts
=
await
this
.
tracker
.
getConflicts
(
editor
.
document
);
// 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
[]
}
=
{};
if
(
conflicts
.
length
===
0
)
{
this
.
removeDecorations
(
editor
);
return
;
}
let
pushDecoration
=
(
key
:
string
,
d
:
vscode
.
DecorationOptions
)
=>
{
matchDecorations
[
key
]
=
matchDecorations
[
key
]
||
[];
matchDecorations
[
key
].
push
(
d
);
};
// 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
[]
}
=
{};
conflicts
.
forEach
(
conflict
=>
{
// TODO, this could be more effective, just call getMatchPositions once with a map of decoration to position
pushDecoration
(
'
current.content
'
,
{
range
:
conflict
.
current
.
decoratorContent
}
);
pushDecoration
(
'
incoming.content
'
,
{
range
:
conflict
.
incoming
.
decoratorContent
})
;
let
pushDecoration
=
(
key
:
string
,
d
:
vscode
.
DecorationOptions
)
=>
{
matchDecorations
[
key
]
=
matchDecorations
[
key
]
||
[];
matchDecorations
[
key
].
push
(
d
);
}
;
if
(
this
.
config
.
enableDecorations
)
{
pushDecoration
(
'
current.header
'
,
{
range
:
conflict
.
current
.
header
});
pushDecoration
(
'
splitter
'
,
{
range
:
conflict
.
splitter
});
pushDecoration
(
'
incoming.header
'
,
{
range
:
conflict
.
incoming
.
header
});
}
});
conflicts
.
forEach
(
conflict
=>
{
// TODO, this could be more effective, just call getMatchPositions once with a map of decoration to position
pushDecoration
(
'
current.content
'
,
{
range
:
conflict
.
current
.
decoratorContent
});
pushDecoration
(
'
incoming.content
'
,
{
range
:
conflict
.
incoming
.
decoratorContent
});
// For each match we've generated, apply the generated decoration with the matching decoration type to the
// editor instance. Keys in both matches and decorations should match.
Object
.
keys
(
matchDecorations
).
forEach
(
decorationKey
=>
{
let
decorationType
=
this
.
decorations
[
decorationKey
];
if
(
this
.
config
.
enableDecorations
)
{
pushDecoration
(
'
current.header
'
,
{
range
:
conflict
.
current
.
header
});
pushDecoration
(
'
splitter
'
,
{
range
:
conflict
.
splitter
});
pushDecoration
(
'
incoming.header
'
,
{
range
:
conflict
.
incoming
.
header
});
}
});
if
(
decorationType
)
{
editor
.
setDecorations
(
decorationType
,
matchDecorations
[
decorationKey
]);
}
});
// For each match we've generated, apply the generated decoration with the matching decoration type to the
// editor instance. Keys in both matches and decorations should match.
Object
.
keys
(
matchDecorations
).
forEach
(
decorationKey
=>
{
let
decorationType
=
this
.
decorations
[
decorationKey
];
if
(
decorationType
)
{
editor
.
setDecorations
(
decorationType
,
matchDecorations
[
decorationKey
]);
}
});
}
finally
{
this
.
updating
.
delete
(
editor
);
}
}
private
removeDecorations
(
editor
:
vscode
.
TextEditor
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录