Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f6b8a274
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,体验更适合开发者的 AI 搜索 >>
提交
f6b8a274
编写于
2月 24, 2019
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
workspaceSuffux also for workspace label
上级
b5833ebd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
13 deletion
+19
-13
src/vs/base/common/labels.ts
src/vs/base/common/labels.ts
+1
-1
src/vs/workbench/services/label/common/labelService.ts
src/vs/workbench/services/label/common/labelService.ts
+18
-12
未找到文件。
src/vs/base/common/labels.ts
浏览文件 @
f6b8a274
...
...
@@ -36,7 +36,7 @@ export function getPathLabel(resource: URI | string, userHomeProvider?: IUserHom
const
hasMultipleRoots
=
rootProvider
.
getWorkspace
().
folders
.
length
>
1
;
let
pathLabel
:
string
;
if
(
isEqual
(
baseResource
.
uri
,
resource
,
!
isLinux
))
{
if
(
isEqual
(
baseResource
.
uri
,
resource
))
{
pathLabel
=
''
;
// no label if paths are identical
}
else
{
// TODO: isidor use resources.relative
...
...
src/vs/workbench/services/label/common/labelService.ts
浏览文件 @
f6b8a274
...
...
@@ -12,7 +12,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IWorkspaceContextService
,
IWorkspace
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
isEqual
,
basenameOrAuthority
,
isEqualOrParent
,
basename
,
joinPath
,
dirname
}
from
'
vs/base/common/resources
'
;
import
{
is
Linux
,
is
Windows
}
from
'
vs/base/common/platform
'
;
import
{
isWindows
}
from
'
vs/base/common/platform
'
;
import
{
tildify
,
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
ltrim
,
endsWith
}
from
'
vs/base/common/strings
'
;
import
{
IWorkspaceIdentifier
,
ISingleFolderWorkspaceIdentifier
,
isSingleFolderWorkspaceIdentifier
,
WORKSPACE_EXTENSION
,
toWorkspaceIdentifier
,
isWorkspaceIdentifier
}
from
'
vs/platform/workspaces/common/workspaces
'
;
...
...
@@ -137,7 +137,7 @@ export class LabelService implements ILabelService {
if
(
options
.
relative
&&
baseResource
)
{
let
relativeLabel
:
string
;
if
(
isEqual
(
baseResource
.
uri
,
resource
,
!
isLinux
))
{
if
(
isEqual
(
baseResource
.
uri
,
resource
))
{
relativeLabel
=
''
;
// no label if resources are identical
}
else
{
const
baseResourceLabel
=
this
.
formatUri
(
baseResource
.
uri
,
formatting
,
options
.
noPrefix
);
...
...
@@ -172,13 +172,7 @@ export class LabelService implements ILabelService {
if
(
isSingleFolderWorkspaceIdentifier
(
workspace
))
{
// Folder on disk
const
label
=
options
&&
options
.
verbose
?
this
.
getUriLabel
(
workspace
)
:
basename
(
workspace
)
||
'
/
'
;
if
(
workspace
.
scheme
===
Schemas
.
file
)
{
return
label
;
}
const
formatting
=
this
.
findFormatting
(
workspace
);
const
suffix
=
formatting
&&
(
typeof
formatting
.
workspaceSuffix
===
'
string
'
)
?
formatting
.
workspaceSuffix
:
workspace
.
scheme
;
return
suffix
?
`
${
label
}
(
${
suffix
}
)`
:
label
;
return
this
.
appendWorkspaceSuffix
(
label
,
workspace
);
}
// Workspace: Untitled
...
...
@@ -189,11 +183,13 @@ export class LabelService implements ILabelService {
// Workspace: Saved
const
filename
=
basename
(
workspace
.
configPath
);
const
workspaceName
=
filename
.
substr
(
0
,
filename
.
length
-
WORKSPACE_EXTENSION
.
length
-
1
);
let
label
;
if
(
options
&&
options
.
verbose
)
{
return
localize
(
'
workspaceNameVerbose
'
,
"
{0} (Workspace)
"
,
this
.
getUriLabel
(
joinPath
(
dirname
(
workspace
.
configPath
),
workspaceName
)));
label
=
localize
(
'
workspaceNameVerbose
'
,
"
{0} (Workspace)
"
,
this
.
getUriLabel
(
joinPath
(
dirname
(
workspace
.
configPath
),
workspaceName
)));
}
else
{
label
=
localize
(
'
workspaceName
'
,
"
{0} (Workspace)
"
,
workspaceName
);
}
return
localize
(
'
workspaceName
'
,
"
{0} (Workspace)
"
,
workspaceName
);
return
this
.
appendWorkspaceSuffix
(
label
,
workspace
.
configPath
);
}
getSeparator
(
scheme
:
string
,
authority
?:
string
):
'
/
'
|
'
\\
'
{
...
...
@@ -250,4 +246,14 @@ export class LabelService implements ILabelService {
}
return
appendedLabel
;
}
private
appendWorkspaceSuffix
(
label
:
string
,
uri
:
URI
):
string
{
if
(
uri
.
scheme
===
Schemas
.
file
)
{
return
label
;
}
const
formatting
=
this
.
findFormatting
(
uri
);
const
suffix
=
formatting
&&
(
typeof
formatting
.
workspaceSuffix
===
'
string
'
)
?
formatting
.
workspaceSuffix
:
uri
.
scheme
;
return
suffix
?
`
${
label
}
(
${
suffix
}
)`
:
label
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录