Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f8a31fde
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,发现更多精彩内容 >>
提交
f8a31fde
编写于
3月 29, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #23404
上级
b7e71acc
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
9 deletion
+28
-9
src/vs/editor/common/services/editorSimpleWorker.ts
src/vs/editor/common/services/editorSimpleWorker.ts
+6
-1
src/vs/editor/contrib/format/browser/formatActions.ts
src/vs/editor/contrib/format/browser/formatActions.ts
+5
-0
src/vs/editor/contrib/format/common/formatCommand.ts
src/vs/editor/contrib/format/common/formatCommand.ts
+11
-2
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
+6
-6
未找到文件。
src/vs/editor/common/services/editorSimpleWorker.ts
浏览文件 @
f8a31fde
...
...
@@ -343,6 +343,11 @@ export abstract class BaseEditorSimpleWorker {
lastEol
=
eol
;
}
if
(
!
range
)
{
// eol-change only
continue
;
}
const
original
=
model
.
getValueInRange
(
range
);
text
=
text
.
replace
(
/
\r\n
|
\n
|
\r
/g
,
model
.
eol
);
...
...
@@ -376,7 +381,7 @@ export abstract class BaseEditorSimpleWorker {
}
if
(
typeof
lastEol
===
'
number
'
)
{
result
[
result
.
length
-
1
].
eol
=
lastEol
;
result
.
push
({
eol
:
lastEol
,
text
:
undefined
,
range
:
undefined
})
;
}
return
TPromise
.
as
(
result
);
...
...
src/vs/editor/contrib/format/browser/formatActions.ts
浏览文件 @
f8a31fde
...
...
@@ -28,6 +28,11 @@ import EditorContextKeys = editorCommon.EditorContextKeys;
function
alertFormattingEdits
(
edits
:
editorCommon
.
ISingleEditOperation
[]):
void
{
edits
=
edits
.
filter
(
edit
=>
edit
.
range
);
if
(
!
edits
)
{
return
;
}
let
{
range
}
=
edits
[
0
];
for
(
let
i
=
1
;
i
<
edits
.
length
;
i
++
)
{
range
=
Range
.
plusRange
(
range
,
edits
[
i
].
range
);
...
...
src/vs/editor/contrib/format/common/formatCommand.ts
浏览文件 @
f8a31fde
...
...
@@ -28,8 +28,18 @@ export class EditOperationsCommand implements editorCommon.ICommand {
private
_selectionId
:
string
;
constructor
(
edits
:
TextEdit
[],
initialSelection
:
Selection
)
{
this
.
_edits
=
edits
;
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
&&
edit
.
text
)
{
this
.
_edits
.
push
(
edit
);
}
}
}
public
getEditOperations
(
model
:
editorCommon
.
ITokenizedModel
,
builder
:
editorCommon
.
IEditOperationBuilder
):
void
{
...
...
@@ -40,7 +50,6 @@ export class EditOperationsCommand implements editorCommon.ICommand {
if
(
trimEdit
!==
null
)
{
// produced above in case the edit.text is identical to the existing text
builder
.
addEditOperation
(
Range
.
lift
(
edit
.
range
),
edit
.
text
);
}
this
.
_newEol
=
edit
.
eol
;
}
var
selectionIsSet
=
false
;
...
...
src/vs/workbench/api/node/mainThreadSaveParticipant.ts
浏览文件 @
f8a31fde
...
...
@@ -147,7 +147,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
}
const
versionNow
=
model
.
getVersionId
();
const
{
tabSize
,
insertSpaces
}
=
model
.
getOptions
();
const
{
tabSize
,
insertSpaces
}
=
model
.
getOptions
();
return
new
TPromise
<
ISingleEditOperation
[]
>
((
resolve
,
reject
)
=>
{
setTimeout
(
reject
,
750
);
...
...
@@ -166,16 +166,16 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
}
private
_editsWithEditor
(
editor
:
ICommonCodeEditor
,
edits
:
ISingleEditOperation
[]):
void
{
editor
.
executeCommand
(
'
files.formatOnSave
'
,
new
EditOperationsCommand
(
edits
,
editor
.
getSelection
())
);
EditOperationsCommand
.
execute
(
editor
,
edits
);
}
private
_editWithModel
(
model
:
IModel
,
edits
:
ISingleEditOperation
[]):
void
{
const
[{
range
}]
=
edits
;
const
[{
range
}]
=
edits
;
const
initialSelection
=
new
Selection
(
range
.
startLineNumber
,
range
.
startColumn
,
range
.
endLineNumber
,
range
.
endColumn
);
model
.
pushEditOperations
([
initialSelection
],
edits
.
map
(
FormatOnSaveParticipant
.
_asIdentEdit
),
undoEdits
=>
{
for
(
const
{
range
}
of
undoEdits
)
{
for
(
const
{
range
}
of
undoEdits
)
{
if
(
Range
.
areIntersectingOrTouching
(
range
,
initialSelection
))
{
return
[
new
Selection
(
range
.
startLineNumber
,
range
.
startColumn
,
range
.
endLineNumber
,
range
.
endColumn
)];
}
...
...
@@ -184,7 +184,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant {
});
}
private
static
_asIdentEdit
({
text
,
range
}:
ISingleEditOperation
):
IIdentifiedSingleEditOperation
{
private
static
_asIdentEdit
({
text
,
range
}:
ISingleEditOperation
):
IIdentifiedSingleEditOperation
{
return
{
text
,
range
:
Range
.
lift
(
range
),
...
...
@@ -246,7 +246,7 @@ export class SaveParticipant implements ISaveParticipant {
const
promiseFactory
=
this
.
_saveParticipants
.
map
(
p
=>
()
=>
{
const
{
name
}
=
p
;
const
{
name
}
=
p
;
const
t1
=
Date
.
now
();
return
TPromise
.
as
(
p
.
participate
(
model
,
env
)).
then
(()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录