Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
52e9e02e
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,发现更多精彩内容 >>
未验证
提交
52e9e02e
编写于
11月 12, 2020
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #110141: Do not push undo stack elements for a no-op EOL change
上级
549da12a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
70 addition
and
4 deletion
+70
-4
extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
...vscode-api-tests/src/singlefolder-tests/workspace.test.ts
+34
-0
src/vs/editor/common/model.ts
src/vs/editor/common/model.ts
+5
-0
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+9
-0
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+4
-0
src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
+18
-4
未找到文件。
extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
浏览文件 @
52e9e02e
...
...
@@ -1014,4 +1014,38 @@ suite('vscode API - workspace', () => {
}
});
test
(
'
issue #110141 - TextEdit.setEndOfLine applies an edit and invalidates redo stack even when no change is made
'
,
async
()
=>
{
const
file
=
await
createRandomFile
(
'
hello
\n
world
'
);
const
document
=
await
vscode
.
workspace
.
openTextDocument
(
file
);
await
vscode
.
window
.
showTextDocument
(
document
);
// apply edit
{
const
we
=
new
vscode
.
WorkspaceEdit
();
we
.
insert
(
file
,
new
vscode
.
Position
(
0
,
5
),
'
2
'
);
await
vscode
.
workspace
.
applyEdit
(
we
);
}
// check the document
{
assert
.
equal
(
document
.
getText
(),
'
hello2
\n
world
'
);
assert
.
equal
(
document
.
isDirty
,
true
);
}
// apply no-op edit
{
const
we
=
new
vscode
.
WorkspaceEdit
();
we
.
set
(
file
,
[
vscode
.
TextEdit
.
setEndOfLine
(
vscode
.
EndOfLine
.
LF
)]);
await
vscode
.
workspace
.
applyEdit
(
we
);
}
// undo
{
await
vscode
.
commands
.
executeCommand
(
'
undo
'
);
assert
.
equal
(
document
.
getText
(),
'
hello
\n
world
'
);
assert
.
equal
(
document
.
isDirty
,
false
);
}
});
});
src/vs/editor/common/model.ts
浏览文件 @
52e9e02e
...
...
@@ -695,6 +695,11 @@ export interface ITextModel {
*/
getEOL
():
string
;
/**
* Get the end of line sequence predominantly used in the text buffer.
*/
getEndOfLineSequence
():
EndOfLineSequence
;
/**
* Get the minimum legal column for line at `lineNumber`
*/
...
...
src/vs/editor/common/model/textModel.ts
浏览文件 @
52e9e02e
...
...
@@ -830,6 +830,15 @@ export class TextModel extends Disposable implements model.ITextModel {
return
this
.
_buffer
.
getEOL
();
}
public
getEndOfLineSequence
():
model
.
EndOfLineSequence
{
this
.
_assertNotDisposed
();
return
(
this
.
_buffer
.
getEOL
()
===
'
\n
'
?
model
.
EndOfLineSequence
.
LF
:
model
.
EndOfLineSequence
.
CRLF
);
}
public
getLineMinColumn
(
lineNumber
:
number
):
number
{
this
.
_assertNotDisposed
();
return
1
;
...
...
src/vs/monaco.d.ts
浏览文件 @
52e9e02e
...
...
@@ -1685,6 +1685,10 @@ declare namespace monaco.editor {
* @return EOL char sequence (e.g.: '\n' or '\r\n').
*/
getEOL
():
string
;
/**
* Get the end of line sequence predominantly used in the text buffer.
*/
getEndOfLineSequence
():
EndOfLineSequence
;
/**
* Get the minimum legal column for line at `lineNumber`
*/
...
...
src/vs/workbench/contrib/bulkEdit/browser/bulkTextEdits.ts
浏览文件 @
52e9e02e
...
...
@@ -39,6 +39,18 @@ class ModelEditTask implements IDisposable {
this
.
_modelReference
.
dispose
();
}
isNoOp
()
{
if
(
this
.
_edits
.
length
>
0
)
{
// contains textual edits
return
false
;
}
if
(
this
.
_newEol
!==
undefined
&&
this
.
_newEol
!==
this
.
model
.
getEndOfLineSequence
())
{
// contains an eol change that is a real change
return
false
;
}
return
true
;
}
addEdit
(
resourceEdit
:
ResourceTextEdit
):
void
{
this
.
_expectedModelVersionId
=
resourceEdit
.
versionId
;
const
{
textEdit
}
=
resourceEdit
;
...
...
@@ -219,10 +231,12 @@ export class BulkTextEdits {
if
(
tasks
.
length
===
1
)
{
// This edit touches a single model => keep things simple
const
task
=
tasks
[
0
];
const
singleModelEditStackElement
=
new
SingleModelEditStackElement
(
task
.
model
,
task
.
getBeforeCursorState
());
this
.
_undoRedoService
.
pushElement
(
singleModelEditStackElement
,
this
.
_undoRedoGroup
);
task
.
apply
();
singleModelEditStackElement
.
close
();
if
(
!
task
.
isNoOp
())
{
const
singleModelEditStackElement
=
new
SingleModelEditStackElement
(
task
.
model
,
task
.
getBeforeCursorState
());
this
.
_undoRedoService
.
pushElement
(
singleModelEditStackElement
,
this
.
_undoRedoGroup
);
task
.
apply
();
singleModelEditStackElement
.
close
();
}
this
.
_progress
.
report
(
undefined
);
}
else
{
// prepare multi model undo element
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录