Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bb655625
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,发现更多精彩内容 >>
提交
bb655625
编写于
9月 21, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
merge waitUntil and pushEdits
上级
ab64f825
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
28 deletion
+27
-28
src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
+26
-27
src/vs/workbench/test/node/api/extHostDocumentSaveParticipant.test.ts
...ench/test/node/api/extHostDocumentSaveParticipant.test.ts
+1
-1
未找到文件。
src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
浏览文件 @
bb655625
...
@@ -11,14 +11,14 @@ import {sequence} from 'vs/base/common/async';
...
@@ -11,14 +11,14 @@ import {sequence} from 'vs/base/common/async';
import
{
illegalState
}
from
'
vs/base/common/errors
'
;
import
{
illegalState
}
from
'
vs/base/common/errors
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
MainThreadWorkspaceShape
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
MainThreadWorkspaceShape
}
from
'
vs/workbench/api/node/extHost.protocol
'
;
import
{
TextEdit
}
from
'
vs/workbench/api/node/extHostTypes
'
;
import
{
fromRange
}
from
'
vs/workbench/api/node/extHostTypeConverters
'
;
import
{
fromRange
}
from
'
vs/workbench/api/node/extHostTypeConverters
'
;
import
{
IResourceEdit
}
from
'
vs/editor/common/services/bulkEdit
'
;
import
{
IResourceEdit
}
from
'
vs/editor/common/services/bulkEdit
'
;
import
{
ExtHostDocuments
}
from
'
vs/workbench/api/node/extHostDocuments
'
;
import
{
ExtHostDocuments
}
from
'
vs/workbench/api/node/extHostDocuments
'
;
export
interface
TextDocumentWillSaveEvent
{
export
interface
TextDocumentWillSaveEvent
{
document
:
vscode
.
TextDocument
;
document
:
vscode
.
TextDocument
;
pushEdits
(
edits
:
vscode
.
TextEdit
[]):
void
;
waitUntil
(
t
:
Thenable
<
any
|
vscode
.
TextEdit
[]
>
):
void
;
waitUntil
(
t
:
Thenable
<
any
>
):
void
;
}
}
export
class
ExtHostDocumentSaveParticipant
{
export
class
ExtHostDocumentSaveParticipant
{
...
@@ -60,28 +60,15 @@ export class ExtHostDocumentSaveParticipant {
...
@@ -60,28 +60,15 @@ export class ExtHostDocumentSaveParticipant {
private
_deliverEventAsync
(
listener
:
Function
,
thisArg
:
any
,
document
:
vscode
.
TextDocument
):
TPromise
<
any
>
{
private
_deliverEventAsync
(
listener
:
Function
,
thisArg
:
any
,
document
:
vscode
.
TextDocument
):
TPromise
<
any
>
{
const
promises
:
TPromise
<
any
>
[]
=
[];
const
promises
:
TPromise
<
any
|
vscode
.
TextEdit
[]
>
[]
=
[];
const
resourceEdits
:
IResourceEdit
[]
=
[];
const
{
version
}
=
document
;
const
{
version
}
=
document
;
const
event
=
Object
.
freeze
(
<
TextDocumentWillSaveEvent
>
{
const
event
=
Object
.
freeze
(
<
TextDocumentWillSaveEvent
>
{
document
,
document
,
pushEdits
(
edits
)
{
waitUntil
(
p
:
Thenable
<
any
|
vscode
.
TextEdit
[]
>
)
{
if
(
Object
.
isFrozen
(
resourceEdits
))
{
throw
illegalState
(
'
pushEdits can not be called anymore
'
);
}
for
(
const
{
newText
,
range
}
of
edits
)
{
resourceEdits
.
push
({
newText
,
range
:
fromRange
(
range
),
resource
:
<
URI
>
document
.
uri
,
});
}
},
waitUntil
(
p
:
Thenable
<
any
>
)
{
if
(
Object
.
isFrozen
(
promises
))
{
if
(
Object
.
isFrozen
(
promises
))
{
throw
illegalState
(
'
waitUntil can not be called a
nymore
'
);
throw
illegalState
(
'
waitUntil can not be called a
sync
'
);
}
}
promises
.
push
(
TPromise
.
wrap
(
p
));
promises
.
push
(
TPromise
.
wrap
(
p
));
}
}
...
@@ -94,21 +81,33 @@ export class ExtHostDocumentSaveParticipant {
...
@@ -94,21 +81,33 @@ export class ExtHostDocumentSaveParticipant {
// freeze promises after event call
// freeze promises after event call
Object
.
freeze
(
promises
);
Object
.
freeze
(
promises
);
return
TPromise
.
join
(
promises
).
then
(()
=>
{
return
TPromise
.
join
(
promises
).
then
(
values
=>
{
// freeze edits after async/sync is done
Object
.
freeze
(
resourceEdits
);
const
edits
:
IResourceEdit
[]
=
[];
for
(
const
value
of
values
)
{
if
(
Array
.
isArray
(
value
)
&&
(
<
vscode
.
TextEdit
[]
>
value
).
every
(
e
=>
e
instanceof
TextEdit
))
{
for
(
const
{
newText
,
range
}
of
value
)
{
edits
.
push
({
resource
:
<
URI
>
document
.
uri
,
range
:
fromRange
(
range
),
newText
});
}
}
}
if
(
resourceEdits
.
length
===
0
)
{
// apply edits iff any and iff document
// didn't change somehow in the meantime
if
(
edits
.
length
===
0
)
{
return
;
return
;
}
}
if
(
version
!==
document
.
version
)
{
if
(
version
===
document
.
version
)
{
// TODO@joh - fail?
return
this
.
_workspace
.
$applyWorkspaceEdit
(
edits
);
return
;
}
}
//
apply edits iff any
//
TODO@joh - fail?
return
this
.
_workspace
.
$applyWorkspaceEdit
(
resourceEdits
);
console
.
warn
(
'
IGNORING changes because document has changed while computing changes
'
);
},
err
=>
{
},
err
=>
{
// ignore error
// ignore error
...
...
src/vs/workbench/test/node/api/extHostDocumentSaveParticipant.test.ts
浏览文件 @
bb655625
...
@@ -168,7 +168,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
...
@@ -168,7 +168,7 @@ suite('ExtHostDocumentSaveParticipant', () => {
});
});
let
sub
=
participant
.
onWillSaveTextDocumentEvent
(
function
(
e
)
{
let
sub
=
participant
.
onWillSaveTextDocumentEvent
(
function
(
e
)
{
e
.
pushEdits
([
TextEdit
.
insert
(
new
Position
(
0
,
0
),
'
bar
'
)]
);
e
.
waitUntil
(
TPromise
.
as
([
TextEdit
.
insert
(
new
Position
(
0
,
0
),
'
bar
'
)])
);
});
});
return
participant
.
$participateInSave
(
resource
).
then
(()
=>
{
return
participant
.
$participateInSave
(
resource
).
then
(()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录