Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d9c9e8dd
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,发现更多精彩内容 >>
提交
d9c9e8dd
编写于
12月 18, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #18353: Always respect the `shouldIgnoreTrimWhitespace` flag
上级
14057a64
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
0 addition
and
27 deletion
+0
-27
src/vs/editor/common/diff/diffComputer.ts
src/vs/editor/common/diff/diffComputer.ts
+0
-24
src/vs/editor/common/services/editorSimpleWorker.ts
src/vs/editor/common/services/editorSimpleWorker.ts
+0
-2
src/vs/editor/test/common/diff/diffComputer.test.ts
src/vs/editor/test/common/diff/diffComputer.test.ts
+0
-1
未找到文件。
src/vs/editor/common/diff/diffComputer.ts
浏览文件 @
d9c9e8dd
...
...
@@ -34,24 +34,6 @@ class MarkerSequence implements ISequence {
this
.
endMarkers
=
endMarkers
;
}
public
equals
(
other
:
any
):
boolean
{
if
(
!
(
other
instanceof
MarkerSequence
))
{
return
false
;
}
const
otherMarkerSequence
=
<
MarkerSequence
>
other
;
if
(
this
.
getLength
()
!==
otherMarkerSequence
.
getLength
())
{
return
false
;
}
for
(
let
i
=
0
,
len
=
this
.
getLength
();
i
<
len
;
i
++
)
{
const
myElement
=
this
.
getElementHash
(
i
);
const
otherElement
=
otherMarkerSequence
.
getElementHash
(
i
);
if
(
myElement
!==
otherElement
)
{
return
false
;
}
}
return
true
;
}
public
getLength
():
number
{
return
this
.
startMarkers
.
length
;
}
...
...
@@ -321,7 +303,6 @@ class LineChange implements ILineChange {
export
interface
IDiffComputerOpts
{
shouldPostProcessCharChanges
:
boolean
;
shouldIgnoreTrimWhitespace
:
boolean
;
shouldConsiderTrimWhitespaceInEmptyCase
:
boolean
;
shouldMakePrettyDiff
:
boolean
;
}
...
...
@@ -347,11 +328,6 @@ export class DiffComputer {
this
.
modifiedLines
=
modifiedLines
;
this
.
original
=
new
LineMarkerSequence
(
originalLines
);
this
.
modified
=
new
LineMarkerSequence
(
modifiedLines
);
if
(
opts
.
shouldConsiderTrimWhitespaceInEmptyCase
&&
this
.
shouldIgnoreTrimWhitespace
&&
this
.
original
.
equals
(
this
.
modified
))
{
// Diff would be empty with `shouldIgnoreTrimWhitespace`
this
.
shouldIgnoreTrimWhitespace
=
false
;
}
}
public
computeDiff
():
ILineChange
[]
{
...
...
src/vs/editor/common/services/editorSimpleWorker.ts
浏览文件 @
d9c9e8dd
...
...
@@ -313,7 +313,6 @@ export abstract class BaseEditorSimpleWorker {
let
diffComputer
=
new
DiffComputer
(
originalLines
,
modifiedLines
,
{
shouldPostProcessCharChanges
:
true
,
shouldIgnoreTrimWhitespace
:
ignoreTrimWhitespace
,
shouldConsiderTrimWhitespaceInEmptyCase
:
true
,
shouldMakePrettyDiff
:
true
});
return
TPromise
.
as
(
diffComputer
.
computeDiff
());
...
...
@@ -331,7 +330,6 @@ export abstract class BaseEditorSimpleWorker {
let
diffComputer
=
new
DiffComputer
(
originalLines
,
modifiedLines
,
{
shouldPostProcessCharChanges
:
false
,
shouldIgnoreTrimWhitespace
:
ignoreTrimWhitespace
,
shouldConsiderTrimWhitespaceInEmptyCase
:
false
,
shouldMakePrettyDiff
:
true
});
return
TPromise
.
as
(
diffComputer
.
computeDiff
());
...
...
src/vs/editor/test/common/diff/diffComputer.test.ts
浏览文件 @
d9c9e8dd
...
...
@@ -55,7 +55,6 @@ function assertDiff(originalLines: string[], modifiedLines: string[], expectedCh
var
diffComputer
=
new
DiffComputer
(
originalLines
,
modifiedLines
,
{
shouldPostProcessCharChanges
:
shouldPostProcessCharChanges
||
false
,
shouldIgnoreTrimWhitespace
:
shouldIgnoreTrimWhitespace
||
false
,
shouldConsiderTrimWhitespaceInEmptyCase
:
true
,
shouldMakePrettyDiff
:
true
});
var
changes
=
diffComputer
.
computeDiff
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录