Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
39020559
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,发现更多精彩内容 >>
提交
39020559
编写于
10月 06, 2016
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Gallery.loadDeps include self if it is a dep in hierarchy
上级
f7c37782
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
9 deletion
+13
-9
src/vs/platform/extensionManagement/node/extensionGalleryService.ts
...tform/extensionManagement/node/extensionGalleryService.ts
+6
-4
src/vs/platform/extensionManagement/node/extensionManagementService.ts
...rm/extensionManagement/node/extensionManagementService.ts
+7
-4
src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchService.ts
...extensions/electron-browser/extensionsWorkbenchService.ts
+0
-1
未找到文件。
src/vs/platform/extensionManagement/node/extensionGalleryService.ts
浏览文件 @
39020559
...
@@ -390,8 +390,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
...
@@ -390,8 +390,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
getAllDependencies
(
extension
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
[]
>
{
getAllDependencies
(
extension
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
[]
>
{
return
this
.
loadCompatibleVersion
(
<
IGalleryExtension
>
extension
)
return
this
.
loadCompatibleVersion
(
<
IGalleryExtension
>
extension
)
.
then
(
compatible
=>
this
.
getDependenciesReccursively
(
compatible
.
properties
.
dependencies
,
[
extension
]))
.
then
(
compatible
=>
this
.
getDependenciesReccursively
(
compatible
.
properties
.
dependencies
,
[],
extension
));
.
then
(
dependencies
=>
dependencies
.
slice
(
1
));
}
}
loadCompatibleVersion
(
extension
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
>
{
loadCompatibleVersion
(
extension
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
>
{
...
@@ -445,10 +444,13 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
...
@@ -445,10 +444,13 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
});
});
}
}
private
getDependenciesReccursively
(
toGet
:
string
[],
result
:
IGalleryExtension
[]):
TPromise
<
IGalleryExtension
[]
>
{
private
getDependenciesReccursively
(
toGet
:
string
[],
result
:
IGalleryExtension
[]
,
root
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
[]
>
{
if
(
!
toGet
||
!
toGet
.
length
)
{
if
(
!
toGet
||
!
toGet
.
length
)
{
return
TPromise
.
wrap
(
result
);
return
TPromise
.
wrap
(
result
);
}
}
if
(
toGet
.
indexOf
(
`
${
root
.
publisher
}
.
${
root
.
name
}
`
)
&&
result
.
indexOf
(
root
)
===
-
1
)
{
result
.
push
(
root
);
}
toGet
=
result
.
length
?
toGet
.
filter
(
e
=>
!
ExtensionGalleryService
.
hasExtensionByName
(
result
,
e
))
:
toGet
;
toGet
=
result
.
length
?
toGet
.
filter
(
e
=>
!
ExtensionGalleryService
.
hasExtensionByName
(
result
,
e
))
:
toGet
;
if
(
!
toGet
.
length
)
{
if
(
!
toGet
.
length
)
{
return
TPromise
.
wrap
(
result
);
return
TPromise
.
wrap
(
result
);
...
@@ -464,7 +466,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
...
@@ -464,7 +466,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
}
}
result
=
distinct
(
result
.
concat
(
loadedDependencies
),
d
=>
d
.
id
);
result
=
distinct
(
result
.
concat
(
loadedDependencies
),
d
=>
d
.
id
);
const
dependencies
=
dependenciesSet
.
elements
.
filter
(
d
=>
!
ExtensionGalleryService
.
hasExtensionByName
(
result
,
d
));
const
dependencies
=
dependenciesSet
.
elements
.
filter
(
d
=>
!
ExtensionGalleryService
.
hasExtensionByName
(
result
,
d
));
return
this
.
getDependenciesReccursively
(
dependencies
,
result
);
return
this
.
getDependenciesReccursively
(
dependencies
,
result
,
root
);
});
});
}
}
...
...
src/vs/platform/extensionManagement/node/extensionManagementService.ts
浏览文件 @
39020559
...
@@ -202,7 +202,7 @@ export class ExtensionManagementService implements IExtensionManagementService {
...
@@ -202,7 +202,7 @@ export class ExtensionManagementService implements IExtensionManagementService {
private
installWithDependencies
(
extension
:
IGalleryExtension
):
TPromise
<
ILocalExtension
>
{
private
installWithDependencies
(
extension
:
IGalleryExtension
):
TPromise
<
ILocalExtension
>
{
return
this
.
galleryService
.
getAllDependencies
(
extension
)
return
this
.
galleryService
.
getAllDependencies
(
extension
)
.
then
(
allDependencies
=>
this
.
filter
OutInstalled
(
allDependencies
))
.
then
(
allDependencies
=>
this
.
filter
DependenciesToInstall
(
extension
,
allDependencies
))
.
then
(
toInstall
=>
this
.
filterObsolete
(...
toInstall
.
map
(
i
=>
getExtensionId
(
i
,
i
.
version
)))
.
then
(
toInstall
=>
this
.
filterObsolete
(...
toInstall
.
map
(
i
=>
getExtensionId
(
i
,
i
.
version
)))
.
then
((
obsolete
)
=>
{
.
then
((
obsolete
)
=>
{
if
(
obsolete
.
length
)
{
if
(
obsolete
.
length
)
{
...
@@ -248,11 +248,14 @@ export class ExtensionManagementService implements IExtensionManagementService {
...
@@ -248,11 +248,14 @@ export class ExtensionManagementService implements IExtensionManagementService {
.
then
(()
=>
null
);
.
then
(()
=>
null
);
}
}
private
filter
OutInstalled
(
extension
s
:
IGalleryExtension
[]):
TPromise
<
IGalleryExtension
[]
>
{
private
filter
DependenciesToInstall
(
extension
:
IGalleryExtension
,
dependencie
s
:
IGalleryExtension
[]):
TPromise
<
IGalleryExtension
[]
>
{
return
this
.
getInstalled
()
return
this
.
getInstalled
()
.
then
(
local
=>
{
.
then
(
local
=>
{
return
extensions
.
filter
(
extension
=>
{
return
dependencies
.
filter
(
d
=>
{
const
extensionId
=
getExtensionId
(
extension
,
extension
.
version
);
if
(
extension
.
id
===
d
.
id
)
{
return
false
;
}
const
extensionId
=
getExtensionId
(
d
,
d
.
version
);
return
local
.
every
(
local
=>
local
.
id
!==
extensionId
);
return
local
.
every
(
local
=>
local
.
id
!==
extensionId
);
});
});
});
});
...
...
src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchService.ts
浏览文件 @
39020559
...
@@ -361,7 +361,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
...
@@ -361,7 +361,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
.
then
(
galleryExtensions
=>
galleryExtensions
.
map
(
galleryExtension
=>
this
.
fromGallery
(
galleryExtension
)))
.
then
(
galleryExtensions
=>
galleryExtensions
.
map
(
galleryExtension
=>
this
.
fromGallery
(
galleryExtension
)))
.
then
(
extensions
=>
{
.
then
(
extensions
=>
{
const
map
=
new
Map
<
string
,
Extension
>
();
const
map
=
new
Map
<
string
,
Extension
>
();
map
.
set
(
`
${
extension
.
publisher
}
.
${
extension
.
name
}
`
,
<
Extension
>
extension
);
for
(
const
extension
of
extensions
)
{
for
(
const
extension
of
extensions
)
{
map
.
set
(
`
${
extension
.
publisher
}
.
${
extension
.
name
}
`
,
extension
);
map
.
set
(
`
${
extension
.
publisher
}
.
${
extension
.
name
}
`
,
extension
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录