OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Suppress "disconnected" notification on extension host

Browse Source 
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.
This commit is contained in:
Asher 2019-05-19 19:21:25 -05:00
parent aa1474b675
commit 81bbfa7fbe
No known key found for this signature in database
GPG Key ID: 7BB4BA9C783D2BBC
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/vscode.patch
View File

@ -1103,6 +1103,13 @@ index 059f821..b19f292 100644
@@ -290 +292 @@ export class CachedExtensionScanner { @@ -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),
+ new ExtensionScannerInput(version, commit, locale, devMode, environmentService.extensionsPath, false, false, translations, environmentService.extraExtensionPaths), + 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 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 index b337206..0477464 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts