Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2f8c5c11
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,发现更多精彩内容 >>
提交
2f8c5c11
编写于
10月 27, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes #13561
上级
3c6f232d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
25 addition
and
30 deletion
+25
-30
src/vs/code/electron-main/main.ts
src/vs/code/electron-main/main.ts
+19
-25
src/vs/platform/environment/node/environmentService.ts
src/vs/platform/environment/node/environmentService.ts
+6
-5
未找到文件。
src/vs/code/electron-main/main.ts
浏览文件 @
2f8c5c11
...
...
@@ -424,26 +424,6 @@ function getShellEnvironment(): TPromise<platform.IProcessEnvironment> {
return
getUnixShellEnvironment
();
}
/**
* Returns the user environment necessary for all Code processes.
* Such environment needs to be propagated to the renderer/shared
* processes.
*/
function
getEnvironment
(
accessor
:
ServicesAccessor
):
TPromise
<
platform
.
IProcessEnvironment
>
{
const
environmentService
=
accessor
.
get
(
IEnvironmentService
);
return
getShellEnvironment
().
then
(
shellEnv
=>
{
const
instanceEnv
=
{
VSCODE_PID
:
String
(
process
.
pid
),
VSCODE_IPC_HOOK
:
environmentService
.
mainIPCHandle
,
VSCODE_SHARED_IPC_HOOK
:
environmentService
.
sharedIPCHandle
,
VSCODE_NLS_CONFIG
:
process
.
env
[
'
VSCODE_NLS_CONFIG
'
]
};
return
assign
({},
shellEnv
,
instanceEnv
);
});
}
function
createPaths
(
environmentService
:
IEnvironmentService
):
TPromise
<
any
>
{
const
paths
=
[
environmentService
.
appSettingsHome
,
environmentService
.
userHome
,
environmentService
.
extensionsPath
];
...
...
@@ -480,16 +460,30 @@ function start(): void {
// On some platforms we need to manually read from the global environment variables
// and assign them to the process environment (e.g. when doubleclick app on Mac)
return
getShellEnvironment
().
then
(
shellEnv
=>
{
// Patch `process.env` with the user's shell environment
assign
(
process
.
env
,
shellEnv
);
return
instantiationService
.
invokeFunction
(
accessor
=>
{
return
getEnvironment
(
accessor
).
then
(
env
=>
{
assign
(
process
.
env
,
env
);
const
environmentService
=
accessor
.
get
(
IEnvironmentService
);
const
instanceEnv
=
{
VSCODE_PID
:
String
(
process
.
pid
),
VSCODE_IPC_HOOK
:
environmentService
.
mainIPCHandle
,
VSCODE_SHARED_IPC_HOOK
:
environmentService
.
sharedIPCHandle
,
VSCODE_NLS_CONFIG
:
process
.
env
[
'
VSCODE_NLS_CONFIG
'
]
};
// Patch `process.env` with the instance's environment
assign
(
process
.
env
,
instanceEnv
);
// Collect all environment patches to send to other processes
const
env
=
assign
({},
shellEnv
,
instanceEnv
);
return
instantiationService
.
invokeFunction
(
a
=>
createPaths
(
a
.
get
(
IEnvironmentService
)))
.
then
(()
=>
instantiationService
.
invokeFunction
(
setupIPC
))
.
then
(
mainIpcServer
=>
instantiationService
.
invokeFunction
(
main
,
mainIpcServer
,
env
));
});
})
.
done
(
null
,
err
=>
instantiationService
.
invokeFunction
(
quit
,
err
));
}).
done
(
null
,
err
=>
instantiationService
.
invokeFunction
(
quit
,
err
));
}
start
();
src/vs/platform/environment/node/environmentService.ts
浏览文件 @
2f8c5c11
...
...
@@ -30,7 +30,7 @@ function getUniqueUserId(): string {
return
crypto
.
createHash
(
'
sha256
'
).
update
(
username
).
digest
(
'
hex
'
).
substr
(
0
,
6
);
}
function
getIPCHandle
BaseName
():
string
{
function
getIPCHandle
Prefix
():
string
{
let
name
=
pkg
.
name
;
// Support to run VS Code multiple times as different user
...
...
@@ -47,8 +47,9 @@ function getIPCHandleBaseName(): string {
return
path
.
join
(
os
.
tmpdir
(),
name
);
}
const
IPCHandlePrefix
=
getIPCHandleBaseName
();
const
IPCHandleSuffix
=
process
.
platform
===
'
win32
'
?
'
-sock
'
:
'
.sock
'
;
function
getIPCHandleSuffix
():
string
{
return
process
.
platform
===
'
win32
'
?
'
-sock
'
:
'
.sock
'
;
}
export
class
EnvironmentService
implements
IEnvironmentService
{
...
...
@@ -97,10 +98,10 @@ export class EnvironmentService implements IEnvironmentService {
get
logExtensionHostCommunication
():
boolean
{
return
this
.
_args
.
logExtensionHostCommunication
;
}
@
memoize
get
mainIPCHandle
():
string
{
return
`
${
IPCHandlePrefix
}
-
${
pkg
.
version
}${
IPCHandleSuffix
}
`
;
}
get
mainIPCHandle
():
string
{
return
`
${
getIPCHandlePrefix
()}
-
${
pkg
.
version
}${
getIPCHandleSuffix
()
}
`
;
}
@
memoize
get
sharedIPCHandle
():
string
{
return
`
${
IPCHandlePrefix
}
-
${
pkg
.
version
}
-shared
${
IPCHandleSuffix
}
`
;
}
get
sharedIPCHandle
():
string
{
return
`
${
getIPCHandlePrefix
()}
-
${
pkg
.
version
}
-shared
${
getIPCHandleSuffix
()
}
`
;
}
constructor
(
private
_args
:
ParsedArgs
,
private
_execPath
:
string
)
{
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录