Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0a55dcfc
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,发现更多精彩内容 >>
未验证
提交
0a55dcfc
编写于
10月 16, 2019
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Show hint when the diff algorithm quits early
上级
3fc780dc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
2 deletion
+18
-2
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+3
-0
src/vs/editor/common/config/commonEditorConfig.ts
src/vs/editor/common/config/commonEditorConfig.ts
+1
-1
src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
.../workbench/contrib/codeEditor/browser/diffEditorHelper.ts
+14
-1
未找到文件。
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
0a55dcfc
...
...
@@ -632,6 +632,9 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
if
(
typeof
newOptions
.
maximumComputationTime
!==
'
undefined
'
)
{
this
.
_maximumComputationTime
=
newOptions
.
maximumComputationTime
;
if
(
this
.
_isVisible
)
{
this
.
_beginUpdateDecorationsSoon
();
}
}
let
beginUpdateDecorations
=
false
;
...
...
src/vs/editor/common/config/commonEditorConfig.ts
浏览文件 @
0a55dcfc
...
...
@@ -465,7 +465,7 @@ const editorConfiguration: IConfigurationNode = {
'
diffEditor.maximumComputationTime
'
:
{
type
:
'
number
'
,
default
:
5000
,
description
:
nls
.
localize
(
'
maximumComputationTime
'
,
"
Timeout in milliseconds after which diff computation is cancelled.
"
)
description
:
nls
.
localize
(
'
maximumComputationTime
'
,
"
Timeout in milliseconds after which diff computation is cancelled.
Use 0 for no timeout.
"
)
},
'
diffEditor.renderSideBySide
'
:
{
type
:
'
boolean
'
,
...
...
src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.ts
浏览文件 @
0a55dcfc
...
...
@@ -15,7 +15,8 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur
const
enum
WidgetState
{
Hidden
,
HintWhitespace
HintWhitespace
,
HintTimeout
}
class
DiffEditorHelperContribution
extends
Disposable
implements
IEditorContribution
{
...
...
@@ -47,6 +48,9 @@ class DiffEditorHelperContribution extends Disposable implements IEditorContribu
if
(
this
.
_diffEditor
.
ignoreTrimWhitespace
&&
diffComputationResult
.
changes
.
length
===
0
&&
!
diffComputationResult
.
identical
)
{
return
WidgetState
.
HintWhitespace
;
}
if
(
diffComputationResult
.
quitEarly
)
{
return
WidgetState
.
HintTimeout
;
}
return
WidgetState
.
Hidden
;
}
...
...
@@ -71,12 +75,21 @@ class DiffEditorHelperContribution extends Disposable implements IEditorContribu
this
.
_helperWidgetListener
=
this
.
_helperWidget
.
onClick
(()
=>
this
.
_onDidClickHelperWidget
());
this
.
_helperWidget
.
render
();
}
if
(
this
.
_state
===
WidgetState
.
HintTimeout
)
{
this
.
_helperWidget
=
this
.
_instantiationService
.
createInstance
(
FloatingClickWidget
,
this
.
_diffEditor
.
getModifiedEditor
(),
nls
.
localize
(
'
hintTimeout
'
,
"
Remove diff computation timeout
"
),
null
);
this
.
_helperWidgetListener
=
this
.
_helperWidget
.
onClick
(()
=>
this
.
_onDidClickHelperWidget
());
this
.
_helperWidget
.
render
();
}
}
private
_onDidClickHelperWidget
():
void
{
if
(
this
.
_state
===
WidgetState
.
HintWhitespace
)
{
this
.
_configurationService
.
updateValue
(
'
diffEditor.ignoreTrimWhitespace
'
,
false
,
ConfigurationTarget
.
USER
);
}
if
(
this
.
_state
===
WidgetState
.
HintTimeout
)
{
this
.
_configurationService
.
updateValue
(
'
diffEditor.maximumComputationTime
'
,
0
,
ConfigurationTarget
.
USER
);
}
}
dispose
():
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录