Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b1300a09
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b1300a09
编写于
3月 13, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use extension point kind while checking for ui extension
上级
ceb4b0c4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
9 deletion
+25
-9
src/vs/code/node/cliProcessMain.ts
src/vs/code/node/cliProcessMain.ts
+2
-2
src/vs/platform/extensionManagement/node/extensionManagementService.ts
...rm/extensionManagement/node/extensionManagementService.ts
+2
-2
src/vs/platform/extensions/node/extensionsUtil.ts
src/vs/platform/extensions/node/extensionsUtil.ts
+5
-3
src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts
...nch/contrib/extensions/node/extensionsWorkbenchService.ts
+1
-1
src/vs/workbench/services/extensionManagement/node/multiExtensionManagement.ts
...ices/extensionManagement/node/multiExtensionManagement.ts
+1
-1
src/vs/workbench/services/extensions/node/extensionsUtil.ts
src/vs/workbench/services/extensions/node/extensionsUtil.ts
+14
-0
未找到文件。
src/vs/code/node/cliProcessMain.ts
浏览文件 @
b1300a09
...
...
@@ -129,7 +129,7 @@ export class Main {
extension
=
path
.
isAbsolute
(
extension
)
?
extension
:
path
.
join
(
process
.
cwd
(),
extension
);
const
manifest
=
await
getManifest
(
extension
);
if
(
this
.
remote
&&
(
!
isLanguagePackExtension
(
manifest
)
&&
isUIExtension
(
manifest
,
this
.
configurationService
)))
{
if
(
this
.
remote
&&
(
!
isLanguagePackExtension
(
manifest
)
&&
isUIExtension
(
manifest
,
[],
this
.
configurationService
)))
{
console
.
log
(
localize
(
'
notSupportedUIExtension
'
,
"
Can't install extension {0} since UI Extensions are not supported
"
,
getBaseLabel
(
extension
)));
return
null
;
}
...
...
@@ -171,7 +171,7 @@ export class Main {
}
const
manifest
=
await
this
.
extensionGalleryService
.
getManifest
(
extension
,
CancellationToken
.
None
);
if
(
this
.
remote
&&
manifest
&&
(
!
isLanguagePackExtension
(
manifest
)
&&
isUIExtension
(
manifest
,
this
.
configurationService
)))
{
if
(
this
.
remote
&&
manifest
&&
(
!
isLanguagePackExtension
(
manifest
)
&&
isUIExtension
(
manifest
,
[],
this
.
configurationService
)))
{
console
.
log
(
localize
(
'
notSupportedUIExtension
'
,
"
Can't install extension {0} since UI Extensions are not supported
"
,
extension
.
identifier
.
id
));
return
null
;
}
...
...
src/vs/platform/extensionManagement/node/extensionManagementService.ts
浏览文件 @
b1300a09
...
...
@@ -345,7 +345,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
if
(
this
.
remote
)
{
const
manifest
=
await
this
.
galleryService
.
getManifest
(
extension
,
CancellationToken
.
None
);
if
(
manifest
&&
isUIExtension
(
manifest
,
this
.
configurationService
)
&&
!
isLanguagePackExtension
(
manifest
))
{
if
(
manifest
&&
isUIExtension
(
manifest
,
[],
this
.
configurationService
)
&&
!
isLanguagePackExtension
(
manifest
))
{
return
Promise
.
reject
(
new
Error
(
nls
.
localize
(
'
notSupportedUIExtension
'
,
"
Can't install extension {0} since UI Extensions are not supported
"
,
extension
.
identifier
.
id
)));
}
}
...
...
@@ -516,7 +516,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
return
Promise
.
all
(
extensionsToInstall
.
map
(
async
e
=>
{
if
(
this
.
remote
)
{
const
manifest
=
await
this
.
galleryService
.
getManifest
(
e
,
CancellationToken
.
None
);
if
(
manifest
&&
isUIExtension
(
manifest
,
this
.
configurationService
)
&&
!
isLanguagePackExtension
(
manifest
))
{
if
(
manifest
&&
isUIExtension
(
manifest
,
[],
this
.
configurationService
)
&&
!
isLanguagePackExtension
(
manifest
))
{
this
.
logService
.
info
(
'
Ignored installing the UI dependency
'
,
e
.
identifier
.
id
);
return
;
}
...
...
src/vs/platform/extensions/node/extensionsUtil.ts
浏览文件 @
b1300a09
...
...
@@ -9,7 +9,7 @@ import { getGalleryExtensionId, areSameExtensions } from 'vs/platform/extensionM
import
{
isNonEmptyArray
}
from
'
vs/base/common/arrays
'
;
import
product
from
'
vs/platform/product/node/product
'
;
export
function
isUIExtension
(
manifest
:
IExtensionManifest
,
configurationService
:
IConfigurationService
):
boolean
{
export
function
isUIExtension
(
manifest
:
IExtensionManifest
,
uiContributions
:
string
[],
configurationService
:
IConfigurationService
):
boolean
{
const
extensionId
=
getGalleryExtensionId
(
manifest
.
publisher
,
manifest
.
name
);
const
configuredUIExtensions
=
configurationService
.
getValue
<
string
[]
>
(
'
_workbench.uiExtensions
'
)
||
[];
if
(
configuredUIExtensions
.
length
)
{
...
...
@@ -30,8 +30,10 @@ export function isUIExtension(manifest: IExtensionManifest, configurationService
if
(
manifest
.
main
)
{
return
false
;
}
if
(
manifest
.
contributes
&&
isNonEmptyArray
(
manifest
.
contributes
.
debuggers
))
{
return
false
;
if
(
manifest
.
contributes
)
{
if
(
!
uiContributions
.
length
||
Object
.
keys
(
manifest
.
contributes
).
some
(
contribution
=>
uiContributions
.
indexOf
(
contribution
)
===
-
1
))
{
return
false
;
}
}
// Default is UI Extension
return
true
;
...
...
src/vs/workbench/contrib/extensions/node/extensionsWorkbenchService.ts
浏览文件 @
b1300a09
...
...
@@ -35,7 +35,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
IExtensionManifest
,
ExtensionType
,
ExtensionIdentifierWithVersion
,
IExtension
as
IPlatformExtension
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
isUIExtension
}
from
'
vs/
platform
/extensions/node/extensionsUtil
'
;
import
{
isUIExtension
}
from
'
vs/
workbench/services
/extensions/node/extensionsUtil
'
;
interface
IExtensionStateProvider
<
T
>
{
(
extension
:
Extension
):
T
;
...
...
src/vs/workbench/services/extensionManagement/node/multiExtensionManagement.ts
浏览文件 @
b1300a09
...
...
@@ -19,7 +19,7 @@ import { getManifest } from 'vs/platform/extensionManagement/node/extensionManag
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
areSameExtensions
}
from
'
vs/platform/extensionManagement/common/extensionManagementUtil
'
;
import
{
localize
}
from
'
vs/nls
'
;
import
{
isUIExtension
}
from
'
vs/
platform
/extensions/node/extensionsUtil
'
;
import
{
isUIExtension
}
from
'
vs/
workbench/services
/extensions/node/extensionsUtil
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
export
class
MultiExtensionManagementService
extends
Disposable
implements
IExtensionManagementService
{
...
...
src/vs/workbench/services/extensions/node/extensionsUtil.ts
0 → 100644
浏览文件 @
b1300a09
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IExtensionManifest
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
ExtensionsRegistry
}
from
'
vs/workbench/services/extensions/common/extensionsRegistry
'
;
import
{
isUIExtension
as
_isUIExtension
}
from
'
vs/platform/extensions/node/extensionsUtil
'
;
export
function
isUIExtension
(
manifest
:
IExtensionManifest
,
configurationService
:
IConfigurationService
):
boolean
{
const
uiExtensionPoints
=
ExtensionsRegistry
.
getExtensionPoints
().
filter
(
e
=>
e
.
defaultExtensionKind
!==
'
workspace
'
).
map
(
e
=>
e
.
name
);
return
_isUIExtension
(
manifest
,
uiExtensionPoints
,
configurationService
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录