Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
19f152ce
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,发现更多精彩内容 >>
提交
19f152ce
编写于
11月 02, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add tests
上级
f9cbe207
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
78 addition
and
3 deletion
+78
-3
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
+3
-3
src/vs/workbench/test/node/api/mainThreadSaveParticipant.test.ts
...workbench/test/node/api/mainThreadSaveParticipant.test.ts
+75
-0
未找到文件。
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
浏览文件 @
19f152ce
...
@@ -24,7 +24,7 @@ import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textF
...
@@ -24,7 +24,7 @@ import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textF
import
{
ExtHostContext
,
ExtHostDocumentSaveParticipantShape
}
from
'
./extHost.protocol
'
;
import
{
ExtHostContext
,
ExtHostDocumentSaveParticipantShape
}
from
'
./extHost.protocol
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
interface
INamedSaveParticpant
extends
ISaveParticipant
{
export
interface
INamedSaveParticpant
extends
ISaveParticipant
{
readonly
name
:
string
;
readonly
name
:
string
;
}
}
...
@@ -93,7 +93,7 @@ function findEditor(model: IModel, codeEditorService: ICodeEditorService): IComm
...
@@ -93,7 +93,7 @@ function findEditor(model: IModel, codeEditorService: ICodeEditorService): IComm
return
null
;
return
null
;
}
}
class
FinalNewLineParticipant
implements
INamedSaveParticpant
{
export
class
FinalNewLineParticipant
implements
INamedSaveParticpant
{
readonly
name
=
'
FinalNewLineParticipant
'
;
readonly
name
=
'
FinalNewLineParticipant
'
;
...
@@ -115,7 +115,7 @@ class FinalNewLineParticipant implements INamedSaveParticpant {
...
@@ -115,7 +115,7 @@ class FinalNewLineParticipant implements INamedSaveParticpant {
const
lastLine
=
model
.
getLineContent
(
lineCount
);
const
lastLine
=
model
.
getLineContent
(
lineCount
);
const
lastLineIsEmptyOrWhitespace
=
strings
.
lastNonWhitespaceIndex
(
lastLine
)
===
-
1
;
const
lastLineIsEmptyOrWhitespace
=
strings
.
lastNonWhitespaceIndex
(
lastLine
)
===
-
1
;
if
(
lineCount
<=
1
||
lastLineIsEmptyOrWhitespace
)
{
if
(
!
lineCount
||
lastLineIsEmptyOrWhitespace
)
{
return
;
return
;
}
}
...
...
src/vs/workbench/test/node/api/mainThreadSaveParticipant.test.ts
0 → 100644
浏览文件 @
19f152ce
/*---------------------------------------------------------------------------------------------
* 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
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
FinalNewLineParticipant
}
from
'
vs/workbench/api/node/mainThreadSaveParticipant
'
;
import
{
TestConfigurationService
}
from
'
vs/platform/configuration/test/common/testConfigurationService
'
;
import
{
workbenchInstantiationService
,
TestTextFileService
,
toResource
}
from
'
vs/test/utils/servicesTestUtils
'
;
import
{
IModelService
}
from
'
vs/editor/common/services/modelService
'
;
import
{
TextFileEditorModel
}
from
'
vs/workbench/services/textfile/common/textFileEditorModel
'
;
import
{
IEventService
}
from
'
vs/platform/event/common/event
'
;
import
{
ITextFileService
,
SaveReason
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
TextFileEditorModelManager
}
from
'
vs/workbench/services/textfile/common/textFileEditorModelManager
'
;
class
ServiceAccessor
{
constructor
(
@
IEventService
public
eventService
:
IEventService
,
@
ITextFileService
public
textFileService
:
TestTextFileService
,
@
IModelService
public
modelService
:
IModelService
)
{
}
}
suite
(
'
MainThreadSaveParticipant
'
,
function
()
{
let
instantiationService
:
IInstantiationService
;
let
accessor
:
ServiceAccessor
;
setup
(()
=>
{
instantiationService
=
workbenchInstantiationService
();
accessor
=
instantiationService
.
createInstance
(
ServiceAccessor
);
});
teardown
(()
=>
{
(
<
TextFileEditorModelManager
>
accessor
.
textFileService
.
models
).
clear
();
TextFileEditorModel
.
setSaveParticipant
(
null
);
// reset any set participant
});
test
(
'
insert final new line
'
,
function
(
done
)
{
const
model
:
TextFileEditorModel
=
instantiationService
.
createInstance
(
TextFileEditorModel
,
toResource
.
call
(
this
,
'
/path/final_new_line.txt
'
),
'
utf8
'
);
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
(
model
.
getValue
(),
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
(
model
.
getValue
(),
lineContent
);
// New empty line added (single line)
lineContent
=
'
Hello New Line
'
;
model
.
textEditorModel
.
setValue
(
lineContent
);
participant
.
participate
(
model
,
{
reason
:
SaveReason
.
EXPLICIT
});
assert
.
equal
(
model
.
getValue
(),
`
${
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
(
model
.
getValue
(),
`
${
lineContent
}${
model
.
textEditorModel
.
getEOL
()}
`
);
done
();
});
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录