Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
20256369
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,发现更多精彩内容 >>
提交
20256369
编写于
10月 01, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Convert test to use async
上级
e87867c9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
101 addition
and
107 deletion
+101
-107
src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
...st/electron-browser/api/mainThreadSaveParticipant.test.ts
+101
-107
未找到文件。
src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
浏览文件 @
20256369
...
...
@@ -39,131 +39,125 @@ suite('MainThreadSaveParticipant', function () {
TextFileEditorModel
.
setSaveParticipant
(
null
);
// reset any set participant
});
test
(
'
insert final new line
'
,
function
()
{
test
(
'
insert final new line
'
,
async
function
()
{
const
model
:
TextFileEditorModel
=
instantiationService
.
createInstance
(
TextFileEditorModel
,
toResource
.
call
(
this
,
'
/path/final_new_line.txt
'
),
'
utf8
'
);
return
model
.
load
().
then
(()
=>
{
const
configService
=
new
TestConfigurationService
();
configService
.
setUserConfiguration
(
'
files
'
,
{
'
insertFinalNewline
'
:
true
});
const
participant
=
new
FinalNewLineParticipant
(
configService
,
undefined
);
// No new line for empty lines
let
lineContent
=
''
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// No new line if last line already empty
lineContent
=
`Hello New Line
${
model
.
textEditorModel
.
getEOL
()}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// New empty line added (single line)
lineContent
=
'
Hello New Line
'
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
lineContent
}${
model
.
textEditorModel
.
getEOL
()}
`
);
// New empty line added (multi line)
lineContent
=
`Hello New Line
${
model
.
textEditorModel
.
getEOL
()}
Hello New Line
${
model
.
textEditorModel
.
getEOL
()}
Hello New Line`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
lineContent
}${
model
.
textEditorModel
.
getEOL
()}
`
);
});
await
model
.
load
();
const
configService
=
new
TestConfigurationService
();
configService
.
setUserConfiguration
(
'
files
'
,
{
'
insertFinalNewline
'
:
true
});
const
participant
=
new
FinalNewLineParticipant
(
configService
,
undefined
);
// No new line for empty lines
let
lineContent
=
''
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// No new line if last line already empty
lineContent
=
`Hello New Line
${
model
.
textEditorModel
.
getEOL
()}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// New empty line added (single line)
lineContent
=
'
Hello New Line
'
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
lineContent
}${
model
.
textEditorModel
.
getEOL
()}
`
);
// New empty line added (multi line)
lineContent
=
`Hello New Line
${
model
.
textEditorModel
.
getEOL
()}
Hello New Line
${
model
.
textEditorModel
.
getEOL
()}
Hello New Line`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
lineContent
}${
model
.
textEditorModel
.
getEOL
()}
`
);
});
test
(
'
trim final new lines
'
,
function
()
{
test
(
'
trim final new lines
'
,
async
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
});
await
model
.
load
();
const
configService
=
new
TestConfigurationService
();
configService
.
setUserConfiguration
(
'
files
'
,
{
'
trimFinalNewlines
'
:
true
});
const
participant
=
new
TrimFinalNewLinesParticipant
(
configService
,
undefined
);
const
textContent
=
'
Trim New Line
'
;
const
eol
=
`
${
model
.
textEditorModel
.
getEOL
()}
`
;
// No new line removal if last line is not new line
let
lineContent
=
`
${
textContent
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// No new line removal if last line is single new line
lineContent
=
`
${
textContent
}${
eol
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// Remove new line (single line with two new lines)
lineContent
=
`
${
textContent
}${
eol
}${
eol
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}
`
);
// Remove new lines (multiple lines with multiple new lines)
lineContent
=
`
${
textContent
}${
eol
}${
textContent
}${
eol
}${
eol
}${
eol
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}${
textContent
}${
eol
}
`
);
});
const
participant
=
new
TrimFinalNewLinesParticipant
(
configService
,
undefined
);
test
(
'
trim final new lines bug#39750
'
,
async
function
()
{
const
model
:
TextFileEditorModel
=
instantiationService
.
createInstance
(
TextFileEditorModel
,
toResource
.
call
(
this
,
'
/path/trim_final_new_line.txt
'
),
'
utf8
'
);
const
textContent
=
'
Trim New Line
'
;
const
eol
=
`
${
model
.
textEditorModel
.
getEOL
()}
`
;
await
model
.
load
();
const
configService
=
new
TestConfigurationService
();
configService
.
setUserConfiguration
(
'
files
'
,
{
'
trimFinalNewlines
'
:
true
});
const
participant
=
new
TrimFinalNewLinesParticipant
(
configService
,
undefined
);
const
textContent
=
'
Trim New Line
'
;
// No new line removal if last line is not new line
let
lineContent
=
`
${
textContent
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// single line
let
lineContent
=
`
${
textContent
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
// No new line removal if last line is single new line
lineContent
=
`
${
textContent
}${
eol
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
lineContent
);
// apply edits and push to undo stack.
let
textEdits
=
[{
range
:
new
Range
(
1
,
14
,
1
,
14
),
text
:
'
.
'
,
forceMoveMarkers
:
false
}];
model
.
textEditorModel
.
pushEditOperations
([
new
Selection
(
1
,
14
,
1
,
14
)],
textEdits
,
()
=>
{
return
[
new
Selection
(
1
,
15
,
1
,
15
)];
});
// Remove new line (single line with two new lines)
lineContent
=
`
${
textContent
}${
eol
}${
eol
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}
`
);
// undo
model
.
textEditorModel
.
undo
();
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}
`
);
// Remove new lines (multiple lines with multiple new lines)
lineContent
=
`
${
textContent
}${
eol
}${
textContent
}${
eol
}${
eol
}${
eol
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}${
textContent
}${
eol
}
`
);
});
// trim final new lines should not mess the undo stack
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
model
.
textEditorModel
.
redo
();
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}
.`
);
});
test
(
'
trim final new lines bug#
39750
'
,
function
()
{
test
(
'
trim final new lines bug#
46075
'
,
async
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
=
'
Trim New Line
'
;
// single line
let
lineContent
=
`
${
textContent
}
`
;
model
.
textEditorModel
.
setValue
(
lineContent
);
// apply edits and push to undo stack.
let
textEdits
=
[{
range
:
new
Range
(
1
,
14
,
1
,
14
),
text
:
'
.
'
,
forceMoveMarkers
:
false
}];
model
.
textEditorModel
.
pushEditOperations
([
new
Selection
(
1
,
14
,
1
,
14
)],
textEdits
,
()
=>
{
return
[
new
Selection
(
1
,
15
,
1
,
15
)];
});
// undo
model
.
textEditorModel
.
undo
();
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}
`
);
// trim final new lines should not mess the undo stack
await
model
.
load
();
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
});
model
.
textEditorModel
.
redo
();
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}
.`
);
});
});
}
test
(
'
trim final new lines bug#46075
'
,
function
()
{
const
model
:
TextFileEditorModel
=
instantiationService
.
createInstance
(
TextFileEditorModel
,
toResource
.
call
(
this
,
'
/path/trim_final_new_line.txt
'
),
'
utf8
'
);
// confirm trimming
assert
.
equal
(
snapshotToString
(
model
.
createSnapshot
()),
`
${
textContent
}${
eol
}
`
);
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
}
`
);
});
// 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录