Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
799cab9e
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,发现更多精彩内容 >>
提交
799cab9e
编写于
1月 23, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix null checks
上级
9cc66db3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
25 deletion
+17
-25
src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
...bench/parts/extensions/node/extensionsWorkbenchService.ts
+17
-25
未找到文件。
src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
浏览文件 @
799cab9e
...
...
@@ -59,7 +59,7 @@ class Extension implements IExtension {
}
get
name
():
string
{
return
this
.
gallery
?
this
.
gallery
.
name
:
this
.
local
.
manifest
.
name
;
return
this
.
gallery
?
this
.
gallery
.
name
:
this
.
local
!
.
manifest
.
name
;
}
get
displayName
():
string
{
...
...
@@ -67,22 +67,22 @@ class Extension implements IExtension {
return
this
.
gallery
.
displayName
||
this
.
gallery
.
name
;
}
return
this
.
local
.
manifest
.
displayName
||
this
.
local
.
manifest
.
name
;
return
this
.
local
!
.
manifest
.
displayName
||
this
.
local
!
.
manifest
.
name
;
}
get
identifier
():
IExtensionIdentifier
{
if
(
this
.
gallery
)
{
return
this
.
gallery
.
identifier
;
}
return
this
.
local
.
identifier
;
return
this
.
local
!
.
identifier
;
}
get
uuid
():
string
|
undefined
{
return
this
.
gallery
?
this
.
gallery
.
identifier
.
uuid
:
this
.
local
.
identifier
.
uuid
;
return
this
.
gallery
?
this
.
gallery
.
identifier
.
uuid
:
this
.
local
!
.
identifier
.
uuid
;
}
get
publisher
():
string
{
return
this
.
gallery
?
this
.
gallery
.
publisher
:
this
.
local
.
manifest
.
publisher
;
return
this
.
gallery
?
this
.
gallery
.
publisher
:
this
.
local
!
.
manifest
.
publisher
;
}
get
publisherDisplayName
():
string
{
...
...
@@ -90,11 +90,11 @@ class Extension implements IExtension {
return
this
.
gallery
.
publisherDisplayName
||
this
.
gallery
.
publisher
;
}
if
(
this
.
local
.
metadata
&&
this
.
local
.
metadata
.
publisherDisplayName
)
{
return
this
.
local
.
metadata
.
publisherDisplayName
;
if
(
this
.
local
!
.
metadata
&&
this
.
local
!
.
metadata
.
publisherDisplayName
)
{
return
this
.
local
!
.
metadata
.
publisherDisplayName
;
}
return
this
.
local
.
manifest
.
publisher
;
return
this
.
local
!
.
manifest
.
publisher
;
}
get
version
():
string
{
...
...
@@ -102,11 +102,11 @@ class Extension implements IExtension {
}
get
latestVersion
():
string
{
return
this
.
gallery
?
this
.
gallery
.
version
:
this
.
local
.
manifest
.
version
;
return
this
.
gallery
?
this
.
gallery
.
version
:
this
.
local
!
.
manifest
.
version
;
}
get
description
():
string
{
return
this
.
gallery
?
this
.
gallery
.
description
:
this
.
local
.
manifest
.
description
||
''
;
return
this
.
gallery
?
this
.
gallery
.
description
:
this
.
local
!
.
manifest
.
description
||
''
;
}
get
url
():
string
|
undefined
{
...
...
@@ -141,7 +141,7 @@ class Extension implements IExtension {
}
private
get
defaultIconUrl
():
string
{
if
(
this
.
type
===
ExtensionType
.
System
)
{
if
(
this
.
type
===
ExtensionType
.
System
&&
this
.
local
)
{
if
(
this
.
local
.
manifest
&&
this
.
local
.
manifest
.
contributes
)
{
if
(
Array
.
isArray
(
this
.
local
.
manifest
.
contributes
.
themes
)
&&
this
.
local
.
manifest
.
contributes
.
themes
.
length
)
{
return
require
.
toUrl
(
'
../electron-browser/media/theme-icon.png
'
);
...
...
@@ -190,7 +190,7 @@ class Extension implements IExtension {
if
(
gallery
)
{
return
getGalleryExtensionTelemetryData
(
gallery
);
}
else
{
return
getLocalExtensionTelemetryData
(
local
);
return
getLocalExtensionTelemetryData
(
local
!
);
}
}
...
...
@@ -211,7 +211,7 @@ class Extension implements IExtension {
return
Promise
.
resolve
(
null
);
}
return
Promise
.
resolve
(
this
.
local
.
manifest
);
return
Promise
.
resolve
(
this
.
local
!
.
manifest
);
}
hasReadme
():
boolean
{
...
...
@@ -655,12 +655,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
}
uninstall
(
extension
:
IExtension
):
Promise
<
void
>
{
if
(
!
(
extension
instanceof
Extension
))
{
return
Promise
.
resolve
();
}
const
ext
=
extension
as
Extension
;
const
toUninstall
:
ILocalExtension
=
ext
.
local
?
ext
.
local
:
this
.
installed
.
filter
(
e
=>
areSameExtensions
(
e
.
identifier
,
extension
.
identifier
))[
0
].
local
;
const
ext
=
extension
.
local
?
extension
:
this
.
installed
.
filter
(
e
=>
areSameExtensions
(
e
.
identifier
,
extension
.
identifier
))[
0
];
const
toUninstall
:
ILocalExtension
|
null
=
ext
&&
ext
.
local
?
ext
.
local
:
null
;
if
(
!
toUninstall
)
{
return
Promise
.
reject
(
new
Error
(
'
Missing local
'
));
...
...
@@ -700,12 +696,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService,
}
reinstall
(
extension
:
IExtension
):
Promise
<
void
>
{
if
(
!
(
extension
instanceof
Extension
))
{
return
Promise
.
resolve
();
}
const
ext
=
extension
as
Extension
;
const
toReinstall
:
ILocalExtension
=
ext
.
local
?
ext
.
local
:
this
.
installed
.
filter
(
e
=>
areSameExtensions
(
e
.
identifier
,
extension
.
identifier
))[
0
].
local
;
const
ext
=
extension
.
local
?
extension
:
this
.
installed
.
filter
(
e
=>
areSameExtensions
(
e
.
identifier
,
extension
.
identifier
))[
0
];
const
toReinstall
:
ILocalExtension
|
null
=
ext
&&
ext
.
local
?
ext
.
local
:
null
;
if
(
!
toReinstall
)
{
return
Promise
.
reject
(
new
Error
(
'
Missing local
'
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录