Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
728e657c
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,发现更多精彩内容 >>
提交
728e657c
编写于
8月 21, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make download service optional
上级
84ad7119
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
45 deletion
+5
-45
src/vs/code/node/cliProcessMain.ts
src/vs/code/node/cliProcessMain.ts
+0
-3
src/vs/platform/download/node/downloadService.ts
src/vs/platform/download/node/downloadService.ts
+0
-38
src/vs/platform/extensionManagement/node/extensionManagementService.ts
...rm/extensionManagement/node/extensionManagementService.ts
+5
-1
src/vs/workbench/electron-browser/shell.ts
src/vs/workbench/electron-browser/shell.ts
+0
-3
未找到文件。
src/vs/code/node/cliProcessMain.ts
浏览文件 @
728e657c
...
...
@@ -42,8 +42,6 @@ import { CommandLineDialogService } from 'vs/platform/dialogs/node/dialogService
import
{
areSameExtensions
,
getGalleryExtensionIdFromLocal
}
from
'
vs/platform/extensionManagement/common/extensionManagementUtil
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
IDownloadService
}
from
'
vs/platform/download/common/download
'
;
import
{
DownloadService
}
from
'
vs/platform/download/node/downloadService
'
;
const
notFound
=
(
id
:
string
)
=>
localize
(
'
notFound
'
,
"
Extension '{0}' not found.
"
,
id
);
const
notInstalled
=
(
id
:
string
)
=>
localize
(
'
notInstalled
'
,
"
Extension '{0}' is not installed.
"
,
id
);
...
...
@@ -243,7 +241,6 @@ export function main(argv: ParsedArgs): TPromise<void> {
services
.
set
(
IExtensionManagementService
,
new
SyncDescriptor
(
ExtensionManagementService
));
services
.
set
(
IExtensionGalleryService
,
new
SyncDescriptor
(
ExtensionGalleryService
));
services
.
set
(
IDialogService
,
new
SyncDescriptor
(
CommandLineDialogService
));
services
.
set
(
IDownloadService
,
new
SyncDescriptor
(
DownloadService
));
const
appenders
:
AppInsightsAppender
[]
=
[];
if
(
isBuilt
&&
!
extensionDevelopmentPath
&&
!
envService
.
args
[
'
disable-telemetry
'
]
&&
product
.
enableTelemetry
)
{
...
...
src/vs/platform/download/node/downloadService.ts
已删除
100644 → 0
浏览文件 @
84ad7119
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IDownloadService
}
from
'
vs/platform/download/common/download
'
;
import
{
IRequestService
}
from
'
vs/platform/request/node/request
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
copy
}
from
'
vs/base/node/pfs
'
;
import
{
download
,
asText
}
from
'
vs/base/node/request
'
;
export
class
DownloadService
implements
IDownloadService
{
_serviceBrand
:
any
;
constructor
(
@
IRequestService
private
requestService
:
IRequestService
)
{
}
download
(
from
:
URI
,
to
:
string
):
TPromise
<
void
>
{
if
(
from
.
scheme
===
Schemas
.
file
)
{
return
copy
(
from
.
fsPath
,
to
);
}
return
this
.
requestService
.
request
({
url
:
from
.
path
})
.
then
(
context
=>
{
if
(
context
.
res
.
statusCode
===
200
)
{
return
download
(
to
,
context
);
}
return
asText
(
context
)
.
then
(
message
=>
TPromise
.
wrapError
(
new
Error
(
`Expected 200, got back
${
context
.
res
.
statusCode
}
instead.\n\n
${
message
}
`
)));
});
}
}
\ No newline at end of file
src/vs/platform/extensionManagement/node/extensionManagementService.ts
浏览文件 @
728e657c
...
...
@@ -45,6 +45,7 @@ import { getPathFromAmdModule } from 'vs/base/common/amd';
import
{
tmpdir
}
from
'
os
'
;
import
{
generateUuid
}
from
'
vs/base/common/uuid
'
;
import
{
IDownloadService
}
from
'
vs/platform/download/common/download
'
;
import
{
optional
}
from
'
vs/platform/instantiation/common/instantiation
'
;
const
SystemExtensionsRoot
=
path
.
normalize
(
path
.
join
(
getPathFromAmdModule
(
require
,
''
),
'
..
'
,
'
extensions
'
));
const
ERROR_SCANNING_SYS_EXTENSIONS
=
'
scanningSystem
'
;
...
...
@@ -140,7 +141,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
@
IDialogService
private
dialogService
:
IDialogService
,
@
IExtensionGalleryService
private
galleryService
:
IExtensionGalleryService
,
@
ILogService
private
logService
:
ILogService
,
@
IDownloadService
private
downloadService
:
IDownloadService
,
@
optional
(
IDownloadService
)
private
downloadService
:
IDownloadService
,
@
ITelemetryService
private
telemetryService
:
ITelemetryService
,
)
{
super
();
...
...
@@ -165,6 +166,9 @@ export class ExtensionManagementService extends Disposable implements IExtension
}
unzip
(
zipLocation
:
URI
):
TPromise
<
void
>
{
if
(
!
this
.
downloadService
)
{
throw
new
Error
(
'
Download service is not available
'
);
}
const
downloadedLocation
=
path
.
join
(
tmpdir
(),
generateUuid
());
return
this
.
downloadService
.
download
(
zipLocation
,
downloadedLocation
).
then
(()
=>
this
.
install
(
URI
.
file
(
downloadedLocation
)));
}
...
...
src/vs/workbench/electron-browser/shell.ts
浏览文件 @
728e657c
...
...
@@ -97,8 +97,6 @@ import { SearchHistoryService } from 'vs/workbench/services/search/node/searchHi
import
{
MulitExtensionManagementService
}
from
'
vs/platform/extensionManagement/common/multiExtensionManagement
'
;
import
{
ExtensionManagementServerService
}
from
'
vs/workbench/services/extensions/node/extensionManagementServerService
'
;
import
{
DownloadServiceChannel
}
from
'
vs/platform/download/node/downloadIpc
'
;
import
{
IDownloadService
}
from
'
vs/platform/download/common/download
'
;
import
{
DownloadService
}
from
'
vs/platform/download/node/downloadService
'
;
/**
* Services that we require for the Shell
...
...
@@ -391,7 +389,6 @@ export class WorkbenchShell extends Disposable {
serviceCollection
.
set
(
IExtensionEnablementService
,
extensionEnablementService
);
serviceCollection
.
set
(
IRequestService
,
new
SyncDescriptor
(
RequestService
));
serviceCollection
.
set
(
IDownloadService
,
new
SyncDescriptor
(
DownloadService
));
this
.
extensionService
=
instantiationService
.
createInstance
(
ExtensionService
);
serviceCollection
.
set
(
IExtensionService
,
this
.
extensionService
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录