Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f586943e
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,发现更多精彩内容 >>
提交
f586943e
编写于
9月 27, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
propagate update service errors to UI
fixes #57664 fixes #7426
上级
a7996af3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
20 addition
and
9 deletion
+20
-9
src/vs/platform/update/common/update.ts
src/vs/platform/update/common/update.ts
+2
-2
src/vs/platform/update/electron-main/updateService.darwin.ts
src/vs/platform/update/electron-main/updateService.darwin.ts
+2
-2
src/vs/platform/update/electron-main/updateService.linux.ts
src/vs/platform/update/electron-main/updateService.linux.ts
+1
-1
src/vs/platform/update/electron-main/updateService.win32.ts
src/vs/platform/update/electron-main/updateService.win32.ts
+1
-1
src/vs/workbench/parts/update/electron-browser/update.ts
src/vs/workbench/parts/update/electron-browser/update.ts
+14
-3
未找到文件。
src/vs/platform/update/common/update.ts
浏览文件 @
f586943e
...
...
@@ -54,7 +54,7 @@ export const enum UpdateType {
}
export
type
Uninitialized
=
{
type
:
StateType
.
Uninitialized
};
export
type
Idle
=
{
type
:
StateType
.
Idle
,
updateType
:
UpdateType
};
export
type
Idle
=
{
type
:
StateType
.
Idle
,
updateType
:
UpdateType
,
error
?:
string
;
};
export
type
CheckingForUpdates
=
{
type
:
StateType
.
CheckingForUpdates
,
context
:
any
};
export
type
AvailableForDownload
=
{
type
:
StateType
.
AvailableForDownload
,
update
:
IUpdate
};
export
type
Downloading
=
{
type
:
StateType
.
Downloading
,
update
:
IUpdate
};
...
...
@@ -66,7 +66,7 @@ export type State = Uninitialized | Idle | CheckingForUpdates | AvailableForDown
export
const
State
=
{
Uninitialized
:
{
type
:
StateType
.
Uninitialized
}
as
Uninitialized
,
Idle
:
(
updateType
:
UpdateType
)
=>
({
type
:
StateType
.
Idle
,
updateType
})
as
Idle
,
Idle
:
(
updateType
:
UpdateType
,
error
?:
string
)
=>
({
type
:
StateType
.
Idle
,
updateType
,
error
})
as
Idle
,
CheckingForUpdates
:
(
context
:
any
)
=>
({
type
:
StateType
.
CheckingForUpdates
,
context
}
as
CheckingForUpdates
),
AvailableForDownload
:
(
update
:
IUpdate
)
=>
({
type
:
StateType
.
AvailableForDownload
,
update
}
as
AvailableForDownload
),
Downloading
:
(
update
:
IUpdate
)
=>
({
type
:
StateType
.
Downloading
,
update
}
as
Downloading
),
...
...
src/vs/platform/update/electron-main/updateService.darwin.ts
浏览文件 @
f586943e
...
...
@@ -45,8 +45,8 @@ export class DarwinUpdateService extends AbstractUpdateService {
}
private
onError
(
err
:
string
):
void
{
this
.
logService
.
error
(
'
UpdateService error:
'
,
err
);
this
.
setState
(
State
.
Idle
(
UpdateType
.
Archive
));
this
.
logService
.
error
(
'
UpdateService error:
'
,
err
);
this
.
setState
(
State
.
Idle
(
UpdateType
.
Archive
,
err
));
}
protected
buildUpdateFeedUrl
(
quality
:
string
):
string
|
undefined
{
...
...
src/vs/platform/update/electron-main/updateService.linux.ts
浏览文件 @
f586943e
...
...
@@ -70,7 +70,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
}
*/
this
.
telemetryService
.
publicLog
(
'
update:notAvailable
'
,
{
explicit
:
!!
context
});
this
.
setState
(
State
.
Idle
(
UpdateType
.
Archive
));
this
.
setState
(
State
.
Idle
(
UpdateType
.
Archive
,
err
.
message
||
err
));
});
}
...
...
src/vs/platform/update/electron-main/updateService.win32.ts
浏览文件 @
f586943e
...
...
@@ -182,7 +182,7 @@ export class Win32UpdateService extends AbstractUpdateService {
}
*/
this
.
telemetryService
.
publicLog
(
'
update:notAvailable
'
,
{
explicit
:
!!
context
});
this
.
setState
(
State
.
Idle
(
getUpdateType
()));
this
.
setState
(
State
.
Idle
(
getUpdateType
()
,
err
.
message
||
err
));
});
}
...
...
src/vs/workbench/parts/update/electron-browser/update.ts
浏览文件 @
f586943e
...
...
@@ -24,7 +24,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag
import
{
IUpdateService
,
State
as
UpdateState
,
StateType
,
IUpdate
}
from
'
vs/platform/update/common/update
'
;
import
*
as
semver
from
'
semver
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
INotificationService
,
INotificationHandle
}
from
'
vs/platform/notification/common/notification
'
;
import
{
INotificationService
,
INotificationHandle
,
Severity
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
ReleaseNotesManager
}
from
'
./releaseNotesEditor
'
;
...
...
@@ -179,7 +179,6 @@ export class Win3264BitContribution implements IWorkbenchContribution {
constructor
(
@
IStorageService
storageService
:
IStorageService
,
@
IInstantiationService
instantiationService
:
IInstantiationService
,
@
INotificationService
notificationService
:
INotificationService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
)
{
...
...
@@ -277,7 +276,9 @@ export class UpdateContribution implements IGlobalActivity {
private
onUpdateStateChange
(
state
:
UpdateState
):
void
{
switch
(
state
.
type
)
{
case
StateType
.
Idle
:
if
(
this
.
state
.
type
===
StateType
.
CheckingForUpdates
&&
this
.
state
.
context
&&
this
.
state
.
context
.
windowId
===
this
.
windowService
.
getCurrentWindowId
())
{
if
(
state
.
error
)
{
this
.
onError
(
state
.
error
);
}
else
if
(
this
.
state
.
type
===
StateType
.
CheckingForUpdates
&&
this
.
state
.
context
&&
this
.
state
.
context
.
windowId
===
this
.
windowService
.
getCurrentWindowId
())
{
this
.
onUpdateNotAvailable
();
}
break
;
...
...
@@ -318,6 +319,16 @@ export class UpdateContribution implements IGlobalActivity {
this
.
state
=
state
;
}
private
onError
(
error
:
string
):
void
{
error
=
error
.
replace
(
/See
(
.*
)
for more information/
,
'
See [this link]($1) for more information
'
);
this
.
notificationService
.
notify
({
severity
:
Severity
.
Error
,
message
:
error
,
source
:
nls
.
localize
(
'
update service
'
,
"
Update Service
"
),
});
}
private
onUpdateNotAvailable
():
void
{
this
.
dialogService
.
show
(
severity
.
Info
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录