Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0f4cde30
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,发现更多精彩内容 >>
提交
0f4cde30
编写于
6月 01, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
grid - tweak some groups access order
上级
4ead3664
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
6 deletion
+11
-6
src/vs/workbench/browser/parts/editor/editorActions.ts
src/vs/workbench/browser/parts/editor/editorActions.ts
+9
-4
src/vs/workbench/browser/parts/editor/editorCommands.ts
src/vs/workbench/browser/parts/editor/editorCommands.ts
+1
-1
src/vs/workbench/browser/parts/editor/editorPicker.ts
src/vs/workbench/browser/parts/editor/editorPicker.ts
+1
-1
未找到文件。
src/vs/workbench/browser/parts/editor/editorActions.ts
浏览文件 @
0f4cde30
...
@@ -161,9 +161,14 @@ export class JoinTwoGroupsAction extends Action {
...
@@ -161,9 +161,14 @@ export class JoinTwoGroupsAction extends Action {
sourceGroup
=
this
.
editorGroupService
.
activeGroup
;
sourceGroup
=
this
.
editorGroupService
.
activeGroup
;
}
}
const
targetGroup
=
this
.
editorGroupService
.
findGroup
({
direction
:
GroupDirection
.
RIGHT
},
sourceGroup
)
||
this
.
editorGroupService
.
findGroup
({
direction
:
GroupDirection
.
DOWN
},
sourceGroup
);
const
targetGroupDirections
=
[
GroupDirection
.
RIGHT
,
GroupDirection
.
DOWN
,
GroupDirection
.
LEFT
,
GroupDirection
.
UP
];
if
(
targetGroup
&&
sourceGroup
!==
targetGroup
)
{
for
(
let
i
=
0
;
i
<
targetGroupDirections
.
length
;
i
++
)
{
this
.
editorGroupService
.
mergeGroup
(
sourceGroup
,
targetGroup
);
const
targetGroup
=
this
.
editorGroupService
.
findGroup
({
direction
:
targetGroupDirections
[
i
]
},
sourceGroup
);
if
(
targetGroup
&&
sourceGroup
!==
targetGroup
)
{
this
.
editorGroupService
.
mergeGroup
(
sourceGroup
,
targetGroup
);
return
TPromise
.
as
(
true
);
}
}
}
return
TPromise
.
as
(
true
);
return
TPromise
.
as
(
true
);
...
@@ -663,7 +668,7 @@ export class CloseEditorsInOtherGroupsAction extends Action {
...
@@ -663,7 +668,7 @@ export class CloseEditorsInOtherGroupsAction extends Action {
public
run
(
context
?:
IEditorIdentifier
):
TPromise
<
any
>
{
public
run
(
context
?:
IEditorIdentifier
):
TPromise
<
any
>
{
const
groupToSkip
=
context
?
this
.
editorGroupService
.
getGroup
(
context
.
groupId
)
:
this
.
editorGroupService
.
activeGroup
;
const
groupToSkip
=
context
?
this
.
editorGroupService
.
getGroup
(
context
.
groupId
)
:
this
.
editorGroupService
.
activeGroup
;
return
TPromise
.
join
(
this
.
editorGroupService
.
g
roups
.
map
(
g
=>
{
return
TPromise
.
join
(
this
.
editorGroupService
.
g
etGroups
(
GroupsOrder
.
MOST_RECENTLY_ACTIVE
)
.
map
(
g
=>
{
if
(
g
.
id
===
groupToSkip
.
id
)
{
if
(
g
.
id
===
groupToSkip
.
id
)
{
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
null
);
}
}
...
...
src/vs/workbench/browser/parts/editor/editorCommands.ts
浏览文件 @
0f4cde30
...
@@ -207,7 +207,7 @@ function registerEditorGroupsLayoutCommand(): void {
...
@@ -207,7 +207,7 @@ function registerEditorGroupsLayoutCommand(): void {
export
function
mergeAllGroups
(
editorGroupService
:
IEditorGroupsService
):
void
{
export
function
mergeAllGroups
(
editorGroupService
:
IEditorGroupsService
):
void
{
const
target
=
editorGroupService
.
activeGroup
;
const
target
=
editorGroupService
.
activeGroup
;
editorGroupService
.
g
roups
.
forEach
(
group
=>
{
editorGroupService
.
g
etGroups
(
GroupsOrder
.
MOST_RECENTLY_ACTIVE
)
.
forEach
(
group
=>
{
if
(
group
===
target
)
{
if
(
group
===
target
)
{
return
;
// keep target
return
;
// keep target
}
}
...
...
src/vs/workbench/browser/parts/editor/editorPicker.ts
浏览文件 @
0f4cde30
...
@@ -206,7 +206,7 @@ export class AllEditorsPicker extends BaseEditorPicker {
...
@@ -206,7 +206,7 @@ export class AllEditorsPicker extends BaseEditorPicker {
protected
getEditorEntries
():
EditorPickerEntry
[]
{
protected
getEditorEntries
():
EditorPickerEntry
[]
{
const
entries
:
EditorPickerEntry
[]
=
[];
const
entries
:
EditorPickerEntry
[]
=
[];
this
.
editorGroupService
.
g
roups
.
forEach
(
group
=>
{
this
.
editorGroupService
.
g
etGroups
(
GroupsOrder
.
CREATION_TIME
)
.
forEach
(
group
=>
{
group
.
editors
.
forEach
(
editor
=>
{
group
.
editors
.
forEach
(
editor
=>
{
entries
.
push
(
this
.
instantiationService
.
createInstance
(
EditorPickerEntry
,
editor
,
group
));
entries
.
push
(
this
.
instantiationService
.
createInstance
(
EditorPickerEntry
,
editor
,
group
));
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录