Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
5f7d8d49
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,发现更多精彩内容 >>
提交
5f7d8d49
编写于
9月 18, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #58687: Check version before starting up the ext host
上级
8a620ab5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
31 addition
and
1 deletion
+31
-1
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-0
src/vs/workbench/node/extensionHostProcess.ts
src/vs/workbench/node/extensionHostProcess.ts
+11
-0
src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
...nch/services/extensions/electron-browser/extensionHost.ts
+1
-0
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
.../services/extensions/electron-browser/extensionService.ts
+18
-1
未找到文件。
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
5f7d8d49
...
...
@@ -59,6 +59,7 @@ export interface IWorkspaceData {
}
export
interface
IInitData
{
commit
:
string
;
parentPid
:
number
;
environment
:
IEnvironment
;
workspace
:
IWorkspaceData
;
...
...
src/vs/workbench/node/extensionHostProcess.ts
浏览文件 @
5f7d8d49
...
...
@@ -14,6 +14,7 @@ import { createConnection } from 'net';
import
{
Event
,
filterEvent
}
from
'
vs/base/common/event
'
;
import
{
createMessageOfType
,
MessageType
,
isMessageOfType
}
from
'
vs/workbench/common/extensionHostProtocol
'
;
import
*
as
nativeWatchdog
from
'
native-watchdog
'
;
import
product
from
'
vs/platform/node/product
'
;
// With Electron 2.x and node.js 8.x the "natives" module
// can cause a native crash (see https://github.com/nodejs/node/issues/19891 and
...
...
@@ -89,6 +90,16 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
const
initData
=
<
IInitData
>
JSON
.
parse
(
raw
.
toString
());
const
rendererCommit
=
initData
.
commit
;
const
myCommit
=
product
.
commit
;
if
(
rendererCommit
&&
myCommit
)
{
// Running in the built version where commits are defined
if
(
rendererCommit
!==
myCommit
)
{
exit
(
55
);
}
}
// Print a console message when rejection isn't handled within N seconds. For details:
// see https://nodejs.org/api/process.html#process_event_unhandledrejection
// and https://nodejs.org/api/process.html#process_event_rejectionhandled
...
...
src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
浏览文件 @
5f7d8d49
...
...
@@ -385,6 +385,7 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter {
const
configurationData
:
IConfigurationInitData
=
{
...
this
.
_configurationService
.
getConfigurationData
(),
configurationScopes
:
{}
};
const
workspace
=
this
.
_contextService
.
getWorkspace
();
const
r
:
IInitData
=
{
commit
:
product
.
commit
,
parentPid
:
process
.
pid
,
environment
:
{
isExtensionDevelopmentDebug
:
this
.
_isExtensionDevDebug
,
...
...
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
浏览文件 @
5f7d8d49
...
...
@@ -30,7 +30,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import
{
ExtensionHostProcessWorker
,
IExtensionHostStarter
}
from
'
vs/workbench/services/extensions/electron-browser/extensionHost
'
;
import
{
IMessagePassingProtocol
}
from
'
vs/base/parts/ipc/node/ipc
'
;
import
{
ExtHostCustomersRegistry
}
from
'
vs/workbench/api/electron-browser/extHostCustomers
'
;
import
{
IWindowService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
IWindowService
,
IWindowsService
}
from
'
vs/platform/windows/common/windows
'
;
import
{
IDisposable
,
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
mark
}
from
'
vs/base/common/performance
'
;
import
{
ILifecycleService
,
LifecyclePhase
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
...
...
@@ -403,6 +403,23 @@ export class ExtensionService extends Disposable implements IExtensionService {
console
.
error
(
'
Extension host terminated unexpectedly. Code:
'
,
code
,
'
Signal:
'
,
signal
);
this
.
_stopExtensionHostProcess
();
if
(
code
===
55
)
{
this
.
_notificationService
.
prompt
(
Severity
.
Error
,
nls
.
localize
(
'
extensionHostProcess.versionMismatchCrash
'
,
"
Extension host cannot start: version mismatch.
"
),
[{
label
:
nls
.
localize
(
'
relaunch
'
,
"
Relaunch VS Code
"
),
run
:
()
=>
{
this
.
_instantiationService
.
invokeFunction
((
accessor
)
=>
{
const
windowsService
=
accessor
.
get
(
IWindowsService
);
windowsService
.
relaunch
({});
});
}
}]
);
return
;
}
let
message
=
nls
.
localize
(
'
extensionHostProcess.crash
'
,
"
Extension host terminated unexpectedly.
"
);
if
(
code
===
87
)
{
message
=
nls
.
localize
(
'
extensionHostProcess.unresponsiveCrash
'
,
"
Extension host terminated because it was not responsive.
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录