Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1f618a27
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,体验更适合开发者的 AI 搜索 >>
提交
1f618a27
编写于
1月 09, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add IProgressNotificationOptions#delay, #87449
上级
9b3d137c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
15 deletion
+27
-15
src/vs/platform/progress/common/progress.ts
src/vs/platform/progress/common/progress.ts
+1
-0
src/vs/workbench/services/progress/browser/progressService.ts
...vs/workbench/services/progress/browser/progressService.ts
+26
-15
未找到文件。
src/vs/platform/progress/common/progress.ts
浏览文件 @
1f618a27
...
...
@@ -57,6 +57,7 @@ export interface IProgressNotificationOptions extends IProgressOptions {
readonly
location
:
ProgressLocation
.
Notification
;
readonly
primaryActions
?:
ReadonlyArray
<
IAction
>
;
readonly
secondaryActions
?:
ReadonlyArray
<
IAction
>
;
delay
?:
number
;
}
export
interface
IProgressWindowOptions
extends
IProgressOptions
{
...
...
src/vs/workbench/services/progress/browser/progressService.ts
浏览文件 @
1f618a27
...
...
@@ -146,10 +146,7 @@ export class ProgressService extends Disposable implements IProgressService {
private
withNotificationProgress
<
P
extends
Promise
<
R
>
,
R
=
unknown
>
(
options
:
IProgressNotificationOptions
,
callback
:
(
progress
:
IProgress
<
{
message
?:
string
,
increment
?:
number
}
>
)
=>
P
,
onDidCancel
?:
(
choice
?:
number
)
=>
void
):
P
{
const
toDispose
=
new
DisposableStore
();
const
createNotification
=
(
message
:
string
|
undefined
,
increment
?:
number
):
INotificationHandle
|
undefined
=>
{
if
(
!
message
)
{
return
undefined
;
// we need a message at least
}
const
createNotification
=
(
message
:
string
,
increment
?:
number
):
INotificationHandle
=>
{
const
primaryActions
=
options
.
primaryActions
?
Array
.
from
(
options
.
primaryActions
)
:
[];
const
secondaryActions
=
options
.
secondaryActions
?
Array
.
from
(
options
.
secondaryActions
)
:
[];
...
...
@@ -222,21 +219,34 @@ export class ProgressService extends Disposable implements IProgressService {
};
let
handle
:
INotificationHandle
|
undefined
;
let
handleSoon
:
any
|
undefined
;
let
titleAndMessage
:
string
|
undefined
;
// hoisted to make sure a delayed notification shows the most recent message
const
updateNotification
=
(
message
?:
string
,
increment
?:
number
):
void
=>
{
if
(
!
handle
)
{
handle
=
createNotification
(
message
,
increment
);
// full message (inital or update)
if
(
message
&&
options
.
title
)
{
titleAndMessage
=
`
${
options
.
title
}
:
${
message
}
`
;
// always prefix with overall title if we have it (https://github.com/Microsoft/vscode/issues/50932)
}
else
{
if
(
typeof
message
===
'
string
'
)
{
let
newMessage
:
string
;
if
(
typeof
options
.
title
===
'
string
'
)
{
newMessage
=
`
${
options
.
title
}
:
${
message
}
`
;
// always prefix with overall title if we have it (https://github.com/Microsoft/vscode/issues/50932)
}
else
{
newMessage
=
message
;
}
titleAndMessage
=
options
.
title
||
message
;
}
handle
.
updateMessage
(
newMessage
);
if
(
!
handle
&&
titleAndMessage
)
{
// create notification now or after a delay
if
(
typeof
options
.
delay
===
'
number
'
&&
options
.
delay
>
0
)
{
if
(
typeof
handleSoon
!==
'
number
'
)
{
handleSoon
=
setTimeout
(()
=>
handle
=
createNotification
(
titleAndMessage
!
,
increment
),
options
.
delay
);
}
}
else
{
handle
=
createNotification
(
titleAndMessage
,
increment
);
}
}
if
(
handle
)
{
if
(
titleAndMessage
)
{
handle
.
updateMessage
(
titleAndMessage
);
}
if
(
typeof
increment
===
'
number
'
)
{
updateProgress
(
handle
,
increment
);
}
...
...
@@ -244,7 +254,7 @@ export class ProgressService extends Disposable implements IProgressService {
};
// Show initially
updateNotification
(
options
.
title
);
updateNotification
();
// Update based on progress
const
promise
=
callback
({
...
...
@@ -255,6 +265,7 @@ export class ProgressService extends Disposable implements IProgressService {
// Show progress for at least 800ms and then hide once done or canceled
Promise
.
all
([
timeout
(
800
),
promise
]).
finally
(()
=>
{
clearTimeout
(
handleSoon
);
if
(
handle
)
{
handle
.
close
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录