Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
be5e8d57
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,发现更多精彩内容 >>
提交
be5e8d57
编写于
9月 26, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #12122: Use Object.prototype.hasOwnProperty when building up the diff hash table
上级
db88c318
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
2 deletion
+13
-2
src/vs/base/common/diff/diff.ts
src/vs/base/common/diff/diff.ts
+4
-2
src/vs/editor/test/common/diff/diffComputer.test.ts
src/vs/editor/test/common/diff/diffComputer.test.ts
+9
-0
未找到文件。
src/vs/base/common/diff/diff.ts
浏览文件 @
be5e8d57
...
...
@@ -211,6 +211,8 @@ class DiffChangeHelper {
}
const
hasOwnProperty
=
Object
.
prototype
.
hasOwnProperty
;
/**
* An implementation of the difference algorithm described in
* "An O(ND) Difference Algorithm and its letiations" by Eugene W. Myers
...
...
@@ -257,7 +259,7 @@ export class LcsDiff {
// Fill up the hash table for unique elements
for
(
i
=
0
;
i
<
originalSequenceLength
;
i
++
)
{
let
originalElementHash
=
this
.
OriginalSequence
.
getElementHash
(
i
);
if
(
!
has
hTable
.
hasOwnProperty
(
originalElementHash
))
{
if
(
!
has
OwnProperty
.
call
(
hashTable
,
originalElementHash
))
{
// No entry in the hashtable so this is a new unique element.
// Assign the element a new unique identifier and add it to the
// hash table
...
...
@@ -271,7 +273,7 @@ export class LcsDiff {
// Now match up modified elements
for
(
i
=
0
;
i
<
modifiedSequenceLength
;
i
++
)
{
let
modifiedElementHash
=
this
.
ModifiedSequence
.
getElementHash
(
i
);
if
(
!
has
hTable
.
hasOwnProperty
(
modifiedElementHash
))
{
if
(
!
has
OwnProperty
.
call
(
hashTable
,
modifiedElementHash
))
{
this
.
m_modifiedIds
[
i
]
=
currentUniqueId
++
;
hashTable
[
modifiedElementHash
]
=
this
.
m_modifiedIds
[
i
];
}
else
{
...
...
src/vs/editor/test/common/diff/diffComputer.test.ts
浏览文件 @
be5e8d57
...
...
@@ -394,4 +394,13 @@ suite('Editor Diff - DiffComputer', () => {
];
assertDiff
(
original
,
modified
,
expected
,
false
,
true
);
});
test
(
'
issue #12122 r.hasOwnProperty is not a function
'
,
()
=>
{
var
original
=
[
'
hasOwnProperty
'
];
var
modified
=
[
'
hasOwnProperty
'
,
'
and another line
'
];
var
expected
=
[
createLineInsertion
(
2
,
2
,
1
)
];
assertDiff
(
original
,
modified
,
expected
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录