Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
ae26c5e7
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,发现更多精彩内容 >>
提交
ae26c5e7
编写于
11月 04, 2016
作者:
B
Benjamin Pasero
提交者:
GitHub
11月 04, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14838 from Microsoft/ben/insertFinalNewline
Provide an option to insert a final newline (fixes #1666)
上级
a2a8001a
19f152ce
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
153 addition
and
25 deletion
+153
-25
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
+72
-24
src/vs/workbench/parts/files/browser/files.contribution.ts
src/vs/workbench/parts/files/browser/files.contribution.ts
+6
-1
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
浏览文件 @
ae26c5e7
...
...
@@ -7,6 +7,7 @@
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
sequence
}
from
'
vs/base/common/async
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/common/services/codeEditorService
'
;
import
{
IThreadService
}
from
'
vs/workbench/services/thread/common/threadService
'
;
import
{
ISaveParticipant
,
ITextFileEditorModel
,
SaveReason
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
...
...
@@ -21,8 +22,9 @@ import { EditOperationsCommand } from 'vs/editor/contrib/format/common/formatCom
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
TextFileEditorModel
}
from
'
vs/workbench/services/textfile/common/textFileEditorModel
'
;
import
{
ExtHostContext
,
ExtHostDocumentSaveParticipantShape
}
from
'
./extHost.protocol
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
interface
INamedSaveParticpant
extends
ISaveParticipant
{
export
interface
INamedSaveParticpant
extends
ISaveParticipant
{
readonly
name
:
string
;
}
...
...
@@ -47,19 +49,10 @@ class TrimWhitespaceParticipant implements INamedSaveParticpant {
let
prevSelection
:
Selection
[]
=
[
new
Selection
(
1
,
1
,
1
,
1
)];
const
cursors
:
IPosition
[]
=
[];
let
editor
=
findEditor
(
model
,
this
.
codeEditorService
);
if
(
editor
)
{
// Find `prevSelection` in any case do ensure a good undo stack when pushing the edit
// Collect active cursors in `cursors` only if `isAutoSaved` to avoid having the cursors jump
if
(
model
.
isAttachedToEditor
())
{
const
allEditors
=
this
.
codeEditorService
.
listCodeEditors
();
for
(
let
i
=
0
,
len
=
allEditors
.
length
;
i
<
len
;
i
++
)
{
const
editor
=
allEditors
[
i
];
const
editorModel
=
editor
.
getModel
();
if
(
!
editorModel
)
{
continue
;
// empty editor
}
if
(
model
===
editorModel
)
{
prevSelection
=
editor
.
getSelections
();
if
(
isAutoSaved
)
{
cursors
.
push
(...
prevSelection
.
map
(
s
=>
{
...
...
@@ -70,8 +63,6 @@ class TrimWhitespaceParticipant implements INamedSaveParticpant {
}));
}
}
}
}
const
ops
=
trimTrailingWhitespace
(
model
,
cursors
);
if
(
!
ops
.
length
)
{
...
...
@@ -82,6 +73,62 @@ class TrimWhitespaceParticipant implements INamedSaveParticpant {
}
}
function
findEditor
(
model
:
IModel
,
codeEditorService
:
ICodeEditorService
):
ICommonCodeEditor
{
if
(
model
.
isAttachedToEditor
())
{
const
allEditors
=
codeEditorService
.
listCodeEditors
();
for
(
let
i
=
0
,
len
=
allEditors
.
length
;
i
<
len
;
i
++
)
{
const
editor
=
allEditors
[
i
];
const
editorModel
=
editor
.
getModel
();
if
(
!
editorModel
)
{
continue
;
// empty editor
}
if
(
model
===
editorModel
)
{
return
editor
;
}
}
}
return
null
;
}
export
class
FinalNewLineParticipant
implements
INamedSaveParticpant
{
readonly
name
=
'
FinalNewLineParticipant
'
;
constructor
(
@
IConfigurationService
private
configurationService
:
IConfigurationService
,
@
ICodeEditorService
private
codeEditorService
:
ICodeEditorService
)
{
// Nothing
}
public
participate
(
model
:
ITextFileEditorModel
,
env
:
{
reason
:
SaveReason
}):
any
{
if
(
this
.
configurationService
.
lookup
(
'
files.insertFinalNewline
'
).
value
)
{
this
.
doInsertFinalNewLine
(
model
.
textEditorModel
);
}
}
private
doInsertFinalNewLine
(
model
:
IModel
):
void
{
const
lineCount
=
model
.
getLineCount
();
const
lastLine
=
model
.
getLineContent
(
lineCount
);
const
lastLineIsEmptyOrWhitespace
=
strings
.
lastNonWhitespaceIndex
(
lastLine
)
===
-
1
;
if
(
!
lineCount
||
lastLineIsEmptyOrWhitespace
)
{
return
;
}
let
prevSelection
:
Selection
[]
=
[
new
Selection
(
1
,
1
,
1
,
1
)];
const
editor
=
findEditor
(
model
,
this
.
codeEditorService
);
if
(
editor
)
{
prevSelection
=
editor
.
getSelections
();
}
model
.
pushEditOperations
(
prevSelection
,
[
EditOperation
.
insert
({
lineNumber
:
lineCount
+
1
,
column
:
0
},
model
.
getEOL
())],
(
edits
)
=>
prevSelection
);
}
}
class
FormatOnSaveParticipant
implements
INamedSaveParticpant
{
readonly
name
=
'
FormatOnSaveParticipant
'
;
...
...
@@ -204,6 +251,7 @@ export class SaveParticipant implements ISaveParticipant {
this
.
_saveParticipants
=
[
instantiationService
.
createInstance
(
TrimWhitespaceParticipant
),
instantiationService
.
createInstance
(
FinalNewLineParticipant
),
instantiationService
.
createInstance
(
FormatOnSaveParticipant
),
instantiationService
.
createInstance
(
ExtHostSaveParticipant
)
];
...
...
src/vs/workbench/parts/files/browser/files.contribution.ts
浏览文件 @
ae26c5e7
...
...
@@ -195,7 +195,12 @@ configurationRegistry.registerConfiguration({
'
files.trimTrailingWhitespace
'
:
{
'
type
'
:
'
boolean
'
,
'
default
'
:
false
,
'
description
'
:
nls
.
localize
(
'
trimTrailingWhitespace
'
,
"
When enabled, will trim trailing whitespace when you save a file.
"
)
'
description
'
:
nls
.
localize
(
'
trimTrailingWhitespace
'
,
"
When enabled, will trim trailing whitespace when saving a file.
"
)
},
'
files.insertFinalNewline
'
:
{
'
type
'
:
'
boolean
'
,
'
default
'
:
false
,
'
description
'
:
nls
.
localize
(
'
insertFinalNewline
'
,
"
When enabled, insert a final new line at the end of the file when saving it.
"
)
},
'
files.autoSave
'
:
{
'
type
'
:
'
string
'
,
...
...
src/vs/workbench/test/node/api/mainThreadSaveParticipant.test.ts
0 → 100644
浏览文件 @
ae26c5e7
/*---------------------------------------------------------------------------------------------
* 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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录