Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
d3062aa1
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,发现更多精彩内容 >>
提交
d3062aa1
编写于
1月 29, 2016
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Keep identity with relative paths, fixes #2549
上级
8c94e89e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
12 deletion
+29
-12
src/vs/base/common/uri.ts
src/vs/base/common/uri.ts
+3
-1
src/vs/base/test/common/uri.test.ts
src/vs/base/test/common/uri.test.ts
+16
-1
src/vs/languages/typescript.workbench/test/common/projectResolver.test.ts
.../typescript.workbench/test/common/projectResolver.test.ts
+5
-5
src/vs/workbench/test/node/api/extHostTypes.test.ts
src/vs/workbench/test/node/api/extHostTypes.test.ts
+5
-5
未找到文件。
src/vs/base/common/uri.ts
浏览文件 @
d3062aa1
...
...
@@ -168,6 +168,8 @@ export default class URI {
path
=
path
.
replace
(
/%/g
,
'
%25
'
);
path
=
path
.
replace
(
/#/g
,
'
%23
'
);
path
=
path
.
replace
(
/
\?
/g
,
'
%3F
'
);
// makes sure something like 'C:/Users' isn't
// parsed as scheme='C', path='Users'
path
=
URI
.
_driveLetter
.
test
(
path
)
?
'
/
'
+
path
:
path
;
...
...
@@ -178,7 +180,7 @@ export default class URI {
}
ret
=
ret
.
with
(
'
file
'
,
undefined
,
decodeURIComponent
(
ret
.
path
),
decodeURIComponent
(
ret
.
path
[
0
]
===
'
/
'
?
ret
.
path
:
'
/
'
+
ret
.
path
),
// path starts with slash
undefined
,
undefined
);
return
ret
;
...
...
src/vs/base/test/common/uri.test.ts
浏览文件 @
d3062aa1
...
...
@@ -24,7 +24,7 @@ suite('URI', () => {
assert
.
equal
(
URI
.
file
(
'
c:/win/path/
'
).
fsPath
.
replace
(
/
\\
/g
,
'
/
'
),
'
c:/win/path/
'
);
assert
.
equal
(
URI
.
file
(
'
C:/win/path
'
).
fsPath
.
replace
(
/
\\
/g
,
'
/
'
),
'
c:/win/path
'
);
assert
.
equal
(
URI
.
file
(
'
/c:/win/path
'
).
fsPath
.
replace
(
/
\\
/g
,
'
/
'
),
'
c:/win/path
'
);
assert
.
equal
(
URI
.
file
(
'
./c/win/path
'
).
fsPath
.
replace
(
/
\\
/g
,
'
/
'
),
'
./c/win/path
'
);
assert
.
equal
(
URI
.
file
(
'
./c/win/path
'
).
fsPath
.
replace
(
/
\\
/g
,
'
/
'
),
'
/
./c/win/path
'
);
assert
.
equal
(
URI
.
file
(
'
c:
\\
win
\\
path
'
).
fsPath
.
replace
(
/
\\
/g
,
'
/
'
),
'
c:/win/path
'
);
assert
.
equal
(
URI
.
file
(
'
c:
\\
win/path
'
).
fsPath
.
replace
(
/
\\
/g
,
'
/
'
),
'
c:/win/path
'
);
});
...
...
@@ -276,6 +276,21 @@ suite('URI', () => {
assert
.
equal
(
value
.
toString
(),
'
file:///c%3A/test/drive
'
);
});
test
(
'
URI#file, always slash
'
,
()
=>
{
var
value
=
URI
.
file
(
'
a.file
'
);
assert
.
equal
(
value
.
scheme
,
'
file
'
);
assert
.
equal
(
value
.
authority
,
''
);
assert
.
equal
(
value
.
path
,
'
/a.file
'
);
assert
.
equal
(
value
.
toString
(),
'
file:///a.file
'
);
value
=
URI
.
parse
(
value
.
toString
());
assert
.
equal
(
value
.
scheme
,
'
file
'
);
assert
.
equal
(
value
.
authority
,
''
);
assert
.
equal
(
value
.
path
,
'
/a.file
'
);
assert
.
equal
(
value
.
toString
(),
'
file:///a.file
'
);
});
test
(
'
URI#file, disallow scheme
'
,
()
=>
{
assert
.
throws
(()
=>
URI
.
file
(
'
file:///some/path
'
));
});
...
...
src/vs/languages/typescript.workbench/test/common/projectResolver.test.ts
浏览文件 @
d3062aa1
...
...
@@ -229,11 +229,11 @@ suite('TS - Project Resolver', () => {
};
var
files
:
{
[
n
:
string
]:
string
}
=
Object
.
create
(
null
);
files
[
'
jsconfig.json
'
]
=
'
{}
'
;
files
[
'
a.js
'
]
=
'
a
'
;
files
[
'
b.js
'
]
=
'
b
'
;
files
[
'
c.d.ts
'
]
=
'
c
'
;
files
[
'
d.ts
'
]
=
'
d
'
;
files
[
'
/
jsconfig.json
'
]
=
'
{}
'
;
files
[
'
/
a.js
'
]
=
'
a
'
;
files
[
'
/
b.js
'
]
=
'
b
'
;
files
[
'
/
c.d.ts
'
]
=
'
c
'
;
files
[
'
/
d.ts
'
]
=
'
d
'
;
var
resolver
=
instantiationService
.
createChild
({
searchService
:
createSearchService
(
files
),
...
...
src/vs/workbench/test/node/api/extHostTypes.test.ts
浏览文件 @
d3062aa1
...
...
@@ -289,15 +289,15 @@ suite('ExtHostTypes', function() {
edit
.
set
(
a
,
[
types
.
TextEdit
.
insert
(
new
types
.
Position
(
0
,
0
),
'
fff
'
)]);
assert
.
ok
(
edit
.
has
(
a
));
assert
.
equal
(
edit
.
size
,
1
);
assertToJSON
(
edit
,
[[
'
file://a.ts
'
,
[{
range
:
[{
line
:
0
,
character
:
0
},
{
line
:
0
,
character
:
0
}],
newText
:
'
fff
'
}]]]);
assertToJSON
(
edit
,
[[
'
file://
/
a.ts
'
,
[{
range
:
[{
line
:
0
,
character
:
0
},
{
line
:
0
,
character
:
0
}],
newText
:
'
fff
'
}]]]);
edit
.
insert
(
b
,
new
types
.
Position
(
1
,
1
),
'
fff
'
);
edit
.
delete
(
b
,
new
types
.
Range
(
0
,
0
,
0
,
0
));
assert
.
ok
(
edit
.
has
(
b
));
assert
.
equal
(
edit
.
size
,
2
);
assertToJSON
(
edit
,
[
[
'
file://a.ts
'
,
[{
range
:
[{
line
:
0
,
character
:
0
},
{
line
:
0
,
character
:
0
}],
newText
:
'
fff
'
}]],
[
'
file://b.ts
'
,
[{
range
:
[{
line
:
1
,
character
:
1
},
{
line
:
1
,
character
:
1
}],
newText
:
'
fff
'
},
{
range
:
[{
line
:
0
,
character
:
0
},
{
line
:
0
,
character
:
0
}],
newText
:
''
}]]
[
'
file://
/
a.ts
'
,
[{
range
:
[{
line
:
0
,
character
:
0
},
{
line
:
0
,
character
:
0
}],
newText
:
'
fff
'
}]],
[
'
file://
/
b.ts
'
,
[{
range
:
[{
line
:
1
,
character
:
1
},
{
line
:
1
,
character
:
1
}],
newText
:
'
fff
'
},
{
range
:
[{
line
:
0
,
character
:
0
},
{
line
:
0
,
character
:
0
}],
newText
:
''
}]]
]);
edit
.
set
(
b
,
undefined
);
...
...
@@ -313,8 +313,8 @@ suite('ExtHostTypes', function() {
assertToJSON
(
new
types
.
Selection
(
3
,
4
,
2
,
1
),
{
start
:
{
line
:
2
,
character
:
1
},
end
:
{
line
:
3
,
character
:
4
},
anchor
:
{
line
:
3
,
character
:
4
},
active
:
{
line
:
2
,
character
:
1
}
});
assertToJSON
(
new
types
.
Location
(
types
.
Uri
.
file
(
'
u.ts
'
),
new
types
.
Range
(
1
,
2
,
3
,
4
)),
{
uri
:
'
file://u.ts
'
,
range
:
[{
line
:
1
,
character
:
2
},
{
line
:
3
,
character
:
4
}]
});
assertToJSON
(
new
types
.
Location
(
types
.
Uri
.
file
(
'
u.ts
'
),
new
types
.
Position
(
3
,
4
)),
{
uri
:
'
file://u.ts
'
,
range
:
[{
line
:
3
,
character
:
4
},
{
line
:
3
,
character
:
4
}]
});
assertToJSON
(
new
types
.
Location
(
types
.
Uri
.
file
(
'
u.ts
'
),
new
types
.
Range
(
1
,
2
,
3
,
4
)),
{
uri
:
'
file://
/
u.ts
'
,
range
:
[{
line
:
1
,
character
:
2
},
{
line
:
3
,
character
:
4
}]
});
assertToJSON
(
new
types
.
Location
(
types
.
Uri
.
file
(
'
u.ts
'
),
new
types
.
Position
(
3
,
4
)),
{
uri
:
'
file://
/
u.ts
'
,
range
:
[{
line
:
3
,
character
:
4
},
{
line
:
3
,
character
:
4
}]
});
let
diag
=
new
types
.
Diagnostic
(
new
types
.
Range
(
0
,
1
,
2
,
3
),
'
hello
'
);
assertToJSON
(
diag
,
{
severity
:
'
Error
'
,
message
:
'
hello
'
,
range
:
[{
line
:
0
,
character
:
1
},
{
line
:
2
,
character
:
3
}]
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录