Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bc9064f1
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,发现更多精彩内容 >>
提交
bc9064f1
编写于
9月 12, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
slightly better workspace saving format
上级
86fb1a39
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
8 deletion
+24
-8
src/vs/base/common/labels.ts
src/vs/base/common/labels.ts
+17
-5
src/vs/platform/workspaces/electron-main/workspacesMainService.ts
...latform/workspaces/electron-main/workspacesMainService.ts
+7
-3
未找到文件。
src/vs/base/common/labels.ts
浏览文件 @
bc9064f1
...
...
@@ -28,7 +28,7 @@ export interface IUserHomeProvider {
userHome
:
string
;
}
export
function
getPathLabel
(
resource
:
URI
|
string
,
rootProvider
?:
IRootProvider
,
userHomeProvider
?:
IUserHomeProvider
,
toOSPath
=
true
):
string
{
export
function
getPathLabel
(
resource
:
URI
|
string
,
rootProvider
?:
IRootProvider
,
userHomeProvider
?:
IUserHomeProvider
):
string
{
if
(
!
resource
)
{
return
null
;
}
...
...
@@ -46,7 +46,7 @@ export function getPathLabel(resource: URI | string, rootProvider?: IRootProvide
if
(
isEqual
(
baseResource
.
fsPath
,
resource
.
fsPath
,
!
platform
.
isLinux
/* ignorecase */
))
{
pathLabel
=
''
;
// no label if pathes are identical
}
else
{
pathLabel
=
normalize
(
ltrim
(
resource
.
fsPath
.
substr
(
baseResource
.
fsPath
.
length
),
nativeSep
),
t
oOSPath
);
pathLabel
=
normalize
(
ltrim
(
resource
.
fsPath
.
substr
(
baseResource
.
fsPath
.
length
),
nativeSep
),
t
rue
);
}
if
(
hasMultipleRoots
)
{
...
...
@@ -58,12 +58,12 @@ export function getPathLabel(resource: URI | string, rootProvider?: IRootProvide
}
// convert c:\something => C:\something
if
(
platform
.
isWindows
&&
resource
.
fsPath
&&
resource
.
fsPath
[
1
]
===
'
:
'
)
{
return
normalize
(
resource
.
fsPath
.
charAt
(
0
).
toUpperCase
()
+
resource
.
fsPath
.
slice
(
1
),
toOSPath
);
if
(
hasDriveLetter
(
resource
.
fsPath
)
)
{
return
normalize
(
normalizeDriveLetter
(
resource
.
fsPath
),
true
);
}
// normalize and tildify (macOS, Linux only)
let
res
=
normalize
(
resource
.
fsPath
,
t
oOSPath
);
let
res
=
normalize
(
resource
.
fsPath
,
t
rue
);
if
(
!
platform
.
isWindows
&&
userHomeProvider
)
{
res
=
tildify
(
res
,
userHomeProvider
.
userHome
);
}
...
...
@@ -71,6 +71,18 @@ export function getPathLabel(resource: URI | string, rootProvider?: IRootProvide
return
res
;
}
function
hasDriveLetter
(
path
:
string
):
boolean
{
return
platform
.
isWindows
&&
path
&&
path
[
1
]
===
'
:
'
;
}
export
function
normalizeDriveLetter
(
path
:
string
):
string
{
if
(
hasDriveLetter
(
path
))
{
return
path
.
charAt
(
0
).
toUpperCase
()
+
path
.
slice
(
1
);
}
return
path
;
}
export
function
tildify
(
path
:
string
,
userHome
:
string
):
string
{
if
(
path
&&
(
platform
.
isMacintosh
||
platform
.
isLinux
)
&&
isEqualOrParent
(
path
,
userHome
,
!
platform
.
isLinux
/* ignorecase */
))
{
path
=
`~
${
path
.
substr
(
userHome
.
length
)}
`
;
...
...
src/vs/platform/workspaces/electron-main/workspacesMainService.ts
浏览文件 @
bc9064f1
...
...
@@ -16,13 +16,13 @@ import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
import
{
delSync
,
readdirSync
}
from
'
vs/base/node/extfs
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
isEqual
,
isEqualOrParent
}
from
'
vs/base/common/paths
'
;
import
{
isEqual
,
isEqualOrParent
,
normalize
}
from
'
vs/base/common/paths
'
;
import
{
coalesce
}
from
'
vs/base/common/arrays
'
;
import
{
createHash
}
from
'
crypto
'
;
import
*
as
json
from
'
vs/base/common/json
'
;
import
*
as
jsonEdit
from
'
vs/base/common/jsonEdit
'
;
import
{
applyEdit
}
from
'
vs/base/common/jsonFormatter
'
;
import
{
getPathLabel
}
from
'
vs/base/common/labels
'
;
import
{
normalizeDriveLetter
}
from
'
vs/base/common/labels
'
;
const
SLASH
=
'
/
'
;
...
...
@@ -227,7 +227,11 @@ export class WorkspacesMainService implements IWorkspacesMainService {
// - convert to slashes if we want to use slashes for paths
if
(
isWindows
)
{
if
(
isAbsolute
(
folder
.
path
))
{
folder
.
path
=
getPathLabel
(
folder
.
path
,
void
0
,
void
0
,
!
useSlashesForPath
/* toOSPath */
);
if
(
useSlashesForPath
)
{
folder
.
path
=
normalize
(
folder
.
path
,
false
/* do not use OS path separator */
);
}
folder
.
path
=
normalizeDriveLetter
(
folder
.
path
);
}
else
if
(
useSlashesForPath
)
{
folder
.
path
=
folder
.
path
.
replace
(
/
[\\]
/g
,
SLASH
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录