Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fb277edc
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,发现更多精彩内容 >>
提交
fb277edc
编写于
11月 20, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
env - take window configuration into account when resolving shellEnv
上级
542a8275
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
71 addition
and
38 deletion
+71
-38
src/vs/code/electron-main/app.ts
src/vs/code/electron-main/app.ts
+23
-5
src/vs/code/node/shellEnv.ts
src/vs/code/node/shellEnv.ts
+48
-33
未找到文件。
src/vs/code/electron-main/app.ts
浏览文件 @
fb277edc
...
...
@@ -9,7 +9,7 @@ import { WindowsMainService } from 'vs/platform/windows/electron-main/windowsMai
import
{
IWindowOpenable
}
from
'
vs/platform/windows/common/windows
'
;
import
{
OpenContext
}
from
'
vs/platform/windows/node/window
'
;
import
{
ILifecycleMainService
,
LifecycleMainPhase
}
from
'
vs/platform/lifecycle/electron-main/lifecycleMainService
'
;
import
{
getShellEnvironment
}
from
'
vs/code/node/shellEnv
'
;
import
{
resolveShellEnv
}
from
'
vs/code/node/shellEnv
'
;
import
{
IUpdateService
}
from
'
vs/platform/update/common/update
'
;
import
{
UpdateChannel
}
from
'
vs/platform/update/electron-main/updateIpc
'
;
import
{
Server
as
ElectronIPCServer
}
from
'
vs/base/parts/ipc/electron-main/ipc.electron-main
'
;
...
...
@@ -84,6 +84,7 @@ import { EncryptionMainService, IEncryptionMainService } from 'vs/platform/encry
import
{
ActiveWindowManager
}
from
'
vs/platform/windows/common/windowTracker
'
;
import
{
IKeyboardLayoutMainService
,
KeyboardLayoutMainService
}
from
'
vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService
'
;
import
{
toErrorMessage
}
from
'
vs/base/common/errorMessage
'
;
import
{
NativeParsedArgs
}
from
'
vs/platform/environment/common/argv
'
;
export
class
CodeApplication
extends
Disposable
{
private
windowsMainService
:
IWindowsMainService
|
undefined
;
...
...
@@ -283,7 +284,24 @@ export class CodeApplication extends Disposable {
},
10000
);
try
{
const
shellEnv
=
await
getShellEnvironment
(
this
.
logService
,
this
.
environmentService
);
// Prefer to use the args and env from the target window
// when resolving the shell env. It is possible that
// a first window was opened from the UI but a second
// from the CLI and that has implications for wether to
// resolve the shell environment or not.
let
args
:
NativeParsedArgs
;
let
env
:
NodeJS
.
ProcessEnv
;
if
(
window
?.
config
)
{
args
=
window
.
config
;
env
=
{
...
process
.
env
,
...
window
.
config
.
userEnv
};
}
else
{
args
=
this
.
environmentService
.
args
;
env
=
process
.
env
;
}
// Resolve shell env
const
shellEnv
=
await
resolveShellEnv
(
this
.
logService
,
args
,
env
);
acceptShellEnv
(
shellEnv
);
}
catch
(
error
)
{
window
?.
sendWhenReady
(
'
vscode:showShellEnvError
'
,
toErrorMessage
(
error
));
// notify inside window if we have one
...
...
@@ -368,7 +386,7 @@ export class CodeApplication extends Disposable {
});
this
.
lifecycleMainService
.
when
(
LifecycleMainPhase
.
AfterWindowOpen
).
then
(()
=>
{
this
.
_register
(
new
RunOnceScheduler
(
async
()
=>
{
sharedProcess
.
spawn
(
await
getShellEnvironment
(
this
.
logService
,
this
.
environmentService
));
sharedProcess
.
spawn
(
await
resolveShellEnv
(
this
.
logService
,
this
.
environmentService
.
args
,
process
.
env
));
},
3000
)).
schedule
();
});
...
...
@@ -825,8 +843,8 @@ export class CodeApplication extends Disposable {
updateService
.
initialize
();
}
// Start to fetch shell environment after window has opened
getShellEnvironment
(
this
.
logService
,
this
.
environmentService
);
// Start to fetch shell environment
(if needed)
after window has opened
resolveShellEnv
(
this
.
logService
,
this
.
environmentService
.
args
,
process
.
env
);
// If enable-crash-reporter argv is undefined then this is a fresh start,
// based on telemetry.enableCrashreporter settings, generate a UUID which
...
...
src/vs/code/node/shellEnv.ts
浏览文件 @
fb277edc
...
...
@@ -7,9 +7,55 @@ import { spawn } from 'child_process';
import
{
generateUuid
}
from
'
vs/base/common/uuid
'
;
import
{
isWindows
}
from
'
vs/base/common/platform
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
INativeEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
NativeParsedArgs
}
from
'
vs/platform/environment/common/argv
'
;
function
getUnixShellEnvironment
(
logService
:
ILogService
):
Promise
<
typeof
process
.
env
>
{
/**
* We need to get the environment from a user's shell.
* This should only be done when Code itself is not launched
* from within a shell.
*/
export
async
function
resolveShellEnv
(
logService
:
ILogService
,
args
:
NativeParsedArgs
,
env
:
NodeJS
.
ProcessEnv
):
Promise
<
typeof
process
.
env
>
{
// Skip if --force-disable-user-env
if
(
args
[
'
force-disable-user-env
'
])
{
logService
.
trace
(
'
resolveShellEnv(): skipped (--force-disable-user-env)
'
);
return
{};
}
// Skip on windows
else
if
(
isWindows
)
{
logService
.
trace
(
'
resolveShellEnv(): skipped (Windows)
'
);
return
{};
}
// Skip if running from CLI already
else
if
(
env
[
'
VSCODE_CLI
'
]
===
'
1
'
&&
!
args
[
'
force-user-env
'
])
{
logService
.
trace
(
'
resolveShellEnv(): skipped (VSCODE_CLI is set)
'
);
return
{};
}
// Otherwise resolve (macOS, Linux)
else
{
if
(
env
[
'
VSCODE_CLI
'
]
===
'
1
'
)
{
logService
.
trace
(
'
resolveShellEnv(): running (--force-user-env)
'
);
}
else
{
logService
.
trace
(
'
resolveShellEnv(): running (macOS/Linux)
'
);
}
if
(
!
unixShellEnvPromise
)
{
unixShellEnvPromise
=
doResolveUnixShellEnv
(
logService
);
}
return
unixShellEnvPromise
;
}
}
let
unixShellEnvPromise
:
Promise
<
typeof
process
.
env
>
|
undefined
=
undefined
;
function
doResolveUnixShellEnv
(
logService
:
ILogService
):
Promise
<
typeof
process
.
env
>
{
const
promise
=
new
Promise
<
typeof
process
.
env
>
((
resolve
,
reject
)
=>
{
const
runAsNode
=
process
.
env
[
'
ELECTRON_RUN_AS_NODE
'
];
logService
.
trace
(
'
getUnixShellEnvironment#runAsNode
'
,
runAsNode
);
...
...
@@ -81,34 +127,3 @@ function getUnixShellEnvironment(logService: ILogService): Promise<typeof proces
// swallow errors
return
promise
.
catch
(()
=>
({}));
}
let
shellEnvPromise
:
Promise
<
typeof
process
.
env
>
|
undefined
=
undefined
;
/**
* We need to get the environment from a user's shell.
* This should only be done when Code itself is not launched
* from within a shell.
*/
export
function
getShellEnvironment
(
logService
:
ILogService
,
environmentService
:
INativeEnvironmentService
):
Promise
<
typeof
process
.
env
>
{
if
(
!
shellEnvPromise
)
{
if
(
environmentService
.
args
[
'
force-disable-user-env
'
])
{
logService
.
trace
(
'
getShellEnvironment(): skipped (--force-disable-user-env)
'
);
shellEnvPromise
=
Promise
.
resolve
({});
}
else
if
(
isWindows
)
{
logService
.
trace
(
'
getShellEnvironment(): skipped (Windows)
'
);
shellEnvPromise
=
Promise
.
resolve
({});
}
else
if
(
process
.
env
[
'
VSCODE_CLI
'
]
===
'
1
'
&&
!
environmentService
.
args
[
'
force-user-env
'
])
{
logService
.
trace
(
'
getShellEnvironment(): skipped (VSCODE_CLI is set)
'
);
shellEnvPromise
=
Promise
.
resolve
({});
}
else
{
if
(
process
.
env
[
'
VSCODE_CLI
'
]
===
'
1
'
)
{
logService
.
trace
(
'
getShellEnvironment(): running (--force-user-env)
'
);
}
else
{
logService
.
trace
(
'
getShellEnvironment(): running (macOS/Linux)
'
);
}
shellEnvPromise
=
getUnixShellEnvironment
(
logService
);
}
}
return
shellEnvPromise
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录