From 81bbfa7fbe3ca36a29014c79cf8f69775778fe56 Mon Sep 17 00:00:00 2001 From: Asher Date: Sun, 19 May 2019 19:21:25 -0500 Subject: [PATCH] Suppress "disconnected" notification on extension host This isn't a real error event; we artificially emit it just in case something waiting to start is listening to the error event in order to clean up and/or restart. --- scripts/vscode.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 895830f34..bba7c2fb6 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -1103,6 +1103,13 @@ index 059f821..b19f292 100644 @@ -290 +292 @@ export class CachedExtensionScanner { - new ExtensionScannerInput(version, commit, locale, devMode, environmentService.extensionsPath, false, false, translations), + new ExtensionScannerInput(version, commit, locale, devMode, environmentService.extensionsPath, false, false, translations, environmentService.extraExtensionPaths), +diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +index 9133b7e..8c801b7 100644 +--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts ++++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +@@ -461 +461 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter { +- if (errorMessage === this._lastExtensionHostError) { ++ if (errorMessage === this._lastExtensionHostError || errorMessage === "disconnected") { diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index b337206..0477464 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts