Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
bde23fb9
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bde23fb9
编写于
3月 06, 2018
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[HTML] server contains invalid implementation of applyEdit. Fixes #45014
上级
ddee1698
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
97 addition
and
18 deletion
+97
-18
extensions/html/server/src/test/utils.test.ts
extensions/html/server/src/test/utils.test.ts
+37
-0
extensions/html/server/src/utils/arrays.ts
extensions/html/server/src/utils/arrays.ts
+43
-1
extensions/html/server/src/utils/edits.ts
extensions/html/server/src/utils/edits.ts
+17
-17
未找到文件。
extensions/html/server/src/test/utils.test.ts
0 → 100644
浏览文件 @
bde23fb9
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
*
as
assert
from
'
assert
'
;
import
{
applyEdits
}
from
'
../utils/edits
'
;
import
{
TextDocument
,
TextEdit
,
Position
,
Range
}
from
'
vscode-languageserver-types
'
;
suite
(
'
Edits
'
,
()
=>
{
test
(
'
inserts
'
,
function
():
any
{
let
input
=
TextDocument
.
create
(
'
foo://bar/f
'
,
'
html
'
,
0
,
'
012345678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
insert
(
Position
.
create
(
0
,
0
),
'
Hello
'
)]),
'
Hello012345678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
insert
(
Position
.
create
(
0
,
1
),
'
Hello
'
)]),
'
0Hello12345678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
insert
(
Position
.
create
(
0
,
1
),
'
Hello
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
1
),
'
World
'
)]),
'
0HelloWorld12345678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
insert
(
Position
.
create
(
0
,
2
),
'
One
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
1
),
'
Hello
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
1
),
'
World
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
2
),
'
Two
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
2
),
'
Three
'
)]),
'
0HelloWorld1OneTwoThree2345678901234567890123456789
'
);
});
test
(
'
replace
'
,
function
():
any
{
let
input
=
TextDocument
.
create
(
'
foo://bar/f
'
,
'
html
'
,
0
,
'
012345678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
3
),
Position
.
create
(
0
,
6
)),
'
Hello
'
)]),
'
012Hello678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
3
),
Position
.
create
(
0
,
6
)),
'
Hello
'
),
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
6
),
Position
.
create
(
0
,
9
)),
'
World
'
)]),
'
012HelloWorld901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
3
),
Position
.
create
(
0
,
6
)),
'
Hello
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
6
),
'
World
'
)]),
'
012HelloWorld678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
insert
(
Position
.
create
(
0
,
6
),
'
World
'
),
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
3
),
Position
.
create
(
0
,
6
)),
'
Hello
'
)]),
'
012HelloWorld678901234567890123456789
'
);
assert
.
equal
(
applyEdits
(
input
,
[
TextEdit
.
insert
(
Position
.
create
(
0
,
3
),
'
World
'
),
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
3
),
Position
.
create
(
0
,
6
)),
'
Hello
'
)]),
'
012WorldHello678901234567890123456789
'
);
});
test
(
'
overlap
'
,
function
():
any
{
let
input
=
TextDocument
.
create
(
'
foo://bar/f
'
,
'
html
'
,
0
,
'
012345678901234567890123456789
'
);
assert
.
throws
(
_
=>
applyEdits
(
input
,
[
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
3
),
Position
.
create
(
0
,
6
)),
'
Hello
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
3
),
'
World
'
)]));
assert
.
throws
(
_
=>
applyEdits
(
input
,
[
TextEdit
.
replace
(
Range
.
create
(
Position
.
create
(
0
,
3
),
Position
.
create
(
0
,
6
)),
'
Hello
'
),
TextEdit
.
insert
(
Position
.
create
(
0
,
4
),
'
World
'
)]));
});
});
\ No newline at end of file
extensions/html/server/src/utils/arrays.ts
浏览文件 @
bde23fb9
...
...
@@ -15,3 +15,45 @@ export function pushAll<T>(to: T[], from: T[]) {
export
function
contains
<
T
>
(
arr
:
T
[],
val
:
T
)
{
return
arr
.
indexOf
(
val
)
!==
-
1
;
}
/**
* Like `Array#sort` but always stable. Usually runs a little slower `than Array#sort`
* so only use this when actually needing stable sort.
*/
export
function
mergeSort
<
T
>
(
data
:
T
[],
compare
:
(
a
:
T
,
b
:
T
)
=>
number
):
T
[]
{
_divideAndMerge
(
data
,
compare
);
return
data
;
}
function
_divideAndMerge
<
T
>
(
data
:
T
[],
compare
:
(
a
:
T
,
b
:
T
)
=>
number
):
void
{
if
(
data
.
length
<=
1
)
{
// sorted
return
;
}
const
p
=
(
data
.
length
/
2
)
|
0
;
const
left
=
data
.
slice
(
0
,
p
);
const
right
=
data
.
slice
(
p
);
_divideAndMerge
(
left
,
compare
);
_divideAndMerge
(
right
,
compare
);
let
leftIdx
=
0
;
let
rightIdx
=
0
;
let
i
=
0
;
while
(
leftIdx
<
left
.
length
&&
rightIdx
<
right
.
length
)
{
let
ret
=
compare
(
left
[
leftIdx
],
right
[
rightIdx
]);
if
(
ret
<=
0
)
{
// smaller_equal -> take left to preserve order
data
[
i
++
]
=
left
[
leftIdx
++
];
}
else
{
// greater -> take right
data
[
i
++
]
=
right
[
rightIdx
++
];
}
}
while
(
leftIdx
<
left
.
length
)
{
data
[
i
++
]
=
left
[
leftIdx
++
];
}
while
(
rightIdx
<
right
.
length
)
{
data
[
i
++
]
=
right
[
rightIdx
++
];
}
}
extensions/html/server/src/utils/edits.ts
浏览文件 @
bde23fb9
...
...
@@ -4,29 +4,29 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
TextDocument
,
TextEdit
,
Position
}
from
'
vscode-languageserver-types
'
;
import
{
TextDocument
,
TextEdit
}
from
'
vscode-languageserver-types
'
;
import
{
mergeSort
}
from
'
./arrays
'
;
export
function
applyEdits
(
document
:
TextDocument
,
edits
:
TextEdit
[]):
string
{
let
text
=
document
.
getText
();
let
sortedEdits
=
edits
.
sort
(
(
a
,
b
)
=>
{
let
startDiff
=
comparePositions
(
a
.
range
.
start
,
b
.
range
.
start
)
;
if
(
startD
iff
===
0
)
{
return
comparePositions
(
a
.
range
.
end
,
b
.
range
.
end
)
;
let
sortedEdits
=
mergeSort
(
edits
,
(
a
,
b
)
=>
{
let
diff
=
a
.
range
.
start
.
line
-
b
.
range
.
start
.
line
;
if
(
d
iff
===
0
)
{
return
a
.
range
.
start
.
character
-
b
.
range
.
start
.
character
;
}
return
startDiff
;
return
0
;
});
sortedEdits
.
forEach
(
e
=>
{
let
lastModifiedOffset
=
text
.
length
;
for
(
let
i
=
sortedEdits
.
length
-
1
;
i
>=
0
;
i
--
)
{
let
e
=
sortedEdits
[
i
];
let
startOffset
=
document
.
offsetAt
(
e
.
range
.
start
);
let
endOffset
=
document
.
offsetAt
(
e
.
range
.
end
);
if
(
endOffset
<=
lastModifiedOffset
)
{
text
=
text
.
substring
(
0
,
startOffset
)
+
e
.
newText
+
text
.
substring
(
endOffset
,
text
.
length
);
});
return
text
;
}
function
comparePositions
(
p1
:
Position
,
p2
:
Position
)
{
let
diff
=
p2
.
line
-
p1
.
line
;
if
(
diff
===
0
)
{
return
p2
.
character
-
p1
.
character
;
}
else
{
throw
new
Error
(
'
Ovelapping edit
'
);
}
return
diff
;
lastModifiedOffset
=
startOffset
;
}
return
text
;
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录