Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d70cfb4b
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,发现更多精彩内容 >>
提交
d70cfb4b
编写于
11月 10, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lint: fix extension management layer breakage
#15293
上级
5d949f10
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
31 deletion
+33
-31
src/vs/platform/extensionManagement/common/extensionManagement.ts
...latform/extensionManagement/common/extensionManagement.ts
+4
-4
src/vs/platform/extensionManagement/node/extensionGalleryService.ts
...tform/extensionManagement/node/extensionGalleryService.ts
+21
-6
src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
...bench/parts/extensions/node/extensionsWorkbenchService.ts
+8
-21
未找到文件。
src/vs/platform/extensionManagement/common/extensionManagement.ts
浏览文件 @
d70cfb4b
...
...
@@ -5,12 +5,11 @@
'
use strict
'
;
import
nls
=
require
(
'
vs/nls
'
)
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
Event
from
'
vs/base/common/event
'
;
import
{
IPager
}
from
'
vs/base/common/paging
'
;
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IRequestContext
}
from
'
vs/base/node/request
'
;
export
const
EXTENSION_IDENTIFIER_PATTERN
=
'
^[a-z0-9A-Z][a-z0-9
\
-A-Z]*
\\
.[a-z0-9A-Z][a-z0-9
\
-A-Z]*$
'
;
export
const
EXTENSION_IDENTIFIER_REGEX
=
new
RegExp
(
EXTENSION_IDENTIFIER_PATTERN
);
...
...
@@ -202,7 +201,8 @@ export interface IExtensionGalleryService {
getRequestHeaders
():
TPromise
<
{
[
key
:
string
]:
string
;
}
>
;
query
(
options
?:
IQueryOptions
):
TPromise
<
IPager
<
IGalleryExtension
>>
;
download
(
extension
:
IGalleryExtension
):
TPromise
<
string
>
;
getAsset
(
url
:
string
):
TPromise
<
IRequestContext
>
;
getReadme
(
extension
:
IGalleryExtension
):
TPromise
<
string
>
;
getManifest
(
extension
:
IGalleryExtension
):
TPromise
<
IExtensionManifest
>
;
loadCompatibleVersion
(
extension
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
>
;
getAllDependencies
(
extension
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
[]
>
;
}
...
...
@@ -288,5 +288,5 @@ export interface IExtensionTipsService {
getWorkspaceRecommendations
():
string
[];
}
export
const
ExtensionsLabel
=
nls
.
localize
(
'
extensions
'
,
"
Extensions
"
);
export
const
ExtensionsLabel
=
localize
(
'
extensions
'
,
"
Extensions
"
);
export
const
ExtensionsChannelId
=
'
extensions
'
;
\ No newline at end of file
src/vs/platform/extensionManagement/node/extensionGalleryService.ts
浏览文件 @
d70cfb4b
...
...
@@ -17,7 +17,7 @@ import { assign, getOrDefault } from 'vs/base/common/objects';
import
{
IRequestService
}
from
'
vs/platform/request/common/request
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IPager
}
from
'
vs/base/common/paging
'
;
import
{
IRequestOptions
,
IRequestContext
,
download
,
asJson
}
from
'
vs/base/node/request
'
;
import
{
IRequestOptions
,
IRequestContext
,
download
,
asJson
,
asText
}
from
'
vs/base/node/request
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
pkg
from
'
vs/platform/package
'
;
import
product
from
'
vs/platform/product
'
;
...
...
@@ -371,15 +371,30 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
const
startTime
=
new
Date
().
getTime
();
const
log
=
duration
=>
this
.
telemetryService
.
publicLog
(
'
galleryService:downloadVSIX
'
,
assign
(
data
,
{
duration
}));
return
this
.
_
getAsset
({
url
})
return
this
.
getAsset
({
url
})
.
then
(
context
=>
download
(
zipPath
,
context
))
.
then
(()
=>
log
(
new
Date
().
getTime
()
-
startTime
))
.
then
(()
=>
zipPath
);
});
}
getAsset
(
url
:
string
):
TPromise
<
IRequestContext
>
{
return
this
.
_getAsset
({
url
});
getReadme
(
extension
:
IGalleryExtension
):
TPromise
<
string
>
{
const
url
=
extension
.
assets
.
readme
;
if
(
!
url
)
{
return
TPromise
.
wrapError
(
'
not available
'
);
}
return
this
.
getAsset
({
url
})
.
then
(
asText
);
}
getManifest
(
extension
:
IGalleryExtension
):
TPromise
<
IExtensionManifest
>
{
const
url
=
extension
.
assets
.
manifest
;
return
this
.
getAsset
({
url
})
.
then
(
asText
)
.
then
(
JSON
.
parse
);
}
getAllDependencies
(
extension
:
IGalleryExtension
):
TPromise
<
IGalleryExtension
[]
>
{
...
...
@@ -469,7 +484,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
* Always try with the `redirect=true` query string.
* If that does not return 200, try without it.
*/
private
_
getAsset
(
options
:
IRequestOptions
):
TPromise
<
IRequestContext
>
{
private
getAsset
(
options
:
IRequestOptions
):
TPromise
<
IRequestContext
>
{
const
parsedUrl
=
url
.
parse
(
options
.
url
,
true
);
parsedUrl
.
search
=
undefined
;
parsedUrl
.
query
[
'
redirect
'
]
=
'
true
'
;
...
...
@@ -525,7 +540,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
const
url
=
getAssetSource
(
version
.
files
,
AssetType
.
Manifest
);
const
headers
=
{
'
Accept-Encoding
'
:
'
gzip
'
};
return
this
.
_
getAsset
({
url
,
headers
})
return
this
.
getAsset
({
url
,
headers
})
.
then
(
context
=>
asJson
<
IExtensionManifest
>
(
context
))
.
then
(
manifest
=>
{
const
engine
=
manifest
.
engines
.
vscode
;
...
...
src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
浏览文件 @
d70cfb4b
...
...
@@ -6,7 +6,6 @@
'
use strict
'
;
import
{
readFile
}
from
'
vs/base/node/pfs
'
;
import
{
asText
}
from
'
vs/base/node/request
'
;
import
*
as
semver
from
'
semver
'
;
import
*
as
path
from
'
path
'
;
import
Event
,
{
Emitter
,
chain
}
from
'
vs/base/common/event
'
;
...
...
@@ -100,14 +99,6 @@ class Extension implements IExtension {
return
this
.
local
?
this
.
local
.
manifest
.
description
:
this
.
gallery
.
description
;
}
private
get
readmeUrl
():
string
{
if
(
this
.
local
&&
this
.
local
.
readmeUrl
)
{
return
this
.
local
.
readmeUrl
;
}
return
this
.
gallery
&&
this
.
gallery
.
assets
.
readme
;
}
private
get
changelogUrl
():
string
{
if
(
this
.
local
&&
this
.
local
.
changelogUrl
)
{
return
this
.
local
.
changelogUrl
;
...
...
@@ -180,25 +171,20 @@ class Extension implements IExtension {
return
TPromise
.
as
(
this
.
local
.
manifest
);
}
return
this
.
galleryService
.
getAsset
(
this
.
gallery
.
assets
.
manifest
)
.
then
(
asText
)
.
then
(
raw
=>
JSON
.
parse
(
raw
)
as
IExtensionManifest
);
return
this
.
galleryService
.
getManifest
(
this
.
gallery
);
}
getReadme
():
TPromise
<
string
>
{
const
readmeUrl
=
this
.
readmeUrl
;
if
(
!
readmeUrl
)
{
return
TPromise
.
wrapError
(
'
not available
'
);
if
(
this
.
local
&&
this
.
local
.
readmeUrl
)
{
const
uri
=
URI
.
parse
(
this
.
local
.
readmeUrl
);
return
readFile
(
uri
.
fsPath
,
'
utf8
'
);
}
const
uri
=
URI
.
parse
(
readmeUrl
);
if
(
uri
.
scheme
===
'
file
'
)
{
return
readFile
(
uri
.
fsPath
,
'
utf8
'
);
if
(
this
.
gallery
)
{
return
this
.
galleryService
.
getReadme
(
this
.
gallery
);
}
return
this
.
galleryService
.
getAsset
(
readmeUrl
).
then
(
asText
);
return
TPromise
.
wrapError
(
'
not available
'
);
}
getChangelog
():
TPromise
<
string
>
{
...
...
@@ -214,6 +200,7 @@ class Extension implements IExtension {
return
readFile
(
uri
.
fsPath
,
'
utf8
'
);
}
// TODO@Joao
return
TPromise
.
wrapError
(
'
not available
'
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录