Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
bf95ef6e
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,发现更多精彩内容 >>
提交
bf95ef6e
编写于
4月 12, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
minor fixes
上级
b7c5e104
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
4 deletion
+5
-4
src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts
.../contrib/extensions/electron-browser/extensionsActions.ts
+4
-3
src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts
...nch/contrib/extensions/node/extensionsWorkbenchService.ts
+1
-1
未找到文件。
src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts
浏览文件 @
bf95ef6e
...
...
@@ -179,7 +179,7 @@ export class InstallAction extends ExtensionAction {
return
;
}
this
.
enabled
=
this
.
extensionsWorkbenchService
.
canInstall
(
this
.
extension
)
&&
this
.
extension
.
state
===
ExtensionState
.
Uninstalled
;
this
.
enabled
=
this
.
extensionsWorkbenchService
.
canInstall
(
this
.
extension
)
&&
!
this
.
extensionsWorkbenchService
.
local
.
some
(
e
=>
areSameExtensions
(
e
.
identifier
,
this
.
extension
.
identifier
))
;
this
.
class
=
this
.
extension
.
state
===
ExtensionState
.
Installing
?
InstallAction
.
InstallingClass
:
InstallAction
.
Class
;
this
.
updateLabel
();
}
...
...
@@ -1174,9 +1174,10 @@ export class ReloadAction extends ExtensionAction {
}
const
isUninstalled
=
this
.
extension
.
state
===
ExtensionState
.
Uninstalled
;
const
runningExtension
=
this
.
_runningExtensions
.
filter
(
e
=>
areSameExtensions
({
id
:
e
.
identifier
.
value
},
this
.
extension
.
identifier
))[
0
];
const
isSameExtensionRunning
=
runningExtension
&&
this
.
extension
.
server
===
this
.
extensionManagementServerService
.
getExtensionManagementServer
(
runningExtension
.
extensionLocation
);
if
(
isUninstalled
)
{
if
(
runningExtension
)
{
if
(
isSameExtensionRunning
)
{
this
.
enabled
=
true
;
this
.
label
=
localize
(
'
reloadRequired
'
,
"
Reload Required
"
);
this
.
tooltip
=
localize
(
'
postUninstallTooltip
'
,
"
Please reload Visual Studio Code to complete the uninstallation of this extension.
"
);
...
...
@@ -1188,7 +1189,6 @@ export class ReloadAction extends ExtensionAction {
const
isEnabled
=
this
.
extensionEnablementService
.
isEnabled
(
this
.
extension
.
local
);
if
(
runningExtension
)
{
// Extension is running
const
isSameExtensionRunning
=
this
.
extension
.
server
===
this
.
extensionManagementServerService
.
getExtensionManagementServer
(
runningExtension
.
extensionLocation
);
const
isSameVersionRunning
=
isSameExtensionRunning
&&
this
.
extension
.
version
===
runningExtension
.
version
;
if
(
isEnabled
)
{
if
(
!
isSameVersionRunning
&&
!
this
.
extensionService
.
canAddExtension
(
toExtensionDescription
(
this
.
extension
.
local
)))
{
...
...
@@ -2458,6 +2458,7 @@ export class StatusLabelAction extends Action implements IExtensionContainer {
return
canAddExtension
()
?
this
.
initialStatus
===
ExtensionState
.
Installed
?
localize
(
'
updated
'
,
"
Updated
"
)
:
localize
(
'
installed
'
,
"
Installed
"
)
:
null
;
}
if
(
currentStatus
===
ExtensionState
.
Uninstalling
&&
this
.
status
===
ExtensionState
.
Uninstalled
)
{
this
.
initialStatus
=
this
.
status
;
return
canRemoveExtension
()
?
localize
(
'
uninstalled
'
,
"
Uninstalled
"
)
:
null
;
}
}
...
...
src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts
浏览文件 @
bf95ef6e
...
...
@@ -679,7 +679,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
}
private
fromGallery
(
gallery
:
IGalleryExtension
,
maliciousExtensionSet
:
Set
<
string
>
):
IExtension
{
Promise
.
all
([
this
.
localExtensions
.
syncLocalWithGalleryExtension
(
gallery
,
maliciousExtensionSet
),
this
.
remoteExtensions
?
this
.
local
Extensions
.
syncLocalWithGalleryExtension
(
gallery
,
maliciousExtensionSet
)
:
Promise
.
resolve
(
false
)])
Promise
.
all
([
this
.
localExtensions
.
syncLocalWithGalleryExtension
(
gallery
,
maliciousExtensionSet
),
this
.
remoteExtensions
?
this
.
remote
Extensions
.
syncLocalWithGalleryExtension
(
gallery
,
maliciousExtensionSet
)
:
Promise
.
resolve
(
false
)])
.
then
(
result
=>
{
if
(
result
[
0
]
||
result
[
1
])
{
this
.
eventuallyAutoUpdateExtensions
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录