Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fae7dc6f
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,发现更多精彩内容 >>
提交
fae7dc6f
编写于
5月 28, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #74452
上级
78524301
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
4 addition
and
6 deletion
+4
-6
src/vs/code/electron-main/main.ts
src/vs/code/electron-main/main.ts
+4
-6
未找到文件。
src/vs/code/electron-main/main.ts
浏览文件 @
fae7dc6f
...
@@ -95,6 +95,7 @@ class CodeMain {
...
@@ -95,6 +95,7 @@ class CodeMain {
await
instantiationService
.
invokeFunction
(
async
accessor
=>
{
await
instantiationService
.
invokeFunction
(
async
accessor
=>
{
const
environmentService
=
accessor
.
get
(
IEnvironmentService
);
const
environmentService
=
accessor
.
get
(
IEnvironmentService
);
const
stateService
=
accessor
.
get
(
IStateService
);
const
stateService
=
accessor
.
get
(
IStateService
);
const
logService
=
accessor
.
get
(
ILogService
);
// Patch `process.env` with the instance's environment
// Patch `process.env` with the instance's environment
const
instanceEnvironment
=
this
.
patchEnvironment
(
environmentService
);
const
instanceEnvironment
=
this
.
patchEnvironment
(
environmentService
);
...
@@ -110,7 +111,7 @@ class CodeMain {
...
@@ -110,7 +111,7 @@ class CodeMain {
throw
error
;
throw
error
;
}
}
const
mainIpcServer
=
await
instantiationService
.
invokeFunction
(
accessor
=>
this
.
doStartup
(
accessor
,
true
)
);
const
mainIpcServer
=
await
this
.
doStartup
(
logService
,
environmentService
,
instantiationService
,
true
);
bufferLogService
.
logger
=
new
SpdLogService
(
'
main
'
,
environmentService
.
logsPath
,
bufferLogService
.
getLevel
());
bufferLogService
.
logger
=
new
SpdLogService
(
'
main
'
,
environmentService
.
logsPath
,
bufferLogService
.
getLevel
());
return
instantiationService
.
createInstance
(
CodeApplication
,
mainIpcServer
,
instanceEnvironment
).
startup
();
return
instantiationService
.
createInstance
(
CodeApplication
,
mainIpcServer
,
instanceEnvironment
).
startup
();
...
@@ -174,10 +175,7 @@ class CodeMain {
...
@@ -174,10 +175,7 @@ class CodeMain {
return
instanceEnvironment
;
return
instanceEnvironment
;
}
}
private
async
doStartup
(
accessor
:
ServicesAccessor
,
retry
:
boolean
):
Promise
<
Server
>
{
private
async
doStartup
(
logService
:
ILogService
,
environmentService
:
IEnvironmentService
,
instantiationService
:
IInstantiationService
,
retry
:
boolean
):
Promise
<
Server
>
{
const
logService
=
accessor
.
get
(
ILogService
);
const
environmentService
=
accessor
.
get
(
IEnvironmentService
);
const
instantiationService
=
accessor
.
get
(
IInstantiationService
);
// Try to setup a server for running. If that succeeds it means
// Try to setup a server for running. If that succeeds it means
// we are the first instance to startup. Otherwise it is likely
// we are the first instance to startup. Otherwise it is likely
...
@@ -231,7 +229,7 @@ class CodeMain {
...
@@ -231,7 +229,7 @@ class CodeMain {
throw
error
;
throw
error
;
}
}
return
this
.
doStartup
(
accessor
,
false
);
return
this
.
doStartup
(
logService
,
environmentService
,
instantiationService
,
false
);
}
}
// Tests from CLI require to be the only instance currently
// Tests from CLI require to be the only instance currently
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录