Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
9afde2fc
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,发现更多精彩内容 >>
提交
9afde2fc
编写于
4月 07, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FileLabel can't handle UNC paths very well (fixes #24235)
上级
246d39b2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
10 deletion
+6
-10
src/vs/base/common/labels.ts
src/vs/base/common/labels.ts
+3
-3
src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
...kbench/parts/welcome/page/electron-browser/welcomePage.ts
+3
-7
未找到文件。
src/vs/base/common/labels.ts
浏览文件 @
9afde2fc
...
...
@@ -9,7 +9,7 @@ import platform = require('vs/base/common/platform');
import
types
=
require
(
'
vs/base/common/types
'
);
import
{
nativeSep
,
normalize
}
from
'
vs/base/common/paths
'
;
import
{
endsWith
,
ltrim
}
from
'
vs/base/common/strings
'
;
import
{
isEqualOrParent
}
from
'
vs/platform/files/common/files
'
;
import
{
isEqualOrParent
,
isEqual
}
from
'
vs/platform/files/common/files
'
;
export
interface
ILabelProvider
{
...
...
@@ -46,7 +46,7 @@ export function getPathLabel(resource: URI | string, basePathProvider?: URI | st
const
basepath
=
basePathProvider
&&
getPath
(
basePathProvider
);
if
(
basepath
&&
isEqualOrParent
(
absolutePath
,
basepath
,
!
platform
.
isLinux
/* ignorecase */
))
{
if
(
basepath
===
absolutePath
)
{
if
(
isEqual
(
basepath
,
absolutePath
,
!
platform
.
isLinux
/* ignorecase */
)
)
{
return
''
;
// no label if pathes are identical
}
...
...
@@ -78,7 +78,7 @@ function getPath(arg1: URI | string | IWorkspaceProvider): string {
}
export
function
tildify
(
path
:
string
,
userHome
:
string
):
string
{
if
(
path
&&
(
platform
.
isMacintosh
||
platform
.
isLinux
)
&&
path
.
indexOf
(
userHome
)
===
0
)
{
if
(
path
&&
(
platform
.
isMacintosh
||
platform
.
isLinux
)
&&
isEqualOrParent
(
path
,
userHome
,
!
platform
.
isLinux
/* ignorecase */
)
)
{
path
=
`~
${
path
.
substr
(
userHome
.
length
)}
`
;
}
...
...
src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts
浏览文件 @
9afde2fc
...
...
@@ -7,8 +7,6 @@
import
'
vs/css!./welcomePage
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
*
as
path
from
'
path
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
*
as
arrays
from
'
vs/base/common/arrays
'
;
import
{
WalkThroughInput
}
from
'
vs/workbench/parts/welcome/walkThrough/node/walkThroughInput
'
;
import
{
IWorkbenchContribution
}
from
'
vs/workbench/common/contributions
'
;
...
...
@@ -34,6 +32,7 @@ import { IExtensionEnablementService, IExtensionManagementService, IExtensionGal
import
{
used
}
from
'
vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page
'
;
import
{
ILifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
tildify
}
from
"
vs/base/common/labels
"
;
used
();
...
...
@@ -146,7 +145,7 @@ class WelcomePage {
.
then
(
null
,
error
=>
this
.
messageService
.
show
(
Severity
.
Error
,
error
));
});
recentlyOpened
.
then
(({
folders
})
=>
{
recentlyOpened
.
then
(({
folders
})
=>
{
if
(
this
.
contextService
.
hasWorkspace
())
{
const
current
=
this
.
contextService
.
getWorkspace
().
resource
.
fsPath
;
folders
=
folders
.
filter
(
folder
=>
folder
!==
current
);
...
...
@@ -184,10 +183,7 @@ class WelcomePage {
const
span
=
document
.
createElement
(
'
span
'
);
span
.
classList
.
add
(
'
path
'
);
if
((
platform
.
isMacintosh
||
platform
.
isLinux
)
&&
strings
.
startsWith
(
parentFolder
,
this
.
environmentService
.
userHome
))
{
parentFolder
=
`~
${
parentFolder
.
substr
(
this
.
environmentService
.
userHome
.
length
)}
`
;
}
span
.
innerText
=
parentFolder
;
span
.
innerText
=
tildify
(
parentFolder
,
this
.
environmentService
.
userHome
);
span
.
title
=
folder
;
li
.
appendChild
(
span
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录