Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
449882b9
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,发现更多精彩内容 >>
提交
449882b9
编写于
10月 04, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - remove hasResource() usage
上级
815025d7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
21 deletion
+10
-21
src/vs/workbench/browser/parts/editor/editorActions.ts
src/vs/workbench/browser/parts/editor/editorActions.ts
+10
-17
src/vs/workbench/common/editor.ts
src/vs/workbench/common/editor.ts
+0
-4
未找到文件。
src/vs/workbench/browser/parts/editor/editorActions.ts
浏览文件 @
449882b9
...
...
@@ -9,7 +9,7 @@ import nls = require('vs/nls');
import
{
Action
}
from
'
vs/base/common/actions
'
;
import
{
mixin
}
from
'
vs/base/common/objects
'
;
import
{
getCodeEditor
}
from
'
vs/editor/common/services/codeEditorService
'
;
import
{
EditorInput
,
hasResource
,
TextEditorOptions
,
EditorOptions
,
IEditorIdentifier
,
IEditorContext
,
ActiveEditorMoveArguments
,
ActiveEditorMovePositioning
,
EditorCommands
,
ConfirmResult
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
,
TextEditorOptions
,
EditorOptions
,
IEditorIdentifier
,
IEditorContext
,
ActiveEditorMoveArguments
,
ActiveEditorMovePositioning
,
EditorCommands
,
ConfirmResult
}
from
'
vs/workbench/common/editor
'
;
import
{
QuickOpenEntryGroup
}
from
'
vs/base/parts/quickopen/browser/quickOpenModel
'
;
import
{
EditorQuickOpenEntry
,
EditorQuickOpenEntryGroup
,
IEditorQuickOpenEntry
,
QuickOpenAction
}
from
'
vs/workbench/browser/quickopen
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
...
...
@@ -255,16 +255,13 @@ export class FocusFirstGroupAction extends Action {
// Since no editor is currently opened, try to open last history entry to the target side
const
history
=
this
.
historyService
.
getHistory
();
for
(
let
input
of
history
)
{
// For now only support to open files from history to the side
if
(
history
.
length
>
0
)
{
const
input
=
history
[
0
];
if
(
input
instanceof
EditorInput
)
{
if
(
hasResource
(
input
,
{
filter
:
[
'
file
'
,
'
untitled
'
]
}))
{
return
this
.
editorService
.
openEditor
(
input
,
null
,
Position
.
ONE
);
}
}
else
{
return
this
.
editorService
.
openEditor
(
input
as
IResourceInput
,
Position
.
ONE
);
return
this
.
editorService
.
openEditor
(
input
,
null
,
Position
.
ONE
);
}
return
this
.
editorService
.
openEditor
(
input
as
IResourceInput
,
Position
.
ONE
);
}
return
TPromise
.
as
(
true
);
...
...
@@ -327,15 +324,11 @@ export abstract class BaseFocusSideGroupAction extends Action {
else
if
(
referenceEditor
)
{
const
history
=
this
.
historyService
.
getHistory
();
for
(
let
input
of
history
)
{
// For now only support to open files from history to the side
if
(
input
instanceof
EditorInput
)
{
if
(
hasResource
(
input
,
{
filter
:
[
'
file
'
,
'
untitled
'
]
}))
{
return
this
.
editorService
.
openEditor
(
input
,
{
pinned
:
true
},
this
.
getTargetEditorSide
());
}
}
else
{
return
this
.
editorService
.
openEditor
({
resource
:
(
input
as
IResourceInput
).
resource
,
options
:
{
pinned
:
true
}
},
this
.
getTargetEditorSide
());
if
(
input
instanceof
EditorInput
&&
input
.
supportsSplitEditor
())
{
return
this
.
editorService
.
openEditor
(
input
,
{
pinned
:
true
},
this
.
getTargetEditorSide
());
}
return
this
.
editorService
.
openEditor
({
resource
:
(
input
as
IResourceInput
).
resource
,
options
:
{
pinned
:
true
}
},
this
.
getTargetEditorSide
());
}
}
...
...
src/vs/workbench/common/editor.ts
浏览文件 @
449882b9
...
...
@@ -819,10 +819,6 @@ export interface IResourceOptions {
filter
?:
'
file
'
|
'
untitled
'
|
[
'
file
'
,
'
untitled
'
]
|
[
'
untitled
'
,
'
file
'
];
}
export
function
hasResource
(
editor
:
IEditorInput
,
options
?:
IResourceOptions
):
boolean
{
return
!!
toResource
(
editor
,
options
);
}
export
function
toResource
(
editor
:
IEditorInput
,
options
?:
IResourceOptions
):
URI
{
if
(
!
editor
)
{
return
null
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录