Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c22bcdb8
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,发现更多精彩内容 >>
提交
c22bcdb8
编写于
8月 07, 2018
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
resources must not use path library
上级
fbb088bb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
105 addition
and
21 deletion
+105
-21
src/vs/base/common/resources.ts
src/vs/base/common/resources.ts
+55
-6
src/vs/base/test/common/resources.test.ts
src/vs/base/test/common/resources.test.ts
+50
-15
未找到文件。
src/vs/base/common/resources.ts
浏览文件 @
c22bcdb8
...
...
@@ -9,6 +9,7 @@ import URI from 'vs/base/common/uri';
import
{
equalsIgnoreCase
}
from
'
vs/base/common/strings
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
isLinux
}
from
'
vs/base/common/platform
'
;
import
{
CharCode
}
from
'
vs/base/common/charCode
'
;
export
function
getComparisonKey
(
resource
:
URI
):
string
{
return
hasToIgnoreCase
(
resource
)
?
resource
.
toString
().
toLowerCase
()
:
resource
.
toString
();
...
...
@@ -21,7 +22,7 @@ export function hasToIgnoreCase(resource: URI): boolean {
}
export
function
basenameOrAuthority
(
resource
:
URI
):
string
{
return
paths
.
basename
(
resource
.
path
)
||
resource
.
authority
;
return
basename_urlpath
(
resource
.
path
)
||
resource
.
authority
;
}
export
function
isEqualOrParent
(
resource
:
URI
,
candidate
:
URI
,
ignoreCase
?:
boolean
):
boolean
{
...
...
@@ -53,21 +54,45 @@ export function isEqual(first: URI, second: URI, ignoreCase?: boolean): boolean
return
first
.
toString
()
===
second
.
toString
();
}
export
function
basename
(
resource
:
URI
):
string
{
if
(
resource
.
scheme
===
'
file
'
)
{
return
paths
.
basename
(
resource
.
fsPath
);
}
return
basename_urlpath
(
resource
.
path
);
}
export
function
dirname
(
resource
:
URI
):
URI
{
const
dirname
=
paths
.
dirname
(
resource
.
path
);
if
(
resource
.
authority
&&
dirname
&&
!
paths
.
isAbsolute
(
dirname
))
{
if
(
resource
.
scheme
===
'
file
'
)
{
return
URI
.
file
(
paths
.
dirname
(
resource
.
fsPath
));
}
let
dirname
=
dirname_urlpath
(
resource
.
path
);
if
(
resource
.
authority
&&
dirname
.
length
&&
dirname
.
charCodeAt
(
0
)
!==
CharCode
.
Slash
)
{
return
null
;
// If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character
}
return
resource
.
with
({
path
:
dirname
});
}
export
function
joinPath
(
resource
:
URI
,
pathFragment
:
string
):
URI
{
const
joinedPath
=
paths
.
join
(
resource
.
path
||
'
/
'
,
pathFragment
);
if
(
resource
.
scheme
===
'
file
'
)
{
return
URI
.
file
(
paths
.
join
(
resource
.
path
||
'
/
'
,
pathFragment
));
}
let
path
=
resource
.
path
||
''
;
let
last
=
path
.
charCodeAt
(
path
.
length
-
1
);
let
next
=
pathFragment
.
charCodeAt
(
0
);
if
(
last
!==
CharCode
.
Slash
)
{
if
(
next
!==
CharCode
.
Slash
)
{
path
+=
'
/
'
;
}
}
else
{
if
(
next
===
CharCode
.
Slash
)
{
pathFragment
=
pathFragment
.
substr
(
1
);
}
}
return
resource
.
with
({
path
:
joinedPath
path
:
path
+
pathFragment
});
}
...
...
@@ -90,3 +115,27 @@ export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => UR
return
distinctParents
;
}
function
dirname_urlpath
(
path
:
string
):
string
{
const
idx
=
~
path
.
lastIndexOf
(
'
/
'
);
if
(
idx
===
0
)
{
return
''
;
}
else
if
(
~
idx
===
0
)
{
return
path
[
0
];
}
else
if
(
~
idx
===
path
.
length
-
1
)
{
return
dirname_urlpath
(
path
.
substring
(
0
,
path
.
length
-
1
));
}
else
{
return
path
.
substring
(
0
,
~
idx
);
}
}
function
basename_urlpath
(
path
:
string
):
string
{
const
idx
=
~
path
.
lastIndexOf
(
'
/
'
);
if
(
idx
===
0
)
{
return
path
;
}
else
if
(
~
idx
===
path
.
length
-
1
)
{
return
basename_urlpath
(
path
.
substring
(
0
,
path
.
length
-
1
));
}
else
{
return
path
.
substr
(
~
idx
+
1
);
}
}
src/vs/base/test/common/resources.test.ts
浏览文件 @
c22bcdb8
...
...
@@ -5,8 +5,7 @@
'
use strict
'
;
import
*
as
assert
from
'
assert
'
;
import
{
normalize
}
from
'
vs/base/common/paths
'
;
import
{
dirname
,
distinctParents
,
joinPath
,
isEqual
,
isEqualOrParent
,
hasToIgnoreCase
}
from
'
vs/base/common/resources
'
;
import
{
dirname
,
basename
,
distinctParents
,
joinPath
,
isEqual
,
isEqualOrParent
,
hasToIgnoreCase
}
from
'
vs/base/common/resources
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
isWindows
}
from
'
vs/base/common/platform
'
;
...
...
@@ -44,26 +43,62 @@ suite('Resources', () => {
});
test
(
'
dirname
'
,
()
=>
{
const
f
=
URI
.
file
(
'
/some/file/test.txt
'
);
const
d
=
dirname
(
f
);
assert
.
equal
(
d
.
fsPath
,
normalize
(
'
/some/file
'
,
true
));
if
(
isWindows
)
{
assert
.
equal
(
dirname
(
URI
.
file
(
'
c:
\\
some
\\
file
\\
test.txt
'
)).
toString
(),
'
file:///c%3A/some/file
'
);
assert
.
equal
(
dirname
(
URI
.
file
(
'
c:
\\
some
\\
file
'
)).
toString
(),
'
file:///c%3A/some
'
);
assert
.
equal
(
dirname
(
URI
.
file
(
'
c:
\\
some
\\
file
\\
'
)).
toString
(),
'
file:///c%3A/some
'
);
assert
.
equal
(
dirname
(
URI
.
file
(
'
c:
\\
some
'
)).
toString
(),
'
file:///c%3A/
'
);
}
else
{
assert
.
equal
(
dirname
(
URI
.
file
(
'
/some/file/test.txt
'
)).
toString
(),
'
file:///some/file
'
);
assert
.
equal
(
dirname
(
URI
.
file
(
'
/some/file/
'
)).
toString
(),
'
file:///some
'
);
assert
.
equal
(
dirname
(
URI
.
file
(
'
/some/file
'
)).
toString
(),
'
file:///some
'
);
assert
.
equal
(
dirname
(
URI
.
file
(
'
/some/file
'
)).
toString
(),
'
file:///some
'
);
}
assert
.
equal
(
dirname
(
URI
.
parse
(
'
foo://a/some/file/test.txt
'
)).
toString
(),
'
foo://a/some/file
'
);
assert
.
equal
(
dirname
(
URI
.
parse
(
'
foo://a/some/file/
'
)).
toString
(),
'
foo://a/some
'
);
assert
.
equal
(
dirname
(
URI
.
parse
(
'
foo://a/some/file
'
)).
toString
(),
'
foo://a/some
'
);
assert
.
equal
(
dirname
(
URI
.
parse
(
'
foo://a/some
'
)).
toString
(),
'
foo://a/
'
);
// does not explode (https://github.com/Microsoft/vscode/issues/41987)
dirname
(
URI
.
from
({
scheme
:
'
file
'
,
authority
:
'
/users/someone/portal.h
'
}));
});
test
(
'
joinPath
'
,
()
=>
{
assert
.
equal
(
joinPath
(
URI
.
file
(
'
/foo/bar
'
),
'
/file.js
'
).
toString
(),
'
file:///foo/bar/file.js
'
);
test
(
'
basename
'
,
()
=>
{
if
(
isWindows
)
{
assert
.
equal
(
basename
(
URI
.
file
(
'
c:
\\
some
\\
file
\\
test.txt
'
)).
toString
(),
'
test.txt
'
);
assert
.
equal
(
basename
(
URI
.
file
(
'
c:
\\
some
\\
file
'
)).
toString
(),
'
file
'
);
assert
.
equal
(
basename
(
URI
.
file
(
'
c:
\\
some
\\
file
\\
'
)).
toString
(),
'
file
'
);
}
else
{
assert
.
equal
(
basename
(
URI
.
file
(
'
/some/file/test.txt
'
)).
toString
(),
'
test.txt
'
);
assert
.
equal
(
basename
(
URI
.
file
(
'
/some/file/
'
)).
toString
(),
'
file
'
);
assert
.
equal
(
basename
(
URI
.
file
(
'
/some/file
'
)).
toString
(),
'
file
'
);
assert
.
equal
(
basename
(
URI
.
file
(
'
/some
'
)).
toString
(),
'
some
'
);
}
assert
.
equal
(
basename
(
URI
.
parse
(
'
foo://a/some/file/test.txt
'
)).
toString
(),
'
test.txt
'
);
assert
.
equal
(
basename
(
URI
.
parse
(
'
foo://a/some/file/
'
)).
toString
(),
'
file
'
);
assert
.
equal
(
basename
(
URI
.
parse
(
'
foo://a/some/file
'
)).
toString
(),
'
file
'
);
assert
.
equal
(
basename
(
URI
.
parse
(
'
foo://a/some
'
)).
toString
(),
'
some
'
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
/foo/bar/
'
),
'
/file.js
'
).
toString
(),
'
file:///foo/bar/file.js
'
);
// does not explode (https://github.com/Microsoft/vscode/issues/41987)
dirname
(
URI
.
from
({
scheme
:
'
file
'
,
authority
:
'
/users/someone/portal.h
'
}));
}
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
/
'
),
'
/file.js
'
).
toString
(),
'
file:///file.js
'
);
test
(
'
joinPath
'
,
()
=>
{
if
(
isWindows
)
{
assert
.
equal
(
joinPath
(
URI
.
file
(
'
c:
\\
foo
\\
bar
'
),
'
/file.js
'
).
toString
(),
'
file:///c%3A/foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
c:
\\
foo
\\
bar
\\
'
),
'
file.js
'
).
toString
(),
'
file:///c%3A/foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
c:
\\
foo
\\
bar
\\
'
),
'
/file.js
'
).
toString
(),
'
file:///c%3A/foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
c:
\\
'
),
'
/file.js
'
).
toString
(),
'
file:///c%3A/file.js
'
);
}
else
{
assert
.
equal
(
joinPath
(
URI
.
file
(
'
/foo/bar
'
),
'
/file.js
'
).
toString
(),
'
file:///foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
/foo/bar
'
),
'
file.js
'
).
toString
(),
'
file:///foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
/foo/bar/
'
),
'
/file.js
'
).
toString
(),
'
file:///foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
file
(
'
/
'
),
'
/file.js
'
).
toString
(),
'
file:///file.js
'
);
}
assert
.
equal
(
joinPath
(
URI
.
parse
(
'
foo://a/foo/bar
'
),
'
/file.js
'
).
toString
(),
'
foo://a/foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
parse
(
'
foo://a/foo/bar
'
),
'
file.js
'
).
toString
(),
'
foo://a/foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
parse
(
'
foo://a/foo/bar/
'
),
'
/file.js
'
).
toString
(),
'
foo://a/foo/bar/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
parse
(
'
foo://a/
'
),
'
/file.js
'
).
toString
(),
'
foo://a/file.js
'
);
assert
.
equal
(
joinPath
(
URI
.
from
({
scheme
:
'
myScheme
'
,
authority
:
'
authority
'
,
path
:
'
/path
'
,
query
:
'
query
'
,
fragment
:
'
fragment
'
}),
'
/file.js
'
).
toString
(),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录