Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
835c77b8
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,发现更多精彩内容 >>
提交
835c77b8
编写于
2月 26, 2020
作者:
S
SteVen Batten
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
improve view moving command flow
fixes #91422
上级
9d06f1bd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
43 addition
and
35 deletion
+43
-35
src/vs/workbench/browser/actions/layoutActions.ts
src/vs/workbench/browser/actions/layoutActions.ts
+43
-35
未找到文件。
src/vs/workbench/browser/actions/layoutActions.ts
浏览文件 @
835c77b8
...
...
@@ -25,9 +25,10 @@ import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/commo
import
{
SideBarVisibleContext
}
from
'
vs/workbench/common/viewlet
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IViewDescriptorService
,
IViewContainersRegistry
,
Extensions
as
ViewContainerExtensions
,
IViewsService
,
FocusedViewContext
,
ViewContainerLocation
}
from
'
vs/workbench/common/views
'
;
import
{
IQuickInputService
}
from
'
vs/platform/quickinput/common/quickInput
'
;
import
{
IQuickInputService
,
IQuickPickItem
,
IQuickPickSeparator
}
from
'
vs/platform/quickinput/common/quickInput
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
IActivityBarService
}
from
'
vs/workbench/services/activityBar/browser/activityBarService
'
;
const
registry
=
Registry
.
as
<
IWorkbenchActionRegistry
>
(
WorkbenchExtensions
.
WorkbenchActions
);
const
viewCategory
=
nls
.
localize
(
'
view
'
,
"
View
"
);
...
...
@@ -534,6 +535,7 @@ export class MoveFocusedViewAction extends Action {
@
IQuickInputService
private
quickInputService
:
IQuickInputService
,
@
IContextKeyService
private
contextKeyService
:
IContextKeyService
,
@
INotificationService
private
notificationService
:
INotificationService
,
@
IActivityBarService
private
activityBarService
:
IActivityBarService
,
@
IViewletService
private
viewletService
:
IViewletService
)
{
super
(
id
,
label
);
...
...
@@ -542,58 +544,64 @@ export class MoveFocusedViewAction extends Action {
run
():
Promise
<
void
>
{
const
viewContainerRegistry
=
Registry
.
as
<
IViewContainersRegistry
>
(
ViewContainerExtensions
.
ViewContainersRegistry
);
const
focusedView
=
FocusedViewContext
.
getValue
(
this
.
contextKeyService
);
const
focusedView
Id
=
FocusedViewContext
.
getValue
(
this
.
contextKeyService
);
if
(
focusedView
===
undefined
||
focusedView
.
trim
()
===
''
)
{
if
(
focusedView
Id
===
undefined
||
focusedViewId
.
trim
()
===
''
)
{
this
.
notificationService
.
error
(
nls
.
localize
(
'
moveFocusedView.error.noFocusedView
'
,
"
There is no view currently focused.
"
));
return
Promise
.
resolve
();
}
const
viewDescriptor
=
this
.
viewDescriptorService
.
getViewDescriptor
(
focusedView
);
const
viewDescriptor
=
this
.
viewDescriptorService
.
getViewDescriptor
(
focusedView
Id
);
if
(
!
viewDescriptor
||
!
viewDescriptor
.
canMoveView
)
{
this
.
notificationService
.
error
(
nls
.
localize
(
'
moveFocusedView.error.nonMovableView
'
,
"
The currently focused view is not movable {0}.
"
,
focusedView
));
this
.
notificationService
.
error
(
nls
.
localize
(
'
moveFocusedView.error.nonMovableView
'
,
"
The currently focused view is not movable {0}.
"
,
focusedView
Id
));
return
Promise
.
resolve
();
}
const
quickPick
=
this
.
quickInputService
.
createQuickPick
();
quickPick
.
placeholder
=
nls
.
localize
(
'
moveFocusedView.selectDestination
'
,
"
Select a destination area for the view...
"
);
quickPick
.
autoFocusOnList
=
true
;
quickPick
.
items
=
[
{
id
:
'
sidebar
'
,
label
:
nls
.
localize
(
'
sidebar
'
,
"
Sidebar
"
)
},
{
id
:
'
panel
'
,
quickPick
.
placeholder
=
nls
.
localize
(
'
moveFocusedView.selectDestination
'
,
"
Select a Destination for the View
"
);
const
pinnedViewlets
=
this
.
activityBarService
.
getPinnedViewletIds
();
const
items
:
Array
<
IQuickPickItem
|
IQuickPickSeparator
>
=
this
.
viewletService
.
getViewlets
()
.
filter
(
viewlet
=>
{
if
(
viewlet
.
id
===
this
.
viewDescriptorService
.
getViewContainer
(
focusedViewId
)
!
.
id
)
{
return
false
;
}
return
!
viewContainerRegistry
.
get
(
viewlet
.
id
)
!
.
rejectAddedViews
&&
pinnedViewlets
.
indexOf
(
viewlet
.
id
)
!==
-
1
;
})
.
map
(
viewlet
=>
{
return
{
id
:
viewlet
.
id
,
label
:
viewlet
.
name
,
};
});
if
(
this
.
viewDescriptorService
.
getViewLocation
(
focusedViewId
)
!==
ViewContainerLocation
.
Panel
)
{
items
.
unshift
({
type
:
'
separator
'
,
label
:
nls
.
localize
(
'
sidebar
'
,
"
Side Bar
"
)
});
items
.
push
({
type
:
'
separator
'
,
label
:
nls
.
localize
(
'
panel
'
,
"
Panel
"
)
}
];
});
items
.
push
({
id
:
'
_.panel.newcontainer
'
,
label
:
nls
.
localize
(
'
moveFocusedView.newContainerInPanel
'
,
"
New Container in Panel
"
),
});
}
quickPick
.
items
=
items
;
quickPick
.
onDidAccept
(()
=>
{
const
destination
=
quickPick
.
selectedItems
[
0
];
if
(
destination
.
id
===
'
panel
'
)
{
quickPick
.
hide
();
if
(
destination
.
id
===
'
_.panel.newcontainer
'
)
{
this
.
viewDescriptorService
.
moveViewToLocation
(
viewDescriptor
!
,
ViewContainerLocation
.
Panel
);
this
.
viewsService
.
openView
(
focusedView
,
true
);
return
;
}
else
if
(
destination
.
id
===
'
sidebar
'
)
{
quickPick
.
placeholder
=
nls
.
localize
(
'
moveFocusedView.selectDestinationContainer
'
,
"
Select a destination view group...
"
);
quickPick
.
items
=
this
.
viewletService
.
getViewlets
().
map
(
viewlet
=>
{
return
{
id
:
viewlet
.
id
,
label
:
viewlet
.
name
};
});
return
;
this
.
viewsService
.
openView
(
focusedViewId
,
true
);
}
else
if
(
destination
.
id
)
{
quickPick
.
hide
();
this
.
viewDescriptorService
.
moveViewsToContainer
([
viewDescriptor
],
viewContainerRegistry
.
get
(
destination
.
id
)
!
);
this
.
viewsService
.
openView
(
focusedView
,
true
);
return
;
this
.
viewsService
.
openView
(
focusedViewId
,
true
);
}
quickPick
.
hide
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录