Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
1da98a12
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,发现更多精彩内容 >>
提交
1da98a12
编写于
7月 03, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use DisposableStore in listWidget
上级
2ae83d61
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
24 addition
and
23 deletion
+24
-23
src/vs/base/browser/ui/list/listWidget.ts
src/vs/base/browser/ui/list/listWidget.ts
+22
-21
src/vs/base/common/event.ts
src/vs/base/common/event.ts
+2
-2
未找到文件。
src/vs/base/browser/ui/list/listWidget.ts
浏览文件 @
1da98a12
...
...
@@ -5,7 +5,7 @@
import
'
vs/css!./list
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
IDisposable
,
dispose
,
DisposableStore
}
from
'
vs/base/common/lifecycle
'
;
import
{
isNumber
}
from
'
vs/base/common/types
'
;
import
{
range
,
firstIndex
,
binarySearch
}
from
'
vs/base/common/arrays
'
;
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
...
...
@@ -228,7 +228,7 @@ function isInputElement(e: HTMLElement): boolean {
class
KeyboardController
<
T
>
implements
IDisposable
{
private
disposables
:
IDisposable
[]
;
private
readonly
disposables
=
new
DisposableStore
()
;
private
openController
:
IOpenController
;
constructor
(
...
...
@@ -237,7 +237,6 @@ class KeyboardController<T> implements IDisposable {
options
:
IListOptions
<
T
>
)
{
const
multipleSelectionSupport
=
!
(
options
.
multipleSelectionSupport
===
false
);
this
.
disposables
=
[];
this
.
openController
=
options
.
openController
||
DefaultOpenController
;
...
...
@@ -314,7 +313,7 @@ class KeyboardController<T> implements IDisposable {
}
dispose
()
{
this
.
disposables
=
dispose
(
this
.
disposables
);
this
.
disposables
.
dispose
(
);
}
}
...
...
@@ -341,8 +340,8 @@ class TypeLabelController<T> implements IDisposable {
private
automaticKeyboardNavigation
=
true
;
private
triggered
=
false
;
private
enabledDisposables
:
IDisposable
[]
=
[]
;
private
disposables
:
IDisposable
[]
=
[]
;
private
readonly
enabledDisposables
=
new
DisposableStore
()
;
private
readonly
disposables
=
new
DisposableStore
()
;
constructor
(
private
list
:
List
<
T
>
,
...
...
@@ -398,7 +397,7 @@ class TypeLabelController<T> implements IDisposable {
return
;
}
this
.
enabledDisposables
=
dispose
(
this
.
enabledDisposables
);
this
.
enabledDisposables
.
clear
(
);
this
.
enabled
=
false
;
this
.
triggered
=
false
;
}
...
...
@@ -430,20 +429,19 @@ class TypeLabelController<T> implements IDisposable {
dispose
()
{
this
.
disable
();
this
.
disposables
=
dispose
(
this
.
disposables
);
this
.
enabledDisposables
.
dispose
();
this
.
disposables
.
dispose
();
}
}
class
DOMFocusController
<
T
>
implements
IDisposable
{
private
disposables
:
IDisposable
[]
=
[]
;
private
readonly
disposables
=
new
DisposableStore
()
;
constructor
(
private
list
:
List
<
T
>
,
private
view
:
ListView
<
T
>
)
{
this
.
disposables
=
[];
const
onKeyDown
=
Event
.
chain
(
domEvent
(
view
.
domNode
,
'
keydown
'
))
.
filter
(
e
=>
!
isInputElement
(
e
.
target
as
HTMLElement
))
.
map
(
e
=>
new
StandardKeyboardEvent
(
e
));
...
...
@@ -486,7 +484,7 @@ class DOMFocusController<T> implements IDisposable {
}
dispose
()
{
this
.
disposables
=
dispose
(
this
.
disposables
);
this
.
disposables
.
dispose
(
);
}
}
...
...
@@ -523,7 +521,7 @@ export class MouseController<T> implements IDisposable {
readonly
multipleSelectionController
:
IMultipleSelectionController
<
T
>
;
private
openController
:
IOpenController
;
private
mouseSupport
:
boolean
;
private
disposables
:
IDisposable
[]
=
[]
;
private
readonly
disposables
=
new
DisposableStore
()
;
constructor
(
protected
list
:
List
<
T
>
)
{
this
.
multipleSelectionSupport
=
!
(
list
.
options
.
multipleSelectionSupport
===
false
);
...
...
@@ -663,7 +661,7 @@ export class MouseController<T> implements IDisposable {
}
dispose
()
{
this
.
disposables
=
dispose
(
this
.
disposables
);
this
.
disposables
.
dispose
(
);
}
}
...
...
@@ -1096,7 +1094,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
private
styleController
:
IStyleController
;
private
typeLabelController
?:
TypeLabelController
<
T
>
;
protected
disposables
:
IDisposable
[]
;
protected
readonly
disposables
=
new
DisposableStore
()
;
@
memoize
get
onFocusChange
():
Event
<
IListEvent
<
T
>>
{
return
Event
.
map
(
this
.
eventBufferer
.
wrapEvent
(
this
.
focus
.
onChange
),
e
=>
this
.
toListEvent
(
e
));
...
...
@@ -1210,24 +1208,27 @@ export class List<T> implements ISpliceable<T>, IDisposable {
this
.
view
]);
this
.
disposables
=
[
this
.
focus
,
this
.
selection
,
this
.
view
,
this
.
_onDidDispose
];
this
.
disposables
.
add
(
this
.
focus
);
this
.
disposables
.
add
(
this
.
selection
);
this
.
disposables
.
add
(
this
.
view
);
this
.
disposables
.
add
(
this
.
_onDidDispose
);
this
.
onDidFocus
=
Event
.
map
(
domEvent
(
this
.
view
.
domNode
,
'
focus
'
,
true
),
()
=>
null
!
);
this
.
onDidBlur
=
Event
.
map
(
domEvent
(
this
.
view
.
domNode
,
'
blur
'
,
true
),
()
=>
null
!
);
this
.
disposables
.
push
(
new
DOMFocusController
(
this
,
this
.
view
));
this
.
disposables
.
add
(
new
DOMFocusController
(
this
,
this
.
view
));
if
(
typeof
_options
.
keyboardSupport
!==
'
boolean
'
||
_options
.
keyboardSupport
)
{
const
controller
=
new
KeyboardController
(
this
,
this
.
view
,
_options
);
this
.
disposables
.
push
(
controller
);
this
.
disposables
.
add
(
controller
);
}
if
(
_options
.
keyboardNavigationLabelProvider
)
{
this
.
typeLabelController
=
new
TypeLabelController
(
this
,
this
.
view
,
_options
.
keyboardNavigationLabelProvider
);
this
.
disposables
.
push
(
this
.
typeLabelController
);
this
.
disposables
.
add
(
this
.
typeLabelController
);
}
this
.
disposables
.
push
(
this
.
createMouseController
(
_options
));
this
.
disposables
.
add
(
this
.
createMouseController
(
_options
));
this
.
onFocusChange
(
this
.
_onFocusChange
,
this
,
this
.
disposables
);
this
.
onSelectionChange
(
this
.
_onSelectionChange
,
this
,
this
.
disposables
);
...
...
@@ -1610,7 +1611,7 @@ export class List<T> implements ISpliceable<T>, IDisposable {
dispose
():
void
{
this
.
_onDidDispose
.
fire
();
this
.
disposables
=
dispose
(
this
.
disposables
);
this
.
disposables
.
dispose
(
);
this
.
_onDidOpen
.
dispose
();
this
.
_onPin
.
dispose
();
...
...
src/vs/base/common/event.ts
浏览文件 @
1da98a12
...
...
@@ -271,7 +271,7 @@ export namespace Event {
filter
(
fn
:
(
e
:
T
)
=>
boolean
):
IChainableEvent
<
T
>
;
reduce
<
R
>
(
merge
:
(
last
:
R
|
undefined
,
event
:
T
)
=>
R
,
initial
?:
R
):
IChainableEvent
<
R
>
;
latch
():
IChainableEvent
<
T
>
;
on
(
listener
:
(
e
:
T
)
=>
any
,
thisArgs
?:
any
,
disposables
?:
IDisposable
[]):
IDisposable
;
on
(
listener
:
(
e
:
T
)
=>
any
,
thisArgs
?:
any
,
disposables
?:
IDisposable
[]
|
DisposableStore
):
IDisposable
;
once
(
listener
:
(
e
:
T
)
=>
any
,
thisArgs
?:
any
,
disposables
?:
IDisposable
[]):
IDisposable
;
}
...
...
@@ -299,7 +299,7 @@ export namespace Event {
return
new
ChainableEvent
(
latch
(
this
.
event
));
}
on
(
listener
:
(
e
:
T
)
=>
any
,
thisArgs
:
any
,
disposables
:
IDisposable
[])
{
on
(
listener
:
(
e
:
T
)
=>
any
,
thisArgs
:
any
,
disposables
:
IDisposable
[]
|
DisposableStore
)
{
return
this
.
event
(
listener
,
thisArgs
,
disposables
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录