Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
feb8ea48
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,发现更多精彩内容 >>
提交
feb8ea48
编写于
6月 15, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
editors - use toResource helper over input knowledge
上级
09737750
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
11 deletion
+7
-11
src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
+3
-7
src/vs/workbench/common/editor.ts
src/vs/workbench/common/editor.ts
+4
-4
未找到文件。
src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
浏览文件 @
feb8ea48
...
...
@@ -38,7 +38,7 @@ import { ResourceLabel } from 'vs/workbench/browser/labels';
import
{
BreadcrumbsConfig
,
IBreadcrumbsService
}
from
'
vs/workbench/browser/parts/editor/breadcrumbs
'
;
import
{
BreadcrumbElement
,
EditorBreadcrumbsModel
,
FileElement
}
from
'
vs/workbench/browser/parts/editor/breadcrumbsModel
'
;
import
{
BreadcrumbsPicker
,
createBreadcrumbsPicker
}
from
'
vs/workbench/browser/parts/editor/breadcrumbsPicker
'
;
import
{
SideBySideEditorInput
,
IEditorPartOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
IEditorPartOptions
,
toResource
,
SideBySideEditor
}
from
'
vs/workbench/common/editor
'
;
import
{
ACTIVE_GROUP
,
ACTIVE_GROUP_TYPE
,
IEditorService
,
SIDE_GROUP
,
SIDE_GROUP_TYPE
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IEditorGroupsService
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
...
...
@@ -234,12 +234,9 @@ export class BreadcrumbsControl {
this
.
_breadcrumbsDisposables
.
clear
();
// honor diff editors and such
let
input
=
this
.
_editorGroup
.
activeEditor
;
if
(
input
instanceof
SideBySideEditorInput
)
{
input
=
input
.
master
;
}
const
uri
=
toResource
(
this
.
_editorGroup
.
activeEditor
,
{
supportSideBySide
:
SideBySideEditor
.
MASTER
});
if
(
!
input
||
!
input
.
resource
||
!
this
.
_fileService
.
canHandleResource
(
input
.
resource
!
))
{
if
(
!
uri
||
!
this
.
_fileService
.
canHandleResource
(
uri
))
{
// cleanup and return when there is no input or when
// we cannot handle this input
this
.
_ckBreadcrumbsPossible
.
set
(
false
);
...
...
@@ -255,7 +252,6 @@ export class BreadcrumbsControl {
this
.
_ckBreadcrumbsVisible
.
set
(
true
);
this
.
_ckBreadcrumbsPossible
.
set
(
true
);
const
uri
=
input
.
resource
;
const
editor
=
this
.
_getActiveCodeEditor
();
const
model
=
new
EditorBreadcrumbsModel
(
uri
,
editor
,
...
...
src/vs/workbench/common/editor.ts
浏览文件 @
feb8ea48
...
...
@@ -1240,10 +1240,10 @@ export interface IResourceOptions {
filterByScheme
?:
string
|
string
[];
}
export
function
toResource
(
editor
:
IEditorInput
|
undefined
):
URI
|
undefined
;
export
function
toResource
(
editor
:
IEditorInput
|
undefined
,
options
:
IResourceOptions
&
{
supportSideBySide
?:
SideBySideEditor
.
MASTER
|
SideBySideEditor
.
DETAILS
}):
URI
|
undefined
;
export
function
toResource
(
editor
:
IEditorInput
|
undefined
,
options
:
IResourceOptions
&
{
supportSideBySide
:
SideBySideEditor
.
BOTH
}):
URI
|
{
master
?:
URI
,
detail
?:
URI
}
|
undefined
;
export
function
toResource
(
editor
:
IEditorInput
|
undefined
,
options
?:
IResourceOptions
):
URI
|
{
master
?:
URI
,
detail
?:
URI
}
|
undefined
{
export
function
toResource
(
editor
:
IEditorInput
|
undefined
|
null
):
URI
|
undefined
;
export
function
toResource
(
editor
:
IEditorInput
|
undefined
|
null
,
options
:
IResourceOptions
&
{
supportSideBySide
?:
SideBySideEditor
.
MASTER
|
SideBySideEditor
.
DETAILS
}):
URI
|
undefined
;
export
function
toResource
(
editor
:
IEditorInput
|
undefined
|
null
,
options
:
IResourceOptions
&
{
supportSideBySide
:
SideBySideEditor
.
BOTH
}):
URI
|
{
master
?:
URI
,
detail
?:
URI
}
|
undefined
;
export
function
toResource
(
editor
:
IEditorInput
|
undefined
|
null
,
options
?:
IResourceOptions
):
URI
|
{
master
?:
URI
,
detail
?:
URI
}
|
undefined
{
if
(
!
editor
)
{
return
undefined
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录