Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-04 19:35:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

VSCode exits when launching extension tests (fixes #5030)

Browse Source
This commit is contained in:
Benjamin Pasero
2016-04-06 12:22:03 +02:00
parent 1e955490e8
commit 631ae31cf9
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/thread/electron-browser/threadService.ts
+6 -6
View File
@@ -91,7 +91,7 @@ class ExtensionHostProcessManager {
private terminating: boolean;
private isExtensionDevelopmentHost: boolean;
private isExtensionDevelopmentTest: boolean;
private isExtensionDevelopmentTestFromCli: boolean;
constructor(
private contextService: IWorkspaceContextService,
@@ -103,7 +103,7 @@ class ExtensionHostProcessManager {
// handle extension host lifecycle a bit special when we know we are developing an extension that runs inside
const config = this.contextService.getConfiguration();
this.isExtensionDevelopmentHost = !!config.env.extensionDevelopmentPath;
this.isExtensionDevelopmentTest = this.isExtensionDevelopmentHost && !!config.env.extensionTestsPath;
this.isExtensionDevelopmentTestFromCli = this.isExtensionDevelopmentHost && !!config.env.extensionTestsPath && !config.env.debugBrkExtensionHost;
this.unsentMessages = [];
this.extensionHostProcessReady = false;
@@ -202,12 +202,12 @@ class ExtensionHostProcessManager {
}
// Send to local console unless we run tests from cli
if (!this.isExtensionDevelopmentTest) {
if (!this.isExtensionDevelopmentTestFromCli) {
console[logEntry.severity].apply(console, consoleArgs);
}
// Log on main side if running tests from cli
if (this.isExtensionDevelopmentTest) {
if (this.isExtensionDevelopmentTestFromCli) {
ipc.send('vscode:log', logEntry);
}
@@ -256,7 +256,7 @@ class ExtensionHostProcessManager {
}
// Expected development extension termination: When the extension host goes down we also shutdown the window
else if (!this.isExtensionDevelopmentTest) {
else if (!this.isExtensionDevelopmentTestFromCli) {
this.windowService.getWindow().close();
}
@@ -322,7 +322,7 @@ class ExtensionHostProcessManager {
}
public beforeShutdown(): boolean | TPromise<boolean> {
if (this.isExtensionDevelopmentHost && !this.isExtensionDevelopmentTest) {
if (this.isExtensionDevelopmentHost && !this.isExtensionDevelopmentTestFromCli) {
this.windowService.broadcast({
channel: EXTENSION_TERMINATE_BROADCAST_CHANNEL,
payload: true