Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f3ca4f6e
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,发现更多精彩内容 >>
提交
f3ca4f6e
编写于
5月 09, 2017
作者:
M
Michel Kaporin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added handling for multiple '--user-data-dir' to enable Spectron smoke testing in #25291.
上级
e4c6a965
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
2 deletion
+23
-2
src/main.js
src/main.js
+8
-1
src/vs/platform/environment/node/argv.ts
src/vs/platform/environment/node/argv.ts
+8
-1
src/vs/platform/environment/test/node/environmentService.test.ts
...platform/environment/test/node/environmentService.test.ts
+7
-0
未找到文件。
src/main.js
浏览文件 @
f3ca4f6e
...
...
@@ -170,8 +170,15 @@ function mkdir(dir) {
});
}
// Because Spectron doesn't allow us to pass a custom user-data-dir,
// Code receives two of them. Let's just take the first one.
var
userDataDir
=
args
[
'
user-data-dir
'
];
if
(
userDataDir
)
{
userDataDir
=
typeof
userDataDir
===
'
string
'
?
userDataDir
:
userDataDir
[
0
];
}
// Set userData path before app 'ready' event and call to process.chdir
var
userData
=
path
.
resolve
(
args
[
'
user-data-dir
'
]
||
paths
.
getDefaultUserDataPath
(
process
.
platform
));
var
userData
=
path
.
resolve
(
userDataDir
||
paths
.
getDefaultUserDataPath
(
process
.
platform
));
app
.
setPath
(
'
userData
'
,
userData
);
// Update cwd based on environment and platform
...
...
src/vs/platform/environment/node/argv.ts
浏览文件 @
f3ca4f6e
...
...
@@ -105,7 +105,14 @@ export function parseCLIProcessArgv(processArgv: string[]): ParsedArgs {
* Use this to parse code arguments such as `--verbose --wait`
*/
export
function
parseArgs
(
args
:
string
[]):
ParsedArgs
{
return
minimist
(
args
,
options
)
as
ParsedArgs
;
const
result
=
minimist
(
args
,
options
)
as
ParsedArgs
;
// Because Spectron doesn't allow us to pass a custom user-data-dir,
// Code receives two of them. Let's just take the first one.
const
userDataDir
:
string
|
string
[]
=
result
[
'
user-data-dir
'
];
result
[
'
user-data-dir
'
]
=
typeof
userDataDir
===
'
string
'
?
userDataDir
:
userDataDir
[
0
];
return
result
;
}
export
const
optionsHelp
:
{
[
name
:
string
]:
string
;
}
=
{
...
...
src/vs/platform/environment/test/node/environmentService.test.ts
浏览文件 @
f3ca4f6e
...
...
@@ -41,4 +41,11 @@ suite('EnvironmentService', () => {
assert
.
equal
(
parse
([
'
--user-data-dir
'
,
'
./dir
'
],
{
cwd
:
()
=>
'
/foo
'
,
env
:
{
'
VSCODE_CWD
'
:
'
/bar
'
}
}),
path
.
resolve
(
'
/bar/dir
'
),
'
should use VSCODE_CWD as the cwd when --user-data-dir is specified
'
);
});
test
(
'
userDataPath should always take the first one
'
,
()
=>
{
const
parse
=
(
a
,
b
:
{
cwd
:
()
=>
string
,
env
:
{
[
key
:
string
]:
string
}
})
=>
parseUserDataDir
(
parseArgs
(
a
),
<
any
>
b
);
assert
.
equal
(
parse
([
'
--user-data-dir
'
,
'
./dir1
'
,
'
--user-data-dir
'
,
'
./dir2
'
],
{
cwd
:
()
=>
'
/foo
'
,
env
:
{}
}),
path
.
resolve
(
'
/foo/dir1
'
),
'
should pick first --user-data-dir (dir1)
'
);
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录