Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
0359e059
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0359e059
编写于
9月 19, 2017
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
introduce resources.dirname, fixes label in no-tab view
上级
ceb34634
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
8 deletion
+17
-8
src/vs/base/common/resources.ts
src/vs/base/common/resources.ts
+6
-0
src/vs/workbench/common/editor/untitledEditorInput.ts
src/vs/workbench/common/editor/untitledEditorInput.ts
+5
-4
src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
...s/workbench/parts/files/common/editors/fileEditorInput.ts
+6
-4
未找到文件。
src/vs/base/common/resources.ts
浏览文件 @
0359e059
...
...
@@ -18,3 +18,9 @@ export function isEqualOrParent(first: uri, second: uri, ignoreCase?: boolean):
return
false
;
}
export
function
dirname
(
resource
:
uri
):
uri
{
return
resource
.
with
({
path
:
paths
.
dirname
(
resource
.
path
)
});
}
src/vs/workbench/common/editor/untitledEditorInput.ts
浏览文件 @
0359e059
...
...
@@ -11,6 +11,7 @@ import { memoize } from 'vs/base/common/decorators';
import
labels
=
require
(
'
vs/base/common/labels
'
);
import
{
PLAINTEXT_MODE_ID
}
from
'
vs/editor/common/modes/modesRegistry
'
;
import
paths
=
require
(
'
vs/base/common/paths
'
);
import
resources
=
require
(
'
vs/base/common/resources
'
);
import
{
EditorInput
,
IEncodingSupport
,
EncodingMode
,
ConfirmResult
}
from
'
vs/workbench/common/editor
'
;
import
{
UntitledEditorModel
}
from
'
vs/workbench/common/editor/untitledEditorModel
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
@@ -87,22 +88,22 @@ export class UntitledEditorInput extends EditorInput implements IEncodingSupport
}
public
getName
():
string
{
return
this
.
hasAssociatedFilePath
?
paths
.
basename
(
this
.
resource
.
fsPath
)
:
this
.
resource
.
fsP
ath
;
return
this
.
hasAssociatedFilePath
?
resources
.
basenameOrAuthority
(
this
.
resource
)
:
this
.
resource
.
p
ath
;
}
@
memoize
private
get
shortDescription
():
string
{
return
paths
.
basename
(
labels
.
getPathLabel
(
paths
.
dirname
(
this
.
resource
.
path
),
void
0
,
this
.
environmentService
));
return
paths
.
basename
(
labels
.
getPathLabel
(
resources
.
dirname
(
this
.
resource
),
void
0
,
this
.
environmentService
));
}
@
memoize
private
get
mediumDescription
():
string
{
return
labels
.
getPathLabel
(
paths
.
dirname
(
this
.
resource
.
path
),
this
.
contextService
,
this
.
environmentService
);
return
labels
.
getPathLabel
(
resources
.
dirname
(
this
.
resource
),
this
.
contextService
,
this
.
environmentService
);
}
@
memoize
private
get
longDescription
():
string
{
return
labels
.
getPathLabel
(
paths
.
dirname
(
this
.
resource
.
path
),
void
0
,
this
.
environmentService
);
return
labels
.
getPathLabel
(
resources
.
dirname
(
this
.
resource
),
void
0
,
this
.
environmentService
);
}
public
getDescription
(
verbosity
:
Verbosity
=
Verbosity
.
MEDIUM
):
string
{
...
...
src/vs/workbench/parts/files/common/editors/fileEditorInput.ts
浏览文件 @
0359e059
...
...
@@ -8,6 +8,7 @@ import { localize } from 'vs/nls';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
import
paths
=
require
(
'
vs/base/common/paths
'
);
import
resources
=
require
(
'
vs/base/common/resources
'
);
import
labels
=
require
(
'
vs/base/common/labels
'
);
import
URI
from
'
vs/base/common/uri
'
;
import
{
EncodingMode
,
ConfirmResult
,
EditorInput
,
IFileEditorInput
,
ITextEditorModel
}
from
'
vs/workbench/common/editor
'
;
...
...
@@ -117,7 +118,7 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
public
getName
():
string
{
if
(
!
this
.
name
)
{
this
.
name
=
paths
.
basename
(
this
.
resource
.
fsPath
);
this
.
name
=
resources
.
basenameOrAuthority
(
this
.
resource
);
}
return
this
.
decorateOrphanedFiles
(
this
.
name
);
...
...
@@ -125,17 +126,18 @@ export class FileEditorInput extends EditorInput implements IFileEditorInput {
@
memoize
private
get
shortDescription
():
string
{
return
paths
.
basename
(
labels
.
getPathLabel
(
paths
.
dirname
(
this
.
resource
.
path
),
void
0
,
this
.
environmentService
));
return
paths
.
basename
(
labels
.
getPathLabel
(
resources
.
dirname
(
this
.
resource
),
void
0
,
this
.
environmentService
));
}
@
memoize
private
get
mediumDescription
():
string
{
return
labels
.
getPathLabel
(
paths
.
dirname
(
this
.
resource
.
path
),
this
.
contextService
,
this
.
environmentService
);
return
labels
.
getPathLabel
(
resources
.
dirname
(
this
.
resource
),
this
.
contextService
,
this
.
environmentService
);
}
@
memoize
private
get
longDescription
():
string
{
return
labels
.
getPathLabel
(
paths
.
dirname
(
this
.
resource
.
path
),
void
0
,
this
.
environmentService
);
return
labels
.
getPathLabel
(
resources
.
dirname
(
this
.
resource
),
void
0
,
this
.
environmentService
);
}
public
getDescription
(
verbosity
:
Verbosity
=
Verbosity
.
MEDIUM
):
string
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录