Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
dd5e66ed
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,发现更多精彩内容 >>
提交
dd5e66ed
编写于
10月 24, 2017
作者:
A
Alexandru Dima
提交者:
GitHub
10月 24, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #35778 from dgileadi/trim-whitespace-preserve-cursor
Support the "reason" arg for trimming trailing whitespace
上级
07f2a8d9
5d3dfe86
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
5 deletion
+16
-5
src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
...s/editor/common/commands/trimTrailingWhitespaceCommand.ts
+4
-2
src/vs/editor/contrib/linesOperations/common/linesOperations.ts
.../editor/contrib/linesOperations/common/linesOperations.ts
+11
-2
src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts
...est/common/commands/trimTrailingWhitespaceCommand.test.ts
+1
-1
未找到文件。
src/vs/editor/common/commands/trimTrailingWhitespaceCommand.ts
浏览文件 @
dd5e66ed
...
...
@@ -15,13 +15,15 @@ export class TrimTrailingWhitespaceCommand implements editorCommon.ICommand {
private
selection
:
Selection
;
private
selectionId
:
string
;
private
cursors
:
Position
[];
constructor
(
selection
:
Selection
)
{
constructor
(
selection
:
Selection
,
cursors
:
Position
[]
)
{
this
.
selection
=
selection
;
this
.
cursors
=
cursors
;
}
public
getEditOperations
(
model
:
editorCommon
.
ITokenizedModel
,
builder
:
editorCommon
.
IEditOperationBuilder
):
void
{
let
ops
=
trimTrailingWhitespace
(
model
,
[]
);
let
ops
=
trimTrailingWhitespace
(
model
,
this
.
cursors
);
for
(
let
i
=
0
,
len
=
ops
.
length
;
i
<
len
;
i
++
)
{
let
op
=
ops
[
i
];
...
...
src/vs/editor/contrib/linesOperations/common/linesOperations.ts
浏览文件 @
dd5e66ed
...
...
@@ -14,6 +14,7 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
import
{
ReplaceCommand
,
ReplaceCommandThatPreservesSelection
}
from
'
vs/editor/common/commands/replaceCommand
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
editorAction
,
ServicesAccessor
,
IActionOptions
,
EditorAction
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
CopyLinesCommand
}
from
'
./copyLinesCommand
'
;
import
{
DeleteLinesCommand
}
from
'
./deleteLinesCommand
'
;
...
...
@@ -206,9 +207,17 @@ export class TrimTrailingWhitespaceAction extends EditorAction {
});
}
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICommonCodeEditor
):
void
{
public
run
(
accessor
:
ServicesAccessor
,
editor
:
ICommonCodeEditor
,
args
:
any
):
void
{
let
cursors
:
Position
[]
=
[];
if
(
args
.
reason
===
'
auto-save
'
)
{
// See https://github.com/editorconfig/editorconfig-vscode/issues/47
// It is very convenient for the editor config extension to invoke this action.
// So, if we get a reason:'auto-save' passed in, let's preserve cursor positions.
cursors
=
editor
.
getSelections
().
map
(
s
=>
new
Position
(
s
.
positionLineNumber
,
s
.
positionColumn
));
}
var
command
=
new
TrimTrailingWhitespaceCommand
(
editor
.
getSelection
());
var
command
=
new
TrimTrailingWhitespaceCommand
(
editor
.
getSelection
()
,
cursors
);
editor
.
pushUndoStop
();
editor
.
executeCommands
(
this
.
id
,
[
command
]);
...
...
src/vs/editor/test/common/commands/trimTrailingWhitespaceCommand.test.ts
浏览文件 @
dd5e66ed
...
...
@@ -14,7 +14,7 @@ import { withEditorModel } from 'vs/editor/test/common/editorTestUtils';
function
assertTrimTrailingWhitespaceCommand
(
text
:
string
[],
expected
:
IIdentifiedSingleEditOperation
[]):
void
{
return
withEditorModel
(
text
,
(
model
)
=>
{
var
op
=
new
TrimTrailingWhitespaceCommand
(
new
Selection
(
1
,
1
,
1
,
1
));
var
op
=
new
TrimTrailingWhitespaceCommand
(
new
Selection
(
1
,
1
,
1
,
1
)
,
[]
);
var
actual
=
getEditOperation
(
model
,
op
);
assert
.
deepEqual
(
actual
,
expected
);
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录