Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e5406b52
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,发现更多精彩内容 >>
提交
e5406b52
编写于
11月 19, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
introduce git.openDiffOnClick
fixes #63005
上级
eb6025ec
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
4 deletion
+38
-4
extensions/git/package.json
extensions/git/package.json
+23
-3
extensions/git/package.nls.json
extensions/git/package.nls.json
+1
-0
extensions/git/src/commands.ts
extensions/git/src/commands.ts
+14
-1
未找到文件。
extensions/git/package.json
浏览文件 @
e5406b52
...
...
@@ -815,7 +815,12 @@
},
{
"command"
:
"git.openFile2"
,
"when"
:
"scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction"
,
"when"
:
"scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && config.git.openDiffOnClick"
,
"group"
:
"inline0"
},
{
"command"
:
"git.openChange"
,
"when"
:
"scmProvider == git && scmResourceGroup == merge && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick"
,
"group"
:
"inline0"
},
{
...
...
@@ -845,7 +850,12 @@
},
{
"command"
:
"git.openFile2"
,
"when"
:
"scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction"
,
"when"
:
"scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && config.git.openDiffOnClick"
,
"group"
:
"inline0"
},
{
"command"
:
"git.openChange"
,
"when"
:
"scmProvider == git && scmResourceGroup == index && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick"
,
"group"
:
"inline0"
},
{
...
...
@@ -885,7 +895,12 @@
},
{
"command"
:
"git.openFile2"
,
"when"
:
"scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction"
,
"when"
:
"scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && config.git.openDiffOnClick"
,
"group"
:
"inline0"
},
{
"command"
:
"git.openChange"
,
"when"
:
"scmProvider == git && scmResourceGroup == workingTree && config.git.showInlineOpenFileAction && !config.git.openDiffOnClick"
,
"group"
:
"inline0"
},
{
...
...
@@ -1204,6 +1219,11 @@
"type"
:
"boolean"
,
"default"
:
true
,
"description"
:
"%config.confirmForcePush%"
},
"git.openDiffOnClick"
:
{
"type"
:
"boolean"
,
"default"
:
true
,
"description"
:
"%config.openDiffOnClick%"
}
}
},
...
...
extensions/git/package.nls.json
浏览文件 @
e5406b52
...
...
@@ -109,6 +109,7 @@
"config.allowForcePush"
:
"Controls whether force push (with or without lease) is enabled."
,
"config.useForcePushWithLease"
:
"Controls whether force pushing uses the safer force-with-lease variant."
,
"config.confirmForcePush"
:
"Controls whether to ask for confirmation before force-pushing."
,
"config.openDiffOnClick"
:
"Controls whether the diff editor should be opened when clicking a change. Otherwise the regular editor will be opened."
,
"colors.added"
:
"Color for added resources."
,
"colors.modified"
:
"Color for modified resources."
,
"colors.deleted"
:
"Color for deleted resources."
,
...
...
extensions/git/src/commands.ts
浏览文件 @
e5406b52
...
...
@@ -194,7 +194,20 @@ export class CommandCenter {
@
command
(
'
git.openResource
'
)
async
openResource
(
resource
:
Resource
):
Promise
<
void
>
{
await
this
.
_openResource
(
resource
,
undefined
,
true
,
false
);
const
repository
=
this
.
model
.
getRepository
(
resource
.
resourceUri
);
if
(
!
repository
)
{
return
;
}
const
config
=
workspace
.
getConfiguration
(
'
git
'
,
Uri
.
file
(
repository
.
root
));
const
openDiffOnClick
=
config
.
get
<
boolean
>
(
'
openDiffOnClick
'
);
if
(
openDiffOnClick
)
{
await
this
.
_openResource
(
resource
,
undefined
,
true
,
false
);
}
else
{
await
this
.
openFile
(
resource
);
}
}
private
async
_openResource
(
resource
:
Resource
,
preview
?:
boolean
,
preserveFocus
?:
boolean
,
preserveSelection
?:
boolean
):
Promise
<
void
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录