Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
镜像
Coder
code-server
提交
a5cf0184
C
code-server
项目概览
镜像
/
Coder
/
code-server
2022-09-21 03:15:05同步失败
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
code-server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a5cf0184
编写于
7月 12, 2021
作者:
J
Joe Previte
提交者:
GitHub
7月 12, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3751 from cdr/jsjoeio-fix-type-confusion
fix: check uri.path is string in pathToFsPath
上级
c1450084
7ce9ee0d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
2 deletion
+51
-2
src/node/util.ts
src/node/util.ts
+10
-2
test/unit/node/util.test.ts
test/unit/node/util.test.ts
+41
-0
未找到文件。
src/node/util.ts
浏览文件 @
a5cf0184
...
...
@@ -10,6 +10,7 @@ import * as path from "path"
import
safeCompare
from
"
safe-compare
"
import
*
as
util
from
"
util
"
import
xdgBasedir
from
"
xdg-basedir
"
import
{
getFirstString
}
from
"
../common/util
"
export
interface
Paths
{
data
:
string
...
...
@@ -457,10 +458,17 @@ enum CharCode {
* Taken from vs/base/common/uri.ts. It's not imported to avoid also importing
* everything that file imports.
*/
export
function
pathToFsPath
(
path
:
string
,
keepDriveLetterCasing
=
false
):
string
{
export
function
pathToFsPath
(
path
:
string
|
string
[]
,
keepDriveLetterCasing
=
false
):
string
{
const
isWindows
=
process
.
platform
===
"
win32
"
const
uri
=
{
authority
:
undefined
,
path
,
scheme
:
"
file
"
}
const
uri
=
{
authority
:
undefined
,
path
:
getFirstString
(
path
)
,
scheme
:
"
file
"
}
let
value
:
string
if
(
typeof
uri
.
path
!==
"
string
"
)
{
throw
new
Error
(
`Could not compute fsPath from given uri. Expected path to be of type string, but was of type
${
typeof
uri
.
path
}
.`
,
)
}
if
(
uri
.
authority
&&
uri
.
path
.
length
>
1
&&
uri
.
scheme
===
"
file
"
)
{
// unc path: file://shares/c$/far/boo
value
=
`//
${
uri
.
authority
}${
uri
.
path
}
`
...
...
test/unit/node/util.test.ts
浏览文件 @
a5cf0184
...
...
@@ -453,3 +453,44 @@ describe("escapeHtml", () => {
)
})
})
describe
(
"
pathToFsPath
"
,
()
=>
{
it
(
"
should convert a path to a file system path
"
,
()
=>
{
expect
(
util
.
pathToFsPath
(
"
/foo/bar/baz
"
)).
toBe
(
"
/foo/bar/baz
"
)
})
it
(
"
should lowercase drive letter casing by default
"
,
()
=>
{
expect
(
util
.
pathToFsPath
(
"
/C:/far/boo
"
)).
toBe
(
"
c:/far/boo
"
)
})
it
(
"
should keep drive letter casing when set to true
"
,
()
=>
{
expect
(
util
.
pathToFsPath
(
"
/C:/far/bo
"
,
true
)).
toBe
(
"
C:/far/bo
"
)
})
it
(
"
should throw an error if a non-string is passed in for path
"
,
()
=>
{
expect
(()
=>
util
// @ts-expect-error We need to check other types
.
pathToFsPath
({}),
).
toThrow
(
`Could not compute fsPath from given uri. Expected path to be of type string, but was of type undefined.`
,
)
})
it
(
"
should not throw an error for a string array
"
,
()
=>
{
// @ts-expect-error We need to check other types
expect
(()
=>
util
.
pathToFsPath
([
"
/hello/foo
"
,
"
/hello/bar
"
]).
not
.
toThrow
())
})
it
(
"
should use the first string in a string array
"
,
()
=>
{
expect
(
util
.
pathToFsPath
([
"
/hello/foo
"
,
"
/hello/bar
"
])).
toBe
(
"
/hello/foo
"
)
})
it
(
"
should replace / with
\\
on Windows
"
,
()
=>
{
let
ORIGINAL_PLATFORM
=
process
.
platform
Object
.
defineProperty
(
process
,
"
platform
"
,
{
value
:
"
win32
"
,
})
expect
(
util
.
pathToFsPath
(
"
/C:/far/boo
"
)).
toBe
(
"
c:
\\
far
\\
boo
"
)
Object
.
defineProperty
(
process
,
"
platform
"
,
{
value
:
ORIGINAL_PLATFORM
,
})
})
})
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录