Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6e1f737a
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,发现更多精彩内容 >>
提交
6e1f737a
编写于
3月 27, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify FormatCommand (#44870)
上级
1b032162
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
27 deletion
+36
-27
src/vs/editor/contrib/format/formatActions.ts
src/vs/editor/contrib/format/formatActions.ts
+3
-3
src/vs/editor/contrib/format/formatCommand.ts
src/vs/editor/contrib/format/formatCommand.ts
+32
-23
src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
...rkbench/api/electron-browser/mainThreadSaveParticipant.ts
+1
-1
未找到文件。
src/vs/editor/contrib/format/formatActions.ts
浏览文件 @
6e1f737a
...
...
@@ -161,7 +161,7 @@ class FormatOnType implements editorCommon.IEditorContribution {
return
;
}
EditOperationsCommand
.
execute
(
this
.
editor
,
edits
,
true
);
EditOperationsCommand
.
execute
AsCommand
(
this
.
editor
,
edits
);
alertFormattingEdits
(
edits
);
},
(
err
)
=>
{
...
...
@@ -244,7 +244,7 @@ class FormatOnPaste implements editorCommon.IEditorContribution {
if
(
!
state
.
validate
(
this
.
editor
)
||
isFalsyOrEmpty
(
edits
))
{
return
;
}
EditOperationsCommand
.
execute
(
this
.
editor
,
edits
,
false
);
EditOperationsCommand
.
execute
(
this
.
editor
,
edits
);
alertFormattingEdits
(
edits
);
});
}
...
...
@@ -280,7 +280,7 @@ export abstract class AbstractFormatAction extends EditorAction {
return
;
}
EditOperationsCommand
.
execute
(
editor
,
edits
,
false
);
EditOperationsCommand
.
execute
(
editor
,
edits
);
alertFormattingEdits
(
edits
);
editor
.
focus
();
},
err
=>
{
...
...
src/vs/editor/contrib/format/formatCommand.ts
浏览文件 @
6e1f737a
...
...
@@ -15,39 +15,48 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
export
class
EditOperationsCommand
implements
editorCommon
.
ICommand
{
static
execute
(
editor
:
ICodeEditor
,
edits
:
TextEdit
[],
asCommand
:
boolean
)
{
const
cmd
=
new
EditOperationsCommand
(
edits
,
editor
.
getSelection
());
if
(
typeof
cmd
.
_newEol
===
'
number
'
)
{
editor
.
getModel
().
setEOL
(
cmd
.
_newEol
);
static
_handleEolEdits
(
editor
:
ICodeEditor
,
edits
:
TextEdit
[]):
ISingleEditOperation
[]
{
let
newEol
:
EndOfLineSequence
=
undefined
;
let
singleEdits
:
ISingleEditOperation
[]
=
[];
for
(
let
edit
of
edits
)
{
if
(
typeof
edit
.
eol
===
'
number
'
)
{
newEol
=
edit
.
eol
;
}
if
(
edit
.
range
&&
typeof
edit
.
text
===
'
string
'
)
{
singleEdits
.
push
(
edit
);
}
}
editor
.
pushUndoStop
();
if
(
!
asCommand
)
{
editor
.
executeEdits
(
'
formatEditsCommand
'
,
cmd
.
_edits
.
map
(
edit
=>
EditOperation
.
replace
(
Range
.
lift
(
edit
.
range
),
edit
.
text
)));
}
else
{
editor
.
executeCommand
(
'
formatEditsCommand
'
,
cmd
);
if
(
typeof
newEol
===
'
number
'
)
{
editor
.
getModel
().
setEOL
(
newEol
);
}
return
singleEdits
;
}
static
executeAsCommand
(
editor
:
ICodeEditor
,
_edits
:
TextEdit
[])
{
let
edits
=
this
.
_handleEolEdits
(
editor
,
_edits
);
const
cmd
=
new
EditOperationsCommand
(
edits
,
editor
.
getSelection
());
editor
.
pushUndoStop
();
editor
.
executeCommand
(
'
formatEditsCommand
'
,
cmd
);
editor
.
pushUndoStop
();
}
private
_edits
:
TextEdit
[];
private
_newEol
:
EndOfLineSequence
;
static
execute
(
editor
:
ICodeEditor
,
_edits
:
TextEdit
[])
{
let
edits
=
this
.
_handleEolEdits
(
editor
,
_edits
);
editor
.
pushUndoStop
();
editor
.
executeEdits
(
'
formatEditsCommand
'
,
edits
.
map
(
edit
=>
EditOperation
.
replace
(
Range
.
lift
(
edit
.
range
),
edit
.
text
)));
editor
.
pushUndoStop
();
}
private
_edits
:
ISingleEditOperation
[];
private
_initialSelection
:
Selection
;
private
_selectionId
:
string
;
constructor
(
edits
:
TextEdit
[],
initialSelection
:
Selection
)
{
constructor
(
edits
:
ISingleEditOperation
[],
initialSelection
:
Selection
)
{
this
.
_initialSelection
=
initialSelection
;
this
.
_edits
=
[];
this
.
_newEol
=
undefined
;
for
(
let
edit
of
edits
)
{
if
(
typeof
edit
.
eol
===
'
number
'
)
{
this
.
_newEol
=
edit
.
eol
;
}
if
(
edit
.
range
&&
typeof
edit
.
text
===
'
string
'
)
{
this
.
_edits
.
push
(
edit
);
}
}
this
.
_edits
=
edits
;
}
public
getEditOperations
(
model
:
ITextModel
,
builder
:
editorCommon
.
IEditOperationBuilder
):
void
{
...
...
src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
浏览文件 @
6e1f737a
...
...
@@ -225,7 +225,7 @@ class FormatOnSaveParticipant implements ISaveParticipantParticipant {
}
private
_editsWithEditor
(
editor
:
ICodeEditor
,
edits
:
ISingleEditOperation
[]):
void
{
EditOperationsCommand
.
execute
(
editor
,
edits
,
false
);
EditOperationsCommand
.
execute
(
editor
,
edits
);
}
private
_editWithModel
(
model
:
ITextModel
,
edits
:
ISingleEditOperation
[]):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录