Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b72c840b
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,发现更多精彩内容 >>
提交
b72c840b
编写于
10月 23, 2020
作者:
E
Eric Amodio
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #109136
上级
ce9ed29d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
28 deletion
+34
-28
src/vs/workbench/browser/layout.ts
src/vs/workbench/browser/layout.ts
+33
-27
src/vs/workbench/browser/parts/views/viewsService.ts
src/vs/workbench/browser/parts/views/viewsService.ts
+1
-1
未找到文件。
src/vs/workbench/browser/layout.ts
浏览文件 @
b72c840b
...
...
@@ -43,7 +43,7 @@ import { WINDOW_ACTIVE_BORDER, WINDOW_INACTIVE_BORDER } from 'vs/workbench/commo
import
{
LineNumbersType
}
from
'
vs/editor/common/config/editorOptions
'
;
import
{
ActivitybarPart
}
from
'
vs/workbench/browser/parts/activitybar/activitybarPart
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
IViewDescriptorService
,
ViewContainerLocation
,
IViewsService
}
from
'
vs/workbench/common/views
'
;
import
{
IViewDescriptorService
,
ViewContainerLocation
}
from
'
vs/workbench/common/views
'
;
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
{
mark
}
from
'
vs/base/common/performance
'
;
import
{
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
...
...
@@ -178,7 +178,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
private
titleService
!
:
ITitleService
;
private
viewletService
!
:
IViewletService
;
private
viewDescriptorService
!
:
IViewDescriptorService
;
private
viewsService
!
:
IViewsService
;
private
contextService
!
:
IWorkspaceContextService
;
private
backupFileService
!
:
IBackupFileService
;
private
notificationService
!
:
INotificationService
;
...
...
@@ -273,7 +272,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
this
.
panelService
=
accessor
.
get
(
IPanelService
);
this
.
viewletService
=
accessor
.
get
(
IViewletService
);
this
.
viewDescriptorService
=
accessor
.
get
(
IViewDescriptorService
);
this
.
viewsService
=
accessor
.
get
(
IViewsService
);
this
.
titleService
=
accessor
.
get
(
ITitleService
);
this
.
notificationService
=
accessor
.
get
(
INotificationService
);
this
.
activityBarService
=
accessor
.
get
(
IActivityBarService
);
...
...
@@ -851,52 +849,60 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
if
(
this
.
state
.
views
.
defaults
?.
length
)
{
mark
(
'
willOpenDefaultViews
'
);
const
defaultViews
=
[...
this
.
state
.
views
.
defaults
];
let
locationsRestored
:
{
id
:
string
;
order
:
number
}[]
=
[
];
let
locationsRestored
:
boolean
[]
=
[];
const
tryOpenView
=
async
(
viewId
:
string
,
index
:
number
)
=>
{
const
location
=
this
.
viewDescriptorService
.
getViewLocationById
(
viewId
);
if
(
location
)
{
const
tryOpenView
=
(
view
:
{
id
:
string
;
order
:
number
}):
boolean
=>
{
const
location
=
this
.
viewDescriptorService
.
getViewLocationById
(
view
.
id
);
if
(
location
!==
null
)
{
const
container
=
this
.
viewDescriptorService
.
getViewContainerByViewId
(
view
.
id
);
if
(
container
)
{
if
(
view
.
order
>=
(
locationsRestored
?.[
location
]?.
order
??
0
))
{
locationsRestored
[
location
]
=
{
id
:
container
.
id
,
order
:
view
.
order
};
}
// If the view is in the same location that has already been restored, remove it and continue
if
(
locationsRestored
[
location
])
{
defaultViews
.
splice
(
index
,
1
);
const
containerModel
=
this
.
viewDescriptorService
.
getViewContainerModel
(
container
);
containerModel
.
setCollapsed
(
view
.
id
,
false
);
containerModel
.
setVisible
(
view
.
id
,
true
);
return
;
}
const
view
=
await
this
.
viewsService
.
openView
(
viewId
);
if
(
view
)
{
locationsRestored
[
location
]
=
true
;
defaultViews
.
splice
(
index
,
1
);
return
true
;
}
}
return
false
;
};
let
i
=
-
1
;
for
(
const
viewId
of
defaultViews
)
{
await
tryOpenView
(
viewId
,
++
i
);
const
defaultViews
=
[...
this
.
state
.
views
.
defaults
].
reverse
().
map
((
v
,
index
)
=>
({
id
:
v
,
order
:
index
}));
let
i
=
defaultViews
.
length
;
while
(
i
)
{
i
--
;
if
(
tryOpenView
(
defaultViews
[
i
]))
{
defaultViews
.
splice
(
i
,
1
);
}
}
// If we still have views left over, wait until all extensions have been registered and try again
if
(
defaultViews
.
length
)
{
await
this
.
extensionService
.
whenInstalledExtensionsRegistered
();
let
i
=
-
1
;
for
(
const
viewId
of
defaultViews
)
{
await
tryOpenView
(
viewId
,
++
i
);
let
i
=
defaultViews
.
length
;
while
(
i
)
{
i
--
;
if
(
tryOpenView
(
defaultViews
[
i
]))
{
defaultViews
.
splice
(
i
,
1
);
}
}
}
// If we opened a view in the sidebar, stop any restore there
if
(
locationsRestored
[
ViewContainerLocation
.
Sidebar
])
{
this
.
state
.
sideBar
.
viewletToRestore
=
undefine
d
;
this
.
state
.
sideBar
.
viewletToRestore
=
locationsRestored
[
ViewContainerLocation
.
Sidebar
].
i
d
;
}
// If we opened a view in the panel, stop any restore there
if
(
locationsRestored
[
ViewContainerLocation
.
Panel
])
{
this
.
state
.
panel
.
panelToRestore
=
undefine
d
;
this
.
state
.
panel
.
panelToRestore
=
locationsRestored
[
ViewContainerLocation
.
Panel
].
i
d
;
}
mark
(
'
didOpenDefaultViews
'
);
...
...
src/vs/workbench/browser/parts/views/viewsService.ts
浏览文件 @
b72c840b
...
...
@@ -326,7 +326,7 @@ export class ViewsService extends Disposable implements IViewsService {
return
null
;
}
async
openView
<
T
extends
IView
>
(
id
:
string
,
focus
:
boolean
):
Promise
<
T
|
null
>
{
async
openView
<
T
extends
IView
>
(
id
:
string
,
focus
?
:
boolean
):
Promise
<
T
|
null
>
{
const
viewContainer
=
this
.
viewDescriptorService
.
getViewContainerByViewId
(
id
);
if
(
!
viewContainer
)
{
return
null
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录