Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
549c1772
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,发现更多精彩内容 >>
提交
549c1772
编写于
8月 17, 2016
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
no more process.argv dependency in environmentService
上级
be2034c5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
14 deletion
+14
-14
src/main.js
src/main.js
+4
-1
src/paths.js
src/paths.js
+3
-6
src/vs/base/node/paths.ts
src/vs/base/node/paths.ts
+1
-1
src/vs/platform/environment/node/environmentService.ts
src/vs/platform/environment/node/environmentService.ts
+6
-6
未找到文件。
src/main.js
浏览文件 @
549c1772
...
...
@@ -9,6 +9,7 @@ global.vscodeStart = Date.now();
var
app
=
require
(
'
electron
'
).
app
;
var
fs
=
require
(
'
fs
'
);
var
path
=
require
(
'
path
'
);
var
minimist
=
require
(
'
minimist
'
);
var
paths
=
require
(
'
./paths
'
);
var
pkg
=
require
(
'
../package.json
'
);
...
...
@@ -127,7 +128,9 @@ try {
}
// Set userData path before app 'ready' event
var
userData
=
paths
.
getUserDataPath
(
process
.
platform
,
pkg
.
name
,
process
.
argv
);
var
argv
=
minimist
(
process
.
argv
,
{
string
:
[
'
user-data-dir
'
]
});
var
userDataDir
=
argv
[
'
user-data-dir
'
];
var
userData
=
paths
.
getUserDataPath
(
process
.
platform
,
pkg
.
name
,
userDataDir
);
app
.
setPath
(
'
userData
'
,
userData
);
// Mac: when someone drops a file to the not-yet running VSCode, the open-file event fires even before
...
...
src/paths.js
浏览文件 @
549c1772
...
...
@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
var
minimist
=
require
(
'
minimist
'
);
var
path
=
require
(
'
path
'
);
var
os
=
require
(
'
os
'
);
...
...
@@ -16,15 +15,13 @@ function getAppDataPath(platform) {
}
}
function
getUserDataPath
(
platform
,
appName
,
args
)
{
var
argv
=
minimist
(
args
,
{
string
:
[
'
user-data-dir
'
]
});
var
userDataDir
=
argv
[
'
user-data-dir
'
];
var
appData
=
getAppDataPath
(
platform
);
function
getUserDataPath
(
platform
,
appName
,
userDataDir
)
{
if
(
userDataDir
)
{
return
userDataDir
;
}
var
appData
=
getAppDataPath
(
platform
);
return
path
.
join
(
appData
,
appName
);
}
...
...
src/vs/base/node/paths.ts
浏览文件 @
549c1772
...
...
@@ -7,7 +7,7 @@ import uri from 'vs/base/common/uri';
interface
IPaths
{
getAppDataPath
(
platform
:
string
):
string
;
getUserDataPath
(
platform
:
string
,
appName
:
string
,
args
:
string
[]
):
string
;
getUserDataPath
(
platform
:
string
,
appName
:
string
,
userDataDir
:
string
):
string
;
}
const
pathsPath
=
uri
.
parse
(
require
.
toUrl
(
'
paths
'
)).
fsPath
;
...
...
src/vs/platform/environment/node/environmentService.ts
浏览文件 @
549c1772
...
...
@@ -41,22 +41,22 @@ export class EnvironmentService implements IEnvironmentService {
get
extensionDevelopmentPath
():
string
{
return
this
.
_extensionDevelopmentPath
;
}
get
isBuilt
():
boolean
{
return
!
process
.
env
[
'
VSCODE_DEV
'
];
}
get
verbose
():
boolean
{
return
this
.
argv
.
verbose
;
}
get
verbose
():
boolean
{
return
this
.
parsedArgs
.
verbose
;
}
get
debugBrkFileWatcherPort
():
number
{
return
typeof
this
.
argv
.
debugBrkFileWatcherPort
===
'
string
'
?
Number
(
this
.
argv
.
debugBrkFileWatcherPort
)
:
void
0
;
}
get
debugBrkFileWatcherPort
():
number
{
return
typeof
this
.
parsedArgs
.
debugBrkFileWatcherPort
===
'
string
'
?
Number
(
this
.
parsedArgs
.
debugBrkFileWatcherPort
)
:
void
0
;
}
constructor
(
private
argv
:
ParsedArgs
)
{
constructor
(
private
parsedArgs
:
ParsedArgs
)
{
this
.
_appRoot
=
path
.
dirname
(
URI
.
parse
(
require
.
toUrl
(
''
)).
fsPath
);
this
.
_userDataPath
=
paths
.
getUserDataPath
(
process
.
platform
,
pkg
.
name
,
p
rocess
.
argv
);
this
.
_userDataPath
=
paths
.
getUserDataPath
(
process
.
platform
,
pkg
.
name
,
p
arsedArgs
[
'
user-data-dir
'
]
);
this
.
_appSettingsHome
=
path
.
join
(
this
.
userDataPath
,
'
User
'
);
this
.
_appSettingsPath
=
path
.
join
(
this
.
appSettingsHome
,
'
settings.json
'
);
this
.
_appKeybindingsPath
=
path
.
join
(
this
.
appSettingsHome
,
'
keybindings.json
'
);
this
.
_userHome
=
path
.
join
(
os
.
homedir
(),
product
.
dataFolderName
);
this
.
_extensionsPath
=
argv
.
extensionHomePath
||
path
.
join
(
this
.
_userHome
,
'
extensions
'
);
this
.
_extensionsPath
=
parsedArgs
.
extensionHomePath
||
path
.
join
(
this
.
_userHome
,
'
extensions
'
);
this
.
_extensionsPath
=
path
.
normalize
(
this
.
_extensionsPath
);
this
.
_extensionDevelopmentPath
=
argv
.
extensionDevelopmentPath
;
this
.
_extensionDevelopmentPath
=
parsedArgs
.
extensionDevelopmentPath
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录