Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1b2ae42e
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,发现更多精彩内容 >>
提交
1b2ae42e
编写于
1月 13, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #1580: sync eol change to extension host documents
上级
2de43b85
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
71 addition
and
1 deletion
+71
-1
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+4
-0
src/vs/editor/common/model/mirrorModel2.ts
src/vs/editor/common/model/mirrorModel2.ts
+12
-0
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+1
-0
src/vs/editor/test/common/model/editableTextModel.test.ts
src/vs/editor/test/common/model/editableTextModel.test.ts
+29
-0
src/vs/workbench/test/common/api/extHostDocuments.test.ts
src/vs/workbench/test/common/api/extHostDocuments.test.ts
+25
-1
未找到文件。
src/vs/editor/common/editorCommon.ts
浏览文件 @
1b2ae42e
...
...
@@ -1859,6 +1859,10 @@ export interface IModelContentChangedEvent2 {
* The new text for the range.
*/
text
:
string
;
/**
* The end-of-line character.
*/
eol
:
string
;
/**
* The new version id the model has transitioned to.
*/
...
...
src/vs/editor/common/model/mirrorModel2.ts
浏览文件 @
1b2ae42e
...
...
@@ -36,6 +36,18 @@ export class MirrorModel2 {
}
onEvents
(
events
:
IModelContentChangedEvent2
[]):
void
{
let
newEOL
:
string
=
null
;
for
(
let
i
=
0
,
len
=
events
.
length
;
i
<
len
;
i
++
)
{
let
e
=
events
[
i
];
if
(
e
.
eol
)
{
newEOL
=
e
.
eol
;
}
}
if
(
newEOL
&&
newEOL
!==
this
.
_eol
)
{
this
.
_eol
=
newEOL
;
this
.
_lineStarts
=
null
;
}
// Update my lines
let
lastVersionId
=
-
1
;
for
(
let
i
=
0
,
len
=
events
.
length
;
i
<
len
;
i
++
)
{
...
...
src/vs/editor/common/model/textModel.ts
浏览文件 @
1b2ae42e
...
...
@@ -124,6 +124,7 @@ export class TextModel extends OrderGuaranteeEventEmitter implements EditorCommo
range
:
new
Range
(
startLineNumber
,
startColumn
,
endLineNumber
,
endColumn
),
rangeLength
:
rangeLength
,
text
:
text
,
eol
:
this
.
_EOL
,
versionId
:
this
.
getVersionId
(),
isUndoing
:
isUndoing
,
isRedoing
:
isRedoing
...
...
src/vs/editor/test/common/model/editableTextModel.test.ts
浏览文件 @
1b2ae42e
...
...
@@ -1284,6 +1284,35 @@ suite('EditorModel - EditableTextModel.applyEdits', () => {
});
});
});
test
(
'
issue #1580: Changes in line endings are not correctly reflected in the extension host, leading to invalid offsets sent to external refactoring tools
'
,
()
=>
{
let
model
=
new
EditableTextModel
([],
TextModel
.
toRawText
(
'
Hello
\n
World!
'
),
null
);
assert
.
equal
(
model
.
getEOL
(),
'
\n
'
);
let
mirrorModel2
=
new
MirrorModel2
(
null
,
model
.
toRawText
().
lines
,
model
.
toRawText
().
EOL
,
model
.
getVersionId
());
let
mirrorModel2PrevVersionId
=
model
.
getVersionId
();
model
.
addListener
(
EditorCommon
.
EventType
.
ModelContentChanged2
,
(
e
:
EditorCommon
.
IModelContentChangedEvent2
)
=>
{
let
versionId
=
e
.
versionId
;
if
(
versionId
<
mirrorModel2PrevVersionId
)
{
console
.
warn
(
'
Model version id did not advance between edits (2)
'
);
}
mirrorModel2PrevVersionId
=
versionId
;
mirrorModel2
.
onEvents
([
e
]);
});
let
assertMirrorModels
=
()
=>
{
model
.
_assertLineNumbersOK
();
assert
.
equal
(
mirrorModel2
.
getText
(),
model
.
getValue
(),
'
mirror model 2 text OK
'
);
assert
.
equal
(
mirrorModel2
.
version
,
model
.
getVersionId
(),
'
mirror model 2 version OK
'
);
};
model
.
setEOL
(
EditorCommon
.
EndOfLineSequence
.
CRLF
);
assertMirrorModels
();
model
.
dispose
();
mirrorModel2
.
dispose
();
});
});
interface
ILightWeightMarker
{
...
...
src/vs/workbench/test/common/api/extHostDocuments.test.ts
浏览文件 @
1b2ae42e
...
...
@@ -69,6 +69,7 @@ suite("PluginHostDocument", () => {
data
.
onEvents
([{
range
:
{
startLineNumber
:
1
,
startColumn
:
1
,
endLineNumber
:
1
,
endColumn
:
1
},
text
:
'
\t
'
,
eol
:
undefined
,
isRedoing
:
undefined
,
isUndoing
:
undefined
,
versionId
:
undefined
,
...
...
@@ -105,6 +106,7 @@ suite("PluginHostDocument", () => {
data
.
onEvents
([{
range
:
{
startLineNumber
:
1
,
startColumn
:
3
,
endLineNumber
:
1
,
endColumn
:
6
},
text
:
''
,
eol
:
undefined
,
isRedoing
:
undefined
,
isUndoing
:
undefined
,
versionId
:
undefined
,
...
...
@@ -121,6 +123,7 @@ suite("PluginHostDocument", () => {
data
.
onEvents
([{
range
:
{
startLineNumber
:
1
,
startColumn
:
3
,
endLineNumber
:
1
,
endColumn
:
6
},
text
:
'
is could be
'
,
eol
:
undefined
,
isRedoing
:
undefined
,
isUndoing
:
undefined
,
versionId
:
undefined
,
...
...
@@ -137,6 +140,7 @@ suite("PluginHostDocument", () => {
data
.
onEvents
([{
range
:
{
startLineNumber
:
1
,
startColumn
:
3
,
endLineNumber
:
1
,
endColumn
:
6
},
text
:
'
is could be
\n
a line with number
'
,
eol
:
undefined
,
isRedoing
:
undefined
,
isUndoing
:
undefined
,
versionId
:
undefined
,
...
...
@@ -156,6 +160,7 @@ suite("PluginHostDocument", () => {
data
.
onEvents
([{
range
:
{
startLineNumber
:
1
,
startColumn
:
3
,
endLineNumber
:
2
,
endColumn
:
6
},
text
:
''
,
eol
:
undefined
,
isRedoing
:
undefined
,
isUndoing
:
undefined
,
versionId
:
undefined
,
...
...
@@ -222,10 +227,11 @@ suite("PluginHostDocument updates line mapping", () => {
}
}
function
createChangeEvent
(
range
:
CodeEditorRange
,
text
:
string
):
EditorCommon
.
IModelContentChangedEvent2
{
function
createChangeEvent
(
range
:
CodeEditorRange
,
text
:
string
,
eol
?:
string
):
EditorCommon
.
IModelContentChangedEvent2
{
return
{
range
:
range
,
text
:
text
,
eol
:
eol
,
isRedoing
:
undefined
,
isUndoing
:
undefined
,
versionId
:
undefined
,
...
...
@@ -329,4 +335,22 @@ suite("PluginHostDocument updates line mapping", () => {
'
and finished with the fourth.
'
,
],
[
createChangeEvent
(
new
CodeEditorRange
(
1
,
3
,
4
,
30
),
'
some new text
\n
that
\n
spans multiple lines
'
)]);
});
test
(
'
after changing EOL to CRLF
'
,
()
=>
{
testLineMappingAfterEvents
([
'
This is line one
'
,
'
and this is line number two
'
,
'
it is followed by #3
'
,
'
and finished with the fourth.
'
,
],
[
createChangeEvent
(
new
CodeEditorRange
(
1
,
1
,
1
,
1
),
''
,
'
\r\n
'
)]);
});
test
(
'
after changing EOL to LF
'
,
()
=>
{
testLineMappingAfterEvents
([
'
This is line one
'
,
'
and this is line number two
'
,
'
it is followed by #3
'
,
'
and finished with the fourth.
'
,
],
[
createChangeEvent
(
new
CodeEditorRange
(
1
,
1
,
1
,
1
),
''
,
'
\n
'
)]);
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录