Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d516c32e
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,发现更多精彩内容 >>
提交
d516c32e
编写于
5月 23, 2017
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Build requires second argument to localize to be a string literal
上级
2513c1b0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
14 deletion
+7
-14
extensions/merge-conflict/src/commandHandler.ts
extensions/merge-conflict/src/commandHandler.ts
+7
-14
未找到文件。
extensions/merge-conflict/src/commandHandler.ts
浏览文件 @
d516c32e
...
...
@@ -9,13 +9,6 @@ import * as path from 'path';
import
{
loadMessageBundle
}
from
'
vscode-nls
'
;
const
localize
=
loadMessageBundle
();
const
messages
=
{
cursorNotInConflict
:
'
Editor cursor is not within a merge conflict
'
,
cursorOnSplitterRange
:
'
Editor cursor is within the merge conflict splitter, please move it to either the "current" or "incoming" block
'
,
noConflicts
:
'
No merge conflicts found in this file
'
,
noOtherConflictsInThisFile
:
'
No other merge conflicts within this file
'
};
interface
IDocumentMergeConflictNavigationResults
{
canNavigate
:
boolean
;
conflict
?:
interfaces
.
IDocumentMergeConflict
;
...
...
@@ -83,7 +76,7 @@ export default class CommandHandler implements vscode.Disposable {
// Still failed to find conflict, warn the user and exit
if
(
!
conflict
)
{
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorNotInConflict
'
,
messages
.
cursorNotInConflict
));
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorNotInConflict
'
,
'
Editor cursor is not within a merge conflict
'
));
return
;
}
}
...
...
@@ -113,7 +106,7 @@ export default class CommandHandler implements vscode.Disposable {
let
conflict
=
await
this
.
findConflictContainingSelection
(
editor
);
if
(
!
conflict
)
{
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorNotInConflict
'
,
messages
.
cursorNotInConflict
));
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorNotInConflict
'
,
'
Editor cursor is not within a merge conflict
'
));
return
;
}
...
...
@@ -131,7 +124,7 @@ export default class CommandHandler implements vscode.Disposable {
typeToAccept
=
interfaces
.
CommitType
.
Incoming
;
}
else
{
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorOnSplitterRange
'
,
messages
.
cursorOnSplitterRange
));
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorOnSplitterRange
'
,
'
Editor cursor is within the merge conflict splitter, please move it to either the "current" or "incoming" block
'
));
return
;
}
...
...
@@ -148,11 +141,11 @@ export default class CommandHandler implements vscode.Disposable {
let
navigationResult
=
await
this
.
findConflictForNavigation
(
editor
,
direction
);
if
(
!
navigationResult
)
{
vscode
.
window
.
showWarningMessage
(
localize
(
'
noConflicts
'
,
messages
.
noConflicts
));
vscode
.
window
.
showWarningMessage
(
localize
(
'
noConflicts
'
,
'
No merge conflicts found in this file
'
));
return
;
}
else
if
(
!
navigationResult
.
canNavigate
)
{
vscode
.
window
.
showWarningMessage
(
localize
(
'
noOtherConflictsInThisFile
'
,
messages
.
noOtherConflictsInThisFile
));
vscode
.
window
.
showWarningMessage
(
localize
(
'
noOtherConflictsInThisFile
'
,
'
No other merge conflicts within this file
'
));
return
;
}
else
if
(
!
navigationResult
.
conflict
)
{
...
...
@@ -179,7 +172,7 @@ export default class CommandHandler implements vscode.Disposable {
}
if
(
!
conflict
)
{
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorNotInConflict
'
,
messages
.
cursorNotInConflict
));
vscode
.
window
.
showWarningMessage
(
localize
(
'
cursorNotInConflict
'
,
'
Editor cursor is not within a merge conflict
'
));
return
;
}
...
...
@@ -192,7 +185,7 @@ export default class CommandHandler implements vscode.Disposable {
let
conflicts
=
await
this
.
tracker
.
getConflicts
(
editor
.
document
);
if
(
!
conflicts
||
conflicts
.
length
===
0
)
{
vscode
.
window
.
showWarningMessage
(
localize
(
'
noConflicts
'
,
messages
.
noConflicts
));
vscode
.
window
.
showWarningMessage
(
localize
(
'
noConflicts
'
,
'
No merge conflicts found in this file
'
));
return
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录