Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
215d6512
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,发现更多精彩内容 >>
未验证
提交
215d6512
编写于
3月 28, 2018
作者:
A
Alexandru Dima
提交者:
GitHub
3月 28, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #46227 from AiryShift/bug46075
Fixes #46075
上级
aa9e771f
97ff5307
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
1 deletion
+28
-1
src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
...rkbench/api/electron-browser/mainThreadSaveParticipant.ts
+1
-1
src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
...st/electron-browser/api/mainThreadSaveParticipant.test.ts
+27
-0
未找到文件。
src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
浏览文件 @
215d6512
...
...
@@ -166,7 +166,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
currentLineIsEmptyOrWhitespace
=
strings
.
lastNonWhitespaceIndex
(
currentLine
)
===
-
1
;
}
const
deletionRange
=
new
Range
(
currentLineNumber
+
1
,
1
,
lineCount
+
1
,
1
);
const
deletionRange
=
model
.
validateRange
(
new
Range
(
currentLineNumber
+
1
,
1
,
lineCount
+
1
,
1
)
);
if
(
!
deletionRange
.
isEmpty
())
{
model
.
pushEditOperations
(
prevSelection
,
[
EditOperation
.
delete
(
deletionRange
)],
edits
=>
prevSelection
);
}
...
...
src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
浏览文件 @
215d6512
...
...
@@ -139,4 +139,31 @@ suite('MainThreadSaveParticipant', function () {
});
});
test
(
'
trim final new lines bug#46075
'
,
function
()
{
const
model
:
TextFileEditorModel
=
instantiationService
.
createInstance
(
TextFileEditorModel
,
toResource
.
call
(
this
,
'
/path/trim_final_new_line.txt
'
),
'
utf8
'
);
return
model
.
load
().
then
(()
=>
{
const
configService
=
new
TestConfigurationService
();
configService
.
setUserConfiguration
(
'
files
'
,
{
'
trimFinalNewlines
'
:
true
});
const
participant
=
new
TrimFinalNewLinesParticipant
(
configService
,
undefined
);
const
textContent
=
'
Test
'
;
const
eol
=
`
${
model
.
textEditorModel
.
getEOL
()}
`
;
let
content
=
`
${
textContent
}${
eol
}${
eol
}
`
;
model
.
textEditorModel
.
setValue
(
content
);
// save many times
for
(
let
i
=
0
;
i
<
10
;
i
++
)
{
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
}
// confirm trimming
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}
`
);
// undo should go back to previous content immediately
model
.
textEditorModel
.
undo
();
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}${
eol
}
`
);
model
.
textEditorModel
.
redo
();
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}
`
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录