Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d6c439a5
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,发现更多精彩内容 >>
提交
d6c439a5
编写于
6月 28, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
"Add root folder" on windows adds "
file:///c%3a/Users/...
" (fixes #29691)
上级
e1b9a2fe
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
6 deletion
+7
-6
src/vs/workbench/services/configuration/node/configuration.ts
...vs/workbench/services/configuration/node/configuration.ts
+1
-1
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
...kbench/services/workspace/node/workspaceEditingService.ts
+6
-5
未找到文件。
src/vs/workbench/services/configuration/node/configuration.ts
浏览文件 @
d6c439a5
...
@@ -202,7 +202,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
...
@@ -202,7 +202,7 @@ export class WorkspaceConfigurationService extends Disposable implements IWorksp
let
configuredFolders
:
URI
[]
=
[
master
];
let
configuredFolders
:
URI
[]
=
[
master
];
const
config
=
this
.
getConfiguration
<
IWorkspaceFoldersConfiguration
>
(
'
workspace
'
);
const
config
=
this
.
getConfiguration
<
IWorkspaceFoldersConfiguration
>
(
'
workspace
'
);
if
(
config
)
{
if
(
config
)
{
const
workspaceConfig
=
config
[
master
.
toString
()];
const
workspaceConfig
=
config
[
master
.
toString
(
true
/* skip encoding */
)];
if
(
workspaceConfig
)
{
if
(
workspaceConfig
)
{
const
additionalFolders
=
workspaceConfig
.
folders
const
additionalFolders
=
workspaceConfig
.
folders
.
map
(
f
=>
URI
.
parse
(
f
))
.
map
(
f
=>
URI
.
parse
(
f
))
...
...
src/vs/workbench/services/workspace/node/workspaceEditingService.ts
浏览文件 @
d6c439a5
...
@@ -67,8 +67,9 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -67,8 +67,9 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
private
doSetRoots
(
newRoots
:
URI
[]):
TPromise
<
void
>
{
private
doSetRoots
(
newRoots
:
URI
[]):
TPromise
<
void
>
{
const
workspaceUserConfig
=
this
.
configurationService
.
lookup
(
workspaceConfigKey
).
user
as
IWorkspaceConfiguration
||
Object
.
create
(
null
);
const
workspaceUserConfig
=
this
.
configurationService
.
lookup
(
workspaceConfigKey
).
user
as
IWorkspaceConfiguration
||
Object
.
create
(
null
);
const
master
=
this
.
contextService
.
getWorkspace2
().
roots
[
0
];
const
master
=
this
.
contextService
.
getWorkspace2
().
roots
[
0
];
const
masterKey
=
master
.
toString
(
true
/* skip encoding */
);
const
currentWorkspaceRoots
=
this
.
validateRoots
(
master
,
workspaceUserConfig
[
master
.
toString
()]
&&
workspaceUserConfig
[
master
.
toString
()
].
folders
);
const
currentWorkspaceRoots
=
this
.
validateRoots
(
master
,
workspaceUserConfig
[
master
Key
]
&&
workspaceUserConfig
[
masterKey
].
folders
);
const
newWorkspaceRoots
=
this
.
validateRoots
(
master
,
newRoots
);
const
newWorkspaceRoots
=
this
.
validateRoots
(
master
,
newRoots
);
// See if there are any changes
// See if there are any changes
...
@@ -78,11 +79,11 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -78,11 +79,11 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
// Apply to config
// Apply to config
if
(
newWorkspaceRoots
.
length
)
{
if
(
newWorkspaceRoots
.
length
)
{
workspaceUserConfig
[
master
.
toString
()
]
=
{
workspaceUserConfig
[
master
Key
]
=
{
folders
:
newWorkspaceRoots
folders
:
newWorkspaceRoots
};
};
}
else
{
}
else
{
delete
workspaceUserConfig
[
master
.
toString
()
];
delete
workspaceUserConfig
[
master
Key
];
}
}
return
this
.
configurationEditingService
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
workspaceConfigKey
,
value
:
workspaceUserConfig
}).
then
(()
=>
void
0
);
return
this
.
configurationEditingService
.
writeConfiguration
(
ConfigurationTarget
.
USER
,
{
key
:
workspaceConfigKey
,
value
:
workspaceUserConfig
}).
then
(()
=>
void
0
);
...
@@ -94,10 +95,10 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
...
@@ -94,10 +95,10 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
}
}
// Prevent duplicates
// Prevent duplicates
const
validatedRoots
=
distinct
(
roots
.
map
(
root
=>
root
.
toString
()));
const
validatedRoots
=
distinct
(
roots
.
map
(
root
=>
root
.
toString
(
true
/* skip encoding */
)));
// Make sure we do not set the master folder as root
// Make sure we do not set the master folder as root
const
masterIndex
=
validatedRoots
.
indexOf
(
master
.
toString
());
const
masterIndex
=
validatedRoots
.
indexOf
(
master
.
toString
(
true
/* skip encoding */
));
if
(
masterIndex
>=
0
)
{
if
(
masterIndex
>=
0
)
{
validatedRoots
.
splice
(
masterIndex
,
1
);
validatedRoots
.
splice
(
masterIndex
,
1
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录