Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
005c78db
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,发现更多精彩内容 >>
提交
005c78db
编写于
5月 31, 2017
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Title case (fixes #27569)
上级
6aa3aca8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
15 deletion
+15
-15
extensions/merge-conflict/package.nls.json
extensions/merge-conflict/package.nls.json
+8
-8
extensions/merge-conflict/src/codelensProvider.ts
extensions/merge-conflict/src/codelensProvider.ts
+4
-4
extensions/merge-conflict/src/commandHandler.ts
extensions/merge-conflict/src/commandHandler.ts
+1
-1
extensions/merge-conflict/src/mergeDecorator.ts
extensions/merge-conflict/src/mergeDecorator.ts
+2
-2
未找到文件。
extensions/merge-conflict/package.nls.json
浏览文件 @
005c78db
{
"command.category"
:
"Merge Conflict"
,
"command.accept.all-incoming"
:
"Accept
all i
ncoming"
,
"command.accept.all-both"
:
"Accept
all b
oth"
,
"command.accept.current"
:
"Accept
c
urrent"
,
"command.accept.incoming"
:
"Accept
i
ncoming"
,
"command.accept.selection"
:
"Accept
s
election"
,
"command.accept.all-incoming"
:
"Accept
All I
ncoming"
,
"command.accept.all-both"
:
"Accept
All B
oth"
,
"command.accept.current"
:
"Accept
C
urrent"
,
"command.accept.incoming"
:
"Accept
I
ncoming"
,
"command.accept.selection"
:
"Accept
S
election"
,
"command.accept.both"
:
"Accept Both"
,
"command.next"
:
"Next
c
onflict"
,
"command.previous"
:
"Previous
c
onflict"
,
"command.compare"
:
"Compare
current c
onflict"
,
"command.next"
:
"Next
C
onflict"
,
"command.previous"
:
"Previous
C
onflict"
,
"command.compare"
:
"Compare
Current C
onflict"
,
"config.title"
:
"Merge Conflict"
,
"config.codeLensEnabled"
:
"Enable/disable merge conflict block CodeLens within editor"
,
"config.decoratorsEnabled"
:
"Enable/disable merge conflict decorators within editor"
...
...
extensions/merge-conflict/src/codelensProvider.ts
浏览文件 @
005c78db
...
...
@@ -63,25 +63,25 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
conflicts
.
forEach
(
conflict
=>
{
let
acceptCurrentCommand
:
vscode
.
Command
=
{
command
:
'
merge-conflict.accept.current
'
,
title
:
localize
(
'
acceptCurrentChange
'
,
'
Accept
current c
hange
'
),
title
:
localize
(
'
acceptCurrentChange
'
,
'
Accept
Current C
hange
'
),
arguments
:
[
'
known-conflict
'
,
conflict
]
};
let
acceptIncomingCommand
:
vscode
.
Command
=
{
command
:
'
merge-conflict.accept.incoming
'
,
title
:
localize
(
'
acceptIncomingChange
'
,
'
Accept
incoming c
hange
'
),
title
:
localize
(
'
acceptIncomingChange
'
,
'
Accept
Incoming C
hange
'
),
arguments
:
[
'
known-conflict
'
,
conflict
]
};
let
acceptBothCommand
:
vscode
.
Command
=
{
command
:
'
merge-conflict.accept.both
'
,
title
:
localize
(
'
acceptBothChanges
'
,
'
Accept
both c
hanges
'
),
title
:
localize
(
'
acceptBothChanges
'
,
'
Accept
Both C
hanges
'
),
arguments
:
[
'
known-conflict
'
,
conflict
]
};
let
diffCommand
:
vscode
.
Command
=
{
command
:
'
merge-conflict.compare
'
,
title
:
localize
(
'
compareChanges
'
,
'
Compare
c
hanges
'
),
title
:
localize
(
'
compareChanges
'
,
'
Compare
C
hanges
'
),
arguments
:
[
conflict
]
};
...
...
extensions/merge-conflict/src/commandHandler.ts
浏览文件 @
005c78db
...
...
@@ -90,7 +90,7 @@ export default class CommandHandler implements vscode.Disposable {
range
=
conflict
.
incoming
.
content
;
const
rightUri
=
leftUri
.
with
({
query
:
JSON
.
stringify
(
range
)
});
const
title
=
localize
(
'
compareChangesTitle
'
,
'
{0}: Current
changes ⟷ Incoming c
hanges
'
,
fileName
);
const
title
=
localize
(
'
compareChangesTitle
'
,
'
{0}: Current
Changes ⟷ Incoming C
hanges
'
,
fileName
);
vscode
.
commands
.
executeCommand
(
'
vscode.diff
'
,
leftUri
,
rightUri
,
title
);
}
...
...
extensions/merge-conflict/src/mergeDecorator.ts
浏览文件 @
005c78db
...
...
@@ -80,7 +80,7 @@ export default class MergeDectorator implements vscode.Disposable {
backgroundColor
:
new
vscode
.
ThemeColor
(
'
merge.currentHeaderBackground
'
),
color
:
new
vscode
.
ThemeColor
(
'
editor.foreground
'
),
after
:
{
contentText
:
'
'
+
localize
(
'
currentChange
'
,
'
(Current
c
hange)
'
),
contentText
:
'
'
+
localize
(
'
currentChange
'
,
'
(Current
C
hange)
'
),
color
:
new
vscode
.
ThemeColor
(
'
descriptionForeground
'
)
}
});
...
...
@@ -95,7 +95,7 @@ export default class MergeDectorator implements vscode.Disposable {
color
:
new
vscode
.
ThemeColor
(
'
editor.foreground
'
),
isWholeLine
:
this
.
decorationUsesWholeLine
,
after
:
{
contentText
:
'
'
+
localize
(
'
incomingChange
'
,
'
(Incoming
c
hange)
'
),
contentText
:
'
'
+
localize
(
'
incomingChange
'
,
'
(Incoming
C
hange)
'
),
color
:
new
vscode
.
ThemeColor
(
'
descriptionForeground
'
)
}
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录