Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a1c5ded6
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,发现更多精彩内容 >>
提交
a1c5ded6
编写于
6月 04, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove n-arg version of dispose
This overload was not heavily used and added complexity
上级
6b7b5c0e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
24 addition
and
23 deletion
+24
-23
src/vs/base/common/lifecycle.ts
src/vs/base/common/lifecycle.ts
+8
-13
src/vs/base/test/common/lifecycle.test.ts
src/vs/base/test/common/lifecycle.test.ts
+2
-1
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
+4
-1
src/vs/editor/contrib/suggest/wordContextKey.ts
src/vs/editor/contrib/suggest/wordContextKey.ts
+6
-5
src/vs/workbench/api/browser/mainThreadMessageService.ts
src/vs/workbench/api/browser/mainThreadMessageService.ts
+2
-1
src/vs/workbench/contrib/files/browser/saveErrorHandler.ts
src/vs/workbench/contrib/files/browser/saveErrorHandler.ts
+2
-2
未找到文件。
src/vs/base/common/lifecycle.ts
浏览文件 @
a1c5ded6
...
...
@@ -15,22 +15,17 @@ export function isDisposable<E extends object>(thing: E): thing is E & IDisposab
}
export
function
dispose
<
T
extends
IDisposable
>
(
disposable
:
T
):
T
;
export
function
dispose
<
T
extends
IDisposable
>
(
...
disposables
:
Array
<
T
|
undefined
>
):
T
[]
;
export
function
dispose
<
T
extends
IDisposable
>
(
disposable
:
T
|
undefined
):
T
|
undefined
;
export
function
dispose
<
T
extends
IDisposable
>
(
disposables
:
T
[]):
T
[];
export
function
dispose
<
T
extends
IDisposable
>
(
first
:
T
|
T
[],
...
rest
:
T
[]
):
T
|
T
[]
|
undefined
{
if
(
Array
.
isArray
(
first
))
{
first
.
forEach
(
d
=>
d
&&
d
.
dispose
());
export
function
dispose
<
T
extends
IDisposable
>
(
disposables
:
T
|
T
[]
|
undefined
):
T
|
T
[]
|
undefined
{
if
(
Array
.
isArray
(
disposables
))
{
disposables
.
forEach
(
d
=>
d
&&
d
.
dispose
());
return
[];
}
else
if
(
rest
.
length
===
0
)
{
if
(
first
)
{
first
.
dispose
();
return
first
;
}
return
undefined
;
}
else
if
(
disposables
)
{
disposables
.
dispose
();
return
disposables
;
}
else
{
dispose
(
first
);
dispose
(
rest
);
return
[];
return
undefined
;
}
}
...
...
src/vs/base/test/common/lifecycle.test.ts
浏览文件 @
a1c5ded6
...
...
@@ -42,7 +42,8 @@ suite('Lifecycle', () => {
assert
(
!
disposable
.
isDisposed
);
assert
(
!
disposable2
.
isDisposed
);
dispose
(
disposable
,
disposable2
);
dispose
(
disposable
);
dispose
(
disposable2
);
assert
(
disposable
.
isDisposed
);
assert
(
disposable2
.
isDisposed
);
...
...
src/vs/editor/contrib/referenceSearch/referencesWidget.ts
浏览文件 @
a1c5ded6
...
...
@@ -230,7 +230,10 @@ export class ReferenceWidget extends PeekViewWidget {
dispose
():
void
{
this
.
setModel
(
undefined
);
this
.
_callOnDispose
=
dispose
(
this
.
_callOnDispose
);
dispose
<
IDisposable
>
(
this
.
_preview
,
this
.
_previewNotAvailableMessage
,
this
.
_tree
,
this
.
_previewModelReference
);
dispose
(
this
.
_preview
);
dispose
(
this
.
_previewNotAvailableMessage
);
dispose
(
this
.
_tree
);
dispose
(
this
.
_previewModelReference
);
this
.
_splitView
.
dispose
();
super
.
dispose
();
}
...
...
src/vs/editor/contrib/suggest/wordContextKey.ts
浏览文件 @
a1c5ded6
...
...
@@ -4,15 +4,14 @@
*--------------------------------------------------------------------------------------------*/
import
{
RawContextKey
,
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
dispose
,
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
export
class
WordContextKey
{
export
class
WordContextKey
extends
Disposable
{
static
readonly
AtEnd
=
new
RawContextKey
<
boolean
>
(
'
atEndOfWord
'
,
false
);
private
readonly
_ckAtEnd
:
IContextKey
<
boolean
>
;
private
readonly
_confListener
:
IDisposable
;
private
_enabled
:
boolean
;
private
_selectionListener
?:
IDisposable
;
...
...
@@ -21,13 +20,15 @@ export class WordContextKey {
private
readonly
_editor
:
ICodeEditor
,
@
IContextKeyService
contextKeyService
:
IContextKeyService
,
)
{
super
();
this
.
_ckAtEnd
=
WordContextKey
.
AtEnd
.
bindTo
(
contextKeyService
);
this
.
_
confListener
=
this
.
_editor
.
onDidChangeConfiguration
(
e
=>
e
.
contribInfo
&&
this
.
_update
(
));
this
.
_
register
(
this
.
_editor
.
onDidChangeConfiguration
(
e
=>
e
.
contribInfo
&&
this
.
_update
()
));
this
.
_update
();
}
dispose
():
void
{
dispose
(
this
.
_confListener
,
this
.
_selectionListener
);
super
.
dispose
();
dispose
(
this
.
_selectionListener
);
this
.
_ckAtEnd
.
reset
();
}
...
...
src/vs/workbench/api/browser/mainThreadMessageService.ts
浏览文件 @
a1c5ded6
...
...
@@ -90,7 +90,8 @@ export class MainThreadMessageService implements MainThreadMessageServiceShape {
// if promise has not been resolved yet, now is the time to ensure a return value
// otherwise if already resolved it means the user clicked one of the buttons
Event
.
once
(
messageHandle
.
onDidClose
)(()
=>
{
dispose
(...
primaryActions
,
...
secondaryActions
);
dispose
(
primaryActions
);
dispose
(
secondaryActions
);
resolve
(
undefined
);
});
});
...
...
src/vs/workbench/contrib/files/browser/saveErrorHandler.ts
浏览文件 @
a1c5ded6
...
...
@@ -175,7 +175,7 @@ export class SaveErrorHandler extends Disposable implements ISaveErrorHandler, I
// Show message and keep function to hide in case the file gets saved/reverted
const
handle
=
this
.
notificationService
.
notify
({
severity
:
Severity
.
Error
,
message
,
actions
});
Event
.
once
(
handle
.
onDidClose
)(()
=>
dispose
(...
actions
.
primary
!
,
...
actions
.
secondary
!
)
);
Event
.
once
(
handle
.
onDidClose
)(()
=>
{
dispose
(
actions
.
primary
!
),
dispose
(
actions
.
secondary
!
);
}
);
this
.
messages
.
set
(
model
.
getResource
(),
handle
);
}
...
...
@@ -258,7 +258,7 @@ class ResolveSaveConflictAction extends Action {
actions
.
secondary
!
.
push
(
this
.
instantiationService
.
createInstance
(
DoNotShowResolveConflictLearnMoreAction
));
const
handle
=
this
.
notificationService
.
notify
({
severity
:
Severity
.
Info
,
message
:
conflictEditorHelp
,
actions
});
Event
.
once
(
handle
.
onDidClose
)(()
=>
dispose
(...
actions
.
primary
!
,
...
actions
.
secondary
!
)
);
Event
.
once
(
handle
.
onDidClose
)(()
=>
{
dispose
(
actions
.
primary
!
);
dispose
(
actions
.
secondary
!
);
}
);
pendingResolveSaveConflictMessages
.
push
(
handle
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录