Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7cc405ad
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(gitcode.net)2024年7月9日维护升级公告
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7cc405ad
编写于
1月 18, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#66653 Fix null checks
上级
f1457693
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
11 deletion
+20
-11
src/tsconfig.strictNullChecks.json
src/tsconfig.strictNullChecks.json
+0
-1
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
...vs/workbench/browser/parts/activitybar/activitybarPart.ts
+15
-7
src/vs/workbench/browser/parts/views/views.ts
src/vs/workbench/browser/parts/views/views.ts
+4
-2
src/vs/workbench/common/views.ts
src/vs/workbench/common/views.ts
+1
-1
未找到文件。
src/tsconfig.strictNullChecks.json
浏览文件 @
7cc405ad
...
...
@@ -513,7 +513,6 @@
"./vs/platform/workspaces/node/workspacesIpc.ts"
,
"./vs/vscode.d.ts"
,
"./vs/vscode.proposed.d.ts"
,
"./vs/workbench/api/browser/viewsContainersExtensionPoint.ts"
,
"./vs/workbench/api/node/extHostExtensionActivator.ts"
,
"./vs/workbench/api/node/extHostSearch.fileIndex.ts"
,
"./vs/workbench/api/node/extHostTypes.ts"
,
...
...
src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
浏览文件 @
7cc405ad
...
...
@@ -124,8 +124,10 @@ export class ActivitybarPart extends Part {
const
viewContainer
=
this
.
getViewContainer
(
viewlet
.
id
);
if
(
viewContainer
)
{
const
viewDescriptors
=
this
.
viewsService
.
getViewDescriptors
(
viewContainer
);
this
.
onDidChangeActiveViews
(
viewlet
,
viewDescriptors
);
viewDescriptors
.
onDidChangeActiveViews
(()
=>
this
.
onDidChangeActiveViews
(
viewlet
,
viewDescriptors
));
if
(
viewDescriptors
)
{
this
.
onDidChangeActiveViews
(
viewlet
,
viewDescriptors
);
viewDescriptors
.
onDidChangeActiveViews
(()
=>
this
.
onDidChangeActiveViews
(
viewlet
,
viewDescriptors
));
}
}
}
this
.
saveCachedViewlets
();
...
...
@@ -145,9 +147,12 @@ export class ActivitybarPart extends Part {
this
.
compositeBar
.
activateComposite
(
viewlet
.
getId
());
const
viewletDescriptor
=
this
.
viewletService
.
getViewlet
(
viewlet
.
getId
());
const
viewContainer
=
this
.
getViewContainer
(
viewletDescriptor
.
id
);
if
(
viewContainer
&&
this
.
viewsService
.
getViewDescriptors
(
viewContainer
).
activeViewDescriptors
.
length
===
0
)
{
// Update the composite bar by hiding
this
.
removeComposite
(
viewletDescriptor
.
id
,
true
);
if
(
viewContainer
)
{
const
viewDescriptors
=
this
.
viewsService
.
getViewDescriptors
(
viewContainer
);
if
(
viewDescriptors
&&
viewDescriptors
.
activeViewDescriptors
.
length
===
0
)
{
// Update the composite bar by hiding
this
.
removeComposite
(
viewletDescriptor
.
id
,
true
);
}
}
}
...
...
@@ -396,8 +401,11 @@ export class ActivitybarPart extends Part {
if
(
viewlet
)
{
const
views
:
{
when
:
string
}[]
=
[];
if
(
viewContainer
)
{
for
(
const
{
when
}
of
this
.
viewsService
.
getViewDescriptors
(
viewContainer
).
allViewDescriptors
)
{
views
.
push
({
when
:
when
?
when
.
serialize
()
:
undefined
});
const
viewDescriptors
=
this
.
viewsService
.
getViewDescriptors
(
viewContainer
);
if
(
viewDescriptors
)
{
for
(
const
{
when
}
of
viewDescriptors
.
allViewDescriptors
)
{
views
.
push
({
when
:
when
?
when
.
serialize
()
:
undefined
});
}
}
}
state
.
push
({
id
:
compositeItem
.
id
,
iconUrl
:
viewlet
.
iconUrl
,
views
,
pinned
:
compositeItem
&&
compositeItem
.
pinned
,
order
:
compositeItem
?
compositeItem
.
order
:
undefined
,
visible
:
compositeItem
&&
compositeItem
.
visible
});
...
...
src/vs/workbench/browser/parts/views/views.ts
浏览文件 @
7cc405ad
...
...
@@ -243,8 +243,10 @@ export class ContributableViewsModel extends Disposable {
super
();
const
viewDescriptorCollection
=
viewsService
.
getViewDescriptors
(
container
);
this
.
_register
(
viewDescriptorCollection
.
onDidChangeActiveViews
(()
=>
this
.
onDidChangeViewDescriptors
(
viewDescriptorCollection
.
activeViewDescriptors
)));
this
.
onDidChangeViewDescriptors
(
viewDescriptorCollection
.
activeViewDescriptors
);
if
(
viewDescriptorCollection
)
{
this
.
_register
(
viewDescriptorCollection
.
onDidChangeActiveViews
(()
=>
this
.
onDidChangeViewDescriptors
(
viewDescriptorCollection
.
activeViewDescriptors
)));
this
.
onDidChangeViewDescriptors
(
viewDescriptorCollection
.
activeViewDescriptors
);
}
}
isVisible
(
id
:
string
):
boolean
{
...
...
src/vs/workbench/common/views.ts
浏览文件 @
7cc405ad
...
...
@@ -289,7 +289,7 @@ export interface IViewsService {
openView
(
id
:
string
,
focus
?:
boolean
):
Promise
<
IView
|
null
>
;
getViewDescriptors
(
container
:
ViewContainer
):
IViewDescriptorCollection
;
getViewDescriptors
(
container
:
ViewContainer
):
IViewDescriptorCollection
|
null
;
}
// Custom views
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录