Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
79c18d8d
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,发现更多精彩内容 >>
提交
79c18d8d
编写于
2月 14, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
notifications - introduce and use model
上级
14f73a9b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
200 addition
and
82 deletion
+200
-82
src/vs/workbench/browser/parts/notifications/notificationList.ts
...workbench/browser/parts/notifications/notificationList.ts
+53
-48
src/vs/workbench/common/notifications.ts
src/vs/workbench/common/notifications.ts
+123
-22
src/vs/workbench/electron-browser/workbench.ts
src/vs/workbench/electron-browser/workbench.ts
+2
-2
src/vs/workbench/services/notification/common/notificationService.ts
...bench/services/notification/common/notificationService.ts
+22
-10
未找到文件。
src/vs/workbench/browser/parts/notifications/notificationList.ts
浏览文件 @
79c18d8d
...
...
@@ -6,7 +6,7 @@
'
use strict
'
;
import
'
vs/css!./media/notificationList
'
;
import
{
addClass
}
from
'
vs/base/browser/dom
'
;
import
{
addClass
,
removeClass
}
from
'
vs/base/browser/dom
'
;
import
{
WorkbenchList
}
from
'
vs/platform/list/browser/listService
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IListOptions
}
from
'
vs/base/browser/ui/list/listWidget
'
;
...
...
@@ -14,28 +14,45 @@ import { localize } from 'vs/nls';
import
{
Themable
}
from
'
vs/workbench/common/theme
'
;
import
{
IThemeService
,
registerThemingParticipant
,
ITheme
,
ICssStyleCollector
}
from
'
vs/platform/theme/common/themeService
'
;
import
{
contrastBorder
,
widgetShadow
,
textLinkForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
INotification
,
INotificationHandle
}
from
'
vs/platform/notification/common/notification
'
;
import
{
INotificationViewItem
,
NotificationViewItem
}
from
'
vs/workbench/common/notifications
'
;
import
{
INotificationHandler
}
from
'
vs/workbench/services/notification/common/notificationService
'
;
import
{
INotificationViewItem
,
INotificationsModel
,
INotificationChangeEvent
,
NotificationChangeType
}
from
'
vs/workbench/common/notifications
'
;
import
{
NotificationsListDelegate
,
NotificationRenderer
}
from
'
vs/workbench/browser/parts/notifications/notificationViewer
'
;
import
{
Severity
}
from
'
vs/platform/message/common/message
'
;
import
{
alert
}
from
'
vs/base/browser/ui/aria/aria
'
;
export
class
NotificationList
extends
Themable
implements
INotificationHandler
{
private
static
NO_OP_NOTIFICATION
:
INotificationHandle
=
{
dispose
:
()
=>
void
0
};
export
class
NotificationList
extends
Themable
{
private
listContainer
:
HTMLElement
;
private
list
:
WorkbenchList
<
INotificationViewItem
>
;
constructor
(
private
container
:
HTMLElement
,
private
model
:
INotificationsModel
,
@
IInstantiationService
private
instantiationService
:
IInstantiationService
,
@
IThemeService
themeService
:
IThemeService
)
{
super
(
themeService
);
this
.
create
();
// Show initial notifications if any
this
.
onNotificationsAdded
(
0
,
model
.
notifications
);
this
.
registerListeners
();
}
private
registerListeners
():
void
{
this
.
toUnbind
.
push
(
this
.
model
.
onDidNotificationsChange
(
e
=>
this
.
onDidNotificationsChange
(
e
)));
}
private
onDidNotificationsChange
(
e
:
INotificationChangeEvent
):
void
{
switch
(
e
.
kind
)
{
case
NotificationChangeType
.
ADD
:
return
this
.
onNotificationsAdded
(
e
.
index
,
[
e
.
item
]);
case
NotificationChangeType
.
CHANGE
:
return
this
.
onNotificationChanged
(
e
.
index
,
e
.
item
);
case
NotificationChangeType
.
REMOVE
:
return
this
.
onNotificationRemoved
(
e
.
index
,
e
.
item
);
}
}
protected
updateStyles
():
void
{
...
...
@@ -66,65 +83,53 @@ export class NotificationList extends Themable implements INotificationHandler {
[
renderer
],
{
ariaLabel
:
localize
(
'
notificationsList
'
,
"
Notifications List
"
),
openController
:
{
shouldOpen
:
e
=>
this
.
shouldExpand
(
e
)
}
multipleSelectionSupport
:
true
}
as
IListOptions
<
INotificationViewItem
>
);
this
.
toUnbind
.
push
(
this
.
list
);
// Expand/Collapse
this
.
list
.
onOpen
(
e
=>
{
const
notification
=
e
.
elements
[
0
];
const
index
=
e
.
indexes
[
0
];
if
(
notification
.
canCollapse
)
{
if
(
notification
.
expanded
)
{
notification
.
collapse
();
}
else
{
notification
.
expand
();
}
}
this
.
list
.
splice
(
index
,
1
,
[
notification
]);
this
.
list
.
layout
();
this
.
list
.
setSelection
([
index
]);
this
.
list
.
setFocus
([
index
]);
setTimeout
(()
=>
this
.
list
.
domFocus
());
// TODO@notification why?
});
this
.
container
.
appendChild
(
this
.
listContainer
);
this
.
updateStyles
();
}
private
shouldExpand
(
event
:
UIEvent
):
boolean
{
const
target
=
event
.
target
as
HTMLElement
;
if
(
target
.
tagName
.
toLowerCase
()
===
'
a
'
)
{
return
false
;
// do not overwrite links/buttons
}
private
onNotificationsAdded
(
index
:
number
,
items
:
INotificationViewItem
[]):
void
{
return
true
;
// Support in Screen Readers too
items
.
forEach
(
item
=>
this
.
ariaAlert
(
item
));
// Update list
this
.
updateNotificationsList
(
index
,
0
,
items
);
}
public
show
(
notification
:
INotification
):
INotificationHandle
{
const
viewItem
=
NotificationViewItem
.
create
(
notification
);
if
(
!
viewItem
)
{
return
NotificationList
.
NO_OP_NOTIFICATION
;
}
private
onNotificationChanged
(
index
:
number
,
item
:
INotificationViewItem
):
void
{
this
.
updateNotificationsList
(
index
,
1
,
[
item
]);
}
// Support in Screen Readers too
this
.
ariaAlert
(
viewItem
);
private
onNotificationRemoved
(
index
:
number
,
item
:
INotificationViewItem
):
void
{
this
.
updateNotificationsList
(
index
,
1
);
}
viewItem
.
onDidExpansionChange
(()
=>
{
// TODO expand/collapse using model index
});
// TODO@Notification dispose
private
updateNotificationsList
(
start
:
number
,
deleteCount
:
number
,
items
:
INotificationViewItem
[]
=
[])
{
addClass
(
this
.
listContainer
,
'
visible
'
);
// Ensure visibility is proper
if
(
this
.
model
.
notifications
.
length
>
0
)
{
this
.
show
();
}
else
{
this
.
hide
();
}
this
.
list
.
splice
(
0
,
0
,
[
viewItem
]);
// Update list
this
.
list
.
splice
(
start
,
deleteCount
,
items
);
this
.
list
.
layout
();
}
private
show
():
void
{
addClass
(
this
.
listContainer
,
'
visible
'
);
}
return
viewItem
;
// TODO@notification what if message replaced with other?
private
hide
():
void
{
removeClass
(
this
.
listContainer
,
'
visible
'
);
}
private
ariaAlert
(
notifiation
:
INotificationViewItem
):
void
{
...
...
src/vs/workbench/common/notifications.ts
浏览文件 @
79c18d8d
...
...
@@ -8,29 +8,119 @@
import
{
Severity
}
from
'
vs/platform/message/common/message
'
;
import
{
IMarkdownString
}
from
'
vs/base/common/htmlContent
'
;
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
INotification
}
from
'
vs/platform/notification/common/notification
'
;
import
{
INotification
,
INotificationHandle
}
from
'
vs/platform/notification/common/notification
'
;
import
{
toErrorMessage
}
from
'
vs/base/common/errorMessage
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
Event
,
{
Emitter
,
once
}
from
'
vs/base/common/event
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
export
class
INotificationsModel
{
export
interface
INotificationsModel
{
readonly
notifications
:
INotificationViewItem
[];
readonly
onDidNotificationsChange
:
Event
<
INotificationChangeEvent
>
;
notify
(
notification
:
INotification
):
INotificationHandle
;
}
export
enum
NotificationChangeType
{
ADD
,
CHANGE
,
REMOVE
}
export
interface
INotificationChangeEvent
{
index
:
number
;
item
:
INotificationViewItem
;
kind
:
NotificationChangeType
;
}
class
NoOpNotification
implements
INotificationHandle
{
dispose
()
{
}
}
export
class
NotificationsModel
implements
INotificationsModel
{
private
static
NO_OP_NOTIFICATION
=
new
NoOpNotification
();
private
_notifications
:
INotificationViewItem
[];
private
_onDidNotificationsChange
:
Emitter
<
INotificationChangeEvent
>
;
private
toDispose
:
IDisposable
[];
constructor
()
{
this
.
_notifications
=
[];
this
.
toDispose
=
[];
this
.
_onDidNotificationsChange
=
new
Emitter
<
INotificationChangeEvent
>
();
this
.
toDispose
.
push
(
this
.
_onDidNotificationsChange
);
}
public
get
notifications
():
INotificationViewItem
[]
{
return
this
.
_notifications
;
}
public
get
onDidNotificationsChange
():
Event
<
INotificationChangeEvent
>
{
return
this
.
_onDidNotificationsChange
.
event
;
}
public
notify
(
notification
:
INotification
):
INotificationHandle
{
const
item
=
this
.
createViewItem
(
notification
);
if
(
item
instanceof
NoOpNotification
)
{
return
item
;
// return early if this is a no-op
}
// Add to list as first entry (TODO@notification dedupe!)
this
.
_notifications
.
splice
(
0
,
0
,
item
);
// Events
this
.
_onDidNotificationsChange
.
fire
({
item
,
index
:
0
,
kind
:
NotificationChangeType
.
ADD
});
return
item
;
}
private
createViewItem
(
notification
:
INotification
):
INotificationViewItem
|
NoOpNotification
{
const
item
=
NotificationViewItem
.
create
(
notification
);
if
(
!
item
)
{
return
NotificationsModel
.
NO_OP_NOTIFICATION
;
}
// Item Events
const
itemChangeListener
=
item
.
onDidChange
(()
=>
{
const
index
=
this
.
_notifications
.
indexOf
(
item
);
if
(
index
>=
0
)
{
this
.
_onDidNotificationsChange
.
fire
({
item
,
index
,
kind
:
NotificationChangeType
.
CHANGE
});
}
});
once
(
item
.
onDidDispose
)(()
=>
{
itemChangeListener
.
dispose
();
const
index
=
this
.
_notifications
.
indexOf
(
item
);
if
(
index
>=
0
)
{
this
.
_notifications
.
splice
(
index
,
1
);
this
.
_onDidNotificationsChange
.
fire
({
item
,
index
,
kind
:
NotificationChangeType
.
REMOVE
});
}
});
return
item
;
}
public
dispose
():
void
{
this
.
toDispose
=
dispose
(
this
.
toDispose
);
}
}
export
interface
INotificationViewItem
{
readonly
severity
:
Severity
;
readonly
message
:
IMarkdownString
;
readonly
expanded
:
boolean
;
readonly
canCollapse
:
boolean
;
readonly
source
:
string
;
readonly
actions
:
IAction
[];
readonly
onDidExpansionChange
:
Event
<
void
>
;
readonly
expanded
:
boolean
;
readonly
canCollapse
:
boolean
;
readonly
onDidChange
:
Event
<
void
>
;
readonly
onDidDispose
:
Event
<
void
>
;
expand
():
void
;
collapse
():
void
;
...
...
@@ -44,21 +134,9 @@ export class NotificationViewItem implements INotificationViewItem {
private
_expanded
:
boolean
;
private
toDispose
:
IDisposable
[];
private
_onDidExpansionChange
;
constructor
(
private
_severity
:
Severity
,
private
_message
:
IMarkdownString
,
private
_source
:
string
,
private
_actions
:
IAction
[])
{
this
.
toDispose
=
[];
this
.
_expanded
=
_actions
.
length
>
0
;
this
.
_onDidExpansionChange
=
new
Emitter
<
void
>
();
this
.
toDispose
.
push
(
this
.
_onDidExpansionChange
);
this
.
toDispose
.
push
(...
_actions
);
}
public
get
onDidExpansionChange
():
Event
<
void
>
{
return
this
.
_onDidExpansionChange
.
event
;
}
private
_onDidChange
:
Emitter
<
void
>
;
private
_onDidDispose
:
Emitter
<
void
>
;
public
static
create
(
notification
:
INotification
):
INotificationViewItem
{
if
(
!
notification
||
!
notification
.
message
)
{
...
...
@@ -81,6 +159,27 @@ export class NotificationViewItem implements INotificationViewItem {
return
new
NotificationViewItem
(
notification
.
severity
,
message
,
notification
.
source
||
NotificationViewItem
.
DEFAULT_SOURCE
,
notification
.
actions
||
[]);
}
private
constructor
(
private
_severity
:
Severity
,
private
_message
:
IMarkdownString
,
private
_source
:
string
,
private
_actions
:
IAction
[])
{
this
.
toDispose
=
[];
this
.
_expanded
=
_actions
.
length
>
0
;
this
.
_onDidChange
=
new
Emitter
<
void
>
();
this
.
toDispose
.
push
(
this
.
_onDidChange
);
this
.
_onDidDispose
=
new
Emitter
<
void
>
();
this
.
toDispose
.
push
(
this
.
_onDidDispose
);
this
.
toDispose
.
push
(...
_actions
);
}
public
get
onDidChange
():
Event
<
void
>
{
return
this
.
_onDidChange
.
event
;
}
public
get
onDidDispose
():
Event
<
void
>
{
return
this
.
_onDidDispose
.
event
;
}
public
get
canCollapse
():
boolean
{
return
this
.
_actions
.
length
===
0
;
}
...
...
@@ -107,15 +206,17 @@ export class NotificationViewItem implements INotificationViewItem {
public
expand
():
void
{
this
.
_expanded
=
true
;
this
.
_onDid
Expansion
Change
.
fire
();
this
.
_onDidChange
.
fire
();
}
public
collapse
():
void
{
this
.
_expanded
=
false
;
this
.
_onDid
Expansion
Change
.
fire
();
this
.
_onDidChange
.
fire
();
}
public
dispose
():
void
{
this
.
_onDidDispose
.
fire
();
this
.
toDispose
=
dispose
(
this
.
toDispose
);
}
}
\ No newline at end of file
src/vs/workbench/electron-browser/workbench.ts
浏览文件 @
79c18d8d
...
...
@@ -1245,8 +1245,8 @@ export class Workbench implements IPartService {
}
private
createNotificationsList
():
void
{
const
notificationsList
=
this
.
instantiationService
.
createInstance
(
NotificationList
,
this
.
workbench
.
getHTMLElement
());
this
.
notificationService
.
setHandler
(
notificationsList
);
const
notificationsList
=
this
.
instantiationService
.
createInstance
(
NotificationList
,
this
.
workbench
.
getHTMLElement
()
,
this
.
notificationService
.
model
);
this
.
toUnbind
.
push
(
notificationsList
);
}
public
getInstantiationService
():
IInstantiationService
{
...
...
src/vs/workbench/services/notification/common/notificationService.ts
浏览文件 @
79c18d8d
...
...
@@ -8,21 +8,34 @@
import
{
INotificationService
,
INotification
,
INotificationHandle
}
from
'
vs/platform/notification/common/notification
'
;
import
{
Severity
}
from
'
vs/platform/message/common/message
'
;
import
{
Action
}
from
'
vs/base/common/actions
'
;
export
interface
INotificationHandler
{
show
(
notification
:
INotification
):
INotificationHandle
;
}
import
{
INotificationsModel
,
NotificationsModel
}
from
'
vs/workbench/common/notifications
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
export
class
NotificationService
implements
INotificationService
{
public
_serviceBrand
:
any
;
private
handler
:
INotificationHandler
;
private
_model
:
INotificationsModel
;
private
toDispose
:
IDisposable
[];
constructor
(
container
:
HTMLElement
)
{
this
.
toDispose
=
[];
const
model
=
new
NotificationsModel
();
this
.
toDispose
.
push
(
model
);
this
.
_model
=
model
;
// TODO@notification remove me
this
.
showFakeNotifications
();
}
public
get
model
():
INotificationsModel
{
return
this
.
_model
;
}
private
showFakeNotifications
():
void
{
setTimeout
(()
=>
{
this
.
notify
({
severity
:
Severity
.
Info
,
...
...
@@ -43,12 +56,11 @@ export class NotificationService implements INotificationService {
},
500
);
}
public
setHandler
(
handler
:
INotificationHandler
):
void
{
this
.
handler
=
handler
;
// TODO@notification release buffered
public
notify
(
notification
:
INotification
):
INotificationHandle
{
return
this
.
model
.
notify
(
notification
);
}
public
notify
(
notification
:
INotification
):
INotificationHandle
{
return
this
.
handler
.
show
(
notification
);
public
dispose
():
void
{
this
.
toDispose
=
dispose
(
this
.
toDispose
);
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录