Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a0031aa6
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,发现更多精彩内容 >>
未验证
提交
a0031aa6
编写于
11月 09, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Small refactorings
上级
c73c0b30
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
18 deletion
+12
-18
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+12
-18
未找到文件。
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
a0031aa6
...
...
@@ -70,14 +70,6 @@ interface IEditorsZones {
modified
:
IMyViewZone
[];
}
interface
IDiffEditorWidgetStyle
{
getEditorsDiffDecorations
(
lineChanges
:
editorCommon
.
ILineChange
[],
ignoreTrimWhitespace
:
boolean
,
renderIndicators
:
boolean
,
originalWhitespaces
:
IEditorWhitespace
[],
modifiedWhitespaces
:
IEditorWhitespace
[],
originalEditor
:
editorBrowser
.
ICodeEditor
,
modifiedEditor
:
editorBrowser
.
ICodeEditor
):
IEditorsDiffDecorationsWithZones
;
setEnableSplitViewResizing
(
enableSplitViewResizing
:
boolean
):
void
;
applyColors
(
theme
:
IColorTheme
):
boolean
;
layout
():
number
;
dispose
():
void
;
}
class
VisualEditorState
{
private
_zones
:
string
[];
private
_inlineDiffMargins
:
InlineDiffMargin
[];
...
...
@@ -216,7 +208,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
private
_maxComputationTime
:
number
;
private
_renderIndicators
:
boolean
;
private
_enableSplitViewResizing
:
boolean
;
private
_strategy
!
:
I
DiffEditorWidgetStyle
;
private
_strategy
!
:
DiffEditorWidgetStyle
;
private
readonly
_updateDecorationsRunner
:
RunOnceScheduler
;
...
...
@@ -1082,7 +1074,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
const
foreignOriginal
=
this
.
_originalEditorState
.
getForeignViewZones
(
this
.
_originalEditor
.
getWhitespaces
());
const
foreignModified
=
this
.
_modifiedEditorState
.
getForeignViewZones
(
this
.
_modifiedEditor
.
getWhitespaces
());
const
diffDecorations
=
this
.
_strategy
.
getEditorsDiffDecorations
(
lineChanges
,
this
.
_ignoreTrimWhitespace
,
this
.
_renderIndicators
,
foreignOriginal
,
foreignModified
,
this
.
_originalEditor
,
this
.
_modifiedEditor
);
const
diffDecorations
=
this
.
_strategy
.
getEditorsDiffDecorations
(
lineChanges
,
this
.
_ignoreTrimWhitespace
,
this
.
_renderIndicators
,
foreignOriginal
,
foreignModified
);
try
{
this
.
_currentlyChangingViewZones
=
true
;
...
...
@@ -1232,7 +1224,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
};
}
private
_setStrategy
(
newStrategy
:
I
DiffEditorWidgetStyle
):
void
{
private
_setStrategy
(
newStrategy
:
DiffEditorWidgetStyle
):
void
{
if
(
this
.
_strategy
)
{
this
.
_strategy
.
dispose
();
}
...
...
@@ -1346,11 +1338,11 @@ interface IDataSource {
getContainerDomNode
():
HTMLElement
;
relayoutEditors
():
void
;
getOriginalEditor
():
editorBrowser
.
ICodeEditor
;
getModifiedEditor
():
editorBrowser
.
ICodeEditor
;
getOriginalEditor
():
CodeEditorWidget
;
getModifiedEditor
():
CodeEditorWidget
;
}
abstract
class
DiffEditorWidgetStyle
extends
Disposable
implements
IDiffEditorWidgetStyle
{
abstract
class
DiffEditorWidgetStyle
extends
Disposable
{
protected
_dataSource
:
IDataSource
;
protected
_insertColor
:
Color
|
null
;
...
...
@@ -1372,7 +1364,9 @@ abstract class DiffEditorWidgetStyle extends Disposable implements IDiffEditorWi
return
hasChanges
;
}
public
getEditorsDiffDecorations
(
lineChanges
:
editorCommon
.
ILineChange
[],
ignoreTrimWhitespace
:
boolean
,
renderIndicators
:
boolean
,
originalWhitespaces
:
IEditorWhitespace
[],
modifiedWhitespaces
:
IEditorWhitespace
[],
originalEditor
:
editorBrowser
.
ICodeEditor
,
modifiedEditor
:
editorBrowser
.
ICodeEditor
):
IEditorsDiffDecorationsWithZones
{
public
getEditorsDiffDecorations
(
lineChanges
:
editorCommon
.
ILineChange
[],
ignoreTrimWhitespace
:
boolean
,
renderIndicators
:
boolean
,
originalWhitespaces
:
IEditorWhitespace
[],
modifiedWhitespaces
:
IEditorWhitespace
[]):
IEditorsDiffDecorationsWithZones
{
const
originalEditor
=
this
.
_dataSource
.
getOriginalEditor
();
const
modifiedEditor
=
this
.
_dataSource
.
getModifiedEditor
();
// Get view zones
modifiedWhitespaces
=
modifiedWhitespaces
.
sort
((
a
,
b
)
=>
{
return
a
.
afterLineNumber
-
b
.
afterLineNumber
;
...
...
@@ -1702,7 +1696,7 @@ const DECORATIONS = {
};
class
DiffEditorWidgetSideBySide
extends
DiffEditorWidgetStyle
implements
I
DiffEditorWidgetStyle
,
I
VerticalSashLayoutProvider
{
class
DiffEditorWidgetSideBySide
extends
DiffEditorWidgetStyle
implements
IVerticalSashLayoutProvider
{
static
readonly
MINIMUM_EDITOR_WIDTH
=
100
;
...
...
@@ -1959,7 +1953,7 @@ class SideBySideViewZonesComputer extends ViewZonesComputer {
}
}
class
DiffEditorWidgetInline
extends
DiffEditorWidgetStyle
implements
IDiffEditorWidgetStyle
{
class
DiffEditorWidgetInline
extends
DiffEditorWidgetStyle
{
private
_decorationsLeft
:
number
;
...
...
@@ -1980,7 +1974,7 @@ class DiffEditorWidgetInline extends DiffEditorWidgetStyle implements IDiffEdito
// Nothing to do..
}
protected
_getViewZones
(
lineChanges
:
editorCommon
.
ILineChange
[],
originalForeignVZ
:
IEditorWhitespace
[],
modifiedForeignVZ
:
IEditorWhitespace
[],
originalEditor
:
editorBrowser
.
ICodeEditor
,
modifiedEditor
:
editorBrowser
.
ICodeEditor
,
renderIndicators
:
boolean
):
IEditorsZones
{
protected
_getViewZones
(
lineChanges
:
editorCommon
.
ILineChange
[],
originalForeignVZ
:
IEditorWhitespace
[],
modifiedForeignVZ
:
IEditorWhitespace
[],
originalEditor
:
CodeEditorWidget
,
modifiedEditor
:
CodeEditorWidget
,
renderIndicators
:
boolean
):
IEditorsZones
{
const
computer
=
new
InlineViewZonesComputer
(
lineChanges
,
originalForeignVZ
,
modifiedForeignVZ
,
originalEditor
,
modifiedEditor
,
renderIndicators
);
return
computer
.
getViewZones
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录