Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c3fe962b
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,发现更多精彩内容 >>
提交
c3fe962b
编写于
5月 24, 2019
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Open the diff view in current editor, to the side or below.
上级
93944674
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
8 deletion
+13
-8
extensions/merge-conflict/package.json
extensions/merge-conflict/package.json
+9
-4
extensions/merge-conflict/package.nls.json
extensions/merge-conflict/package.nls.json
+1
-1
extensions/merge-conflict/src/commandHandler.ts
extensions/merge-conflict/src/commandHandler.ts
+3
-3
未找到文件。
extensions/merge-conflict/package.json
浏览文件 @
c3fe962b
...
...
@@ -115,10 +115,15 @@
"description"
:
"%config.autoNavigateNextConflictEnabled%"
,
"default"
:
false
},
"merge-conflict.openDiffInNewEditor"
:
{
"type"
:
"boolean"
,
"description"
:
"%config.openDiffInNewEditor%"
,
"default"
:
false
"merge-conflict.diffViewPosition"
:
{
"type"
:
"string"
,
"enum"
:
[
"Current"
,
"Beside"
,
"Below"
],
"description"
:
"%config.diffViewPosition%"
,
"default"
:
"Current"
}
}
}
...
...
extensions/merge-conflict/package.nls.json
浏览文件 @
c3fe962b
...
...
@@ -16,5 +16,5 @@
"config.autoNavigateNextConflictEnabled"
:
"Whether to automatically navigate to the next merge conflict after resolving a merge conflict."
,
"config.codeLensEnabled"
:
"Create a Code Lens for merge conflict blocks within editor."
,
"config.decoratorsEnabled"
:
"Create decorators for merge conflict blocks within editor."
,
"config.
openDiffInNewEditor"
:
"Controls if the diff view should be opened in a new editor group
when comparing changes in merge conflicts."
"config.
diffViewPosition"
:
"Controls where the diff view should be opened
when comparing changes in merge conflicts."
}
\ No newline at end of file
extensions/merge-conflict/src/commandHandler.ts
浏览文件 @
c3fe962b
...
...
@@ -125,13 +125,13 @@ export default class CommandHandler implements vscode.Disposable {
const
title
=
localize
(
'
compareChangesTitle
'
,
'
{0}: Current Changes ⟷ Incoming Changes
'
,
fileName
);
const
mergeConflictConfig
=
vscode
.
workspace
.
getConfiguration
(
'
merge-conflict
'
);
const
openToTheSide
=
mergeConflictConfig
.
get
<
boolean
>
(
'
openDiffInNewEditor
'
);
const
openToTheSide
=
mergeConflictConfig
.
get
<
string
>
(
'
diffViewPosition
'
);
const
opts
:
vscode
.
TextDocumentShowOptions
=
{
viewColumn
:
vscode
.
ViewColumn
.
Active
,
viewColumn
:
openToTheSide
===
'
Beside
'
?
vscode
.
ViewColumn
.
Beside
:
vscode
.
ViewColumn
.
Active
,
selection
};
if
(
openToTheSide
)
{
if
(
openToTheSide
===
'
Below
'
)
{
await
vscode
.
commands
.
executeCommand
(
'
workbench.action.newGroupBelow
'
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录