Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
95454586
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,发现更多精彩内容 >>
提交
95454586
编写于
4月 09, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update the extension when it is not from a server
上级
ee30d444
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
4 deletion
+20
-4
src/vs/workbench/contrib/extensions/electron-browser/extensionsList.ts
...nch/contrib/extensions/electron-browser/extensionsList.ts
+8
-2
src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts
...nch/contrib/extensions/node/extensionsWorkbenchService.ts
+12
-2
未找到文件。
src/vs/workbench/contrib/extensions/electron-browser/extensionsList.ts
浏览文件 @
95454586
...
...
@@ -12,7 +12,7 @@ import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
import
{
IPagedRenderer
}
from
'
vs/base/browser/ui/list/listPaging
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
domEvent
}
from
'
vs/base/browser/event
'
;
import
{
IExtension
,
ExtensionContainers
}
from
'
vs/workbench/contrib/extensions/common/extensions
'
;
import
{
IExtension
,
ExtensionContainers
,
ExtensionState
,
IExtensionsWorkbenchService
}
from
'
vs/workbench/contrib/extensions/common/extensions
'
;
import
{
InstallAction
,
UpdateAction
,
ManageExtensionAction
,
ReloadAction
,
MaliciousStatusLabelAction
,
ExtensionActionItem
,
StatusLabelAction
,
RemoteInstallAction
}
from
'
vs/workbench/contrib/extensions/electron-browser/extensionsActions
'
;
import
{
areSameExtensions
}
from
'
vs/platform/extensionManagement/common/extensionManagementUtil
'
;
import
{
Label
,
RatingsWidget
,
InstallCountWidget
,
RecommendationWidget
,
RemoteBadgeWidget
}
from
'
vs/workbench/contrib/extensions/electron-browser/extensionsWidgets
'
;
...
...
@@ -54,7 +54,8 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
@
IInstantiationService
private
readonly
instantiationService
:
IInstantiationService
,
@
INotificationService
private
readonly
notificationService
:
INotificationService
,
@
IExtensionService
private
readonly
extensionService
:
IExtensionService
,
@
IExtensionManagementServerService
private
readonly
extensionManagementServerService
:
IExtensionManagementServerService
@
IExtensionManagementServerService
private
readonly
extensionManagementServerService
:
IExtensionManagementServerService
,
@
IExtensionsWorkbenchService
private
readonly
extensionsWorkbenchService
:
IExtensionsWorkbenchService
)
{
}
get
templateId
()
{
return
'
extension
'
;
}
...
...
@@ -133,6 +134,11 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
renderElement
(
extension
:
IExtension
,
index
:
number
,
data
:
ITemplateData
):
void
{
removeClass
(
data
.
element
,
'
loading
'
);
if
(
extension
.
state
!==
ExtensionState
.
Uninstalled
&&
!
extension
.
server
)
{
// Get the extension if it is installed and has no server information
extension
=
this
.
extensionsWorkbenchService
.
local
.
filter
(
e
=>
e
.
server
===
extension
.
server
&&
areSameExtensions
(
e
.
identifier
,
extension
.
identifier
))[
0
]
||
extension
;
}
data
.
extensionDisposables
=
dispose
(
data
.
extensionDisposables
);
const
updateEnablement
=
async
()
=>
{
...
...
src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts
浏览文件 @
95454586
...
...
@@ -502,7 +502,7 @@ class Extensions extends Disposable {
}
}
private
getExtensionState
(
extension
:
Extension
):
ExtensionState
{
getExtensionState
(
extension
:
Extension
):
ExtensionState
{
if
(
extension
.
gallery
&&
this
.
installing
.
some
(
e
=>
!!
e
.
gallery
&&
areSameExtensions
(
e
.
gallery
.
identifier
,
extension
.
gallery
!
.
identifier
)))
{
return
ExtensionState
.
Installing
;
}
...
...
@@ -680,7 +680,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
if
(
installed
)
{
return
installed
;
}
const
extension
=
new
Extension
(
this
.
galleryService
,
ext
=>
ExtensionState
.
Uninstalled
,
undefined
,
undefined
,
gallery
,
this
.
telemetryService
,
this
.
logService
,
this
.
fileService
);
const
extension
=
new
Extension
(
this
.
galleryService
,
ext
=>
this
.
getExtensionState
(
ext
)
,
undefined
,
undefined
,
gallery
,
this
.
telemetryService
,
this
.
logService
,
this
.
fileService
);
if
(
maliciousExtensionSet
.
has
(
extension
.
identifier
.
id
))
{
extension
.
isMalicious
=
true
;
}
...
...
@@ -702,6 +702,16 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
return
null
;
}
private
getExtensionState
(
extension
:
Extension
):
ExtensionState
{
if
(
this
.
remoteExtensions
)
{
const
state
=
this
.
remoteExtensions
.
getExtensionState
(
extension
);
if
(
state
!==
ExtensionState
.
Uninstalled
)
{
return
state
;
}
}
return
this
.
localExtensions
.
getExtensionState
(
extension
);
}
checkForUpdates
():
Promise
<
void
>
{
return
Promise
.
resolve
(
this
.
syncDelayer
.
trigger
(()
=>
this
.
syncWithGallery
(),
0
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录