From c8a6e6e838900dd849b761328dbb7287f641dd11 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 8 Nov 2018 01:24:26 +0100 Subject: [PATCH] Tweaks --- src/vs/workbench/api/node/extHost.api.impl.ts | 3 ++- .../services/extensions/electron-browser/extensionHost.ts | 2 +- src/vs/workbench/services/extensions/node/rpcProtocol.ts | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index acf69746b51..be4dc17380c 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -134,7 +134,8 @@ export function createApiFactory( const extHostLanguages = new ExtHostLanguages(rpcProtocol, extHostDocuments); // Register an output channel for exthost log - extHostOutputService.createOutputChannelFromLogFile(localize('extensionsLog', "Extension Host"), extHostLogService.logFile); + const name = localize('extensionsLog', "Extension Host"); + extHostOutputService.createOutputChannelFromLogFile(name, extHostLogService.logFile); // Register API-ish commands ExtHostApiCommands.register(extHostCommands); diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts index 40f4158fd3c..450783e0cec 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts @@ -263,7 +263,7 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter { // Help in case we fail to start it let startupTimeoutHandle: any; - if (!this._environmentService.isBuilt || this._isExtensionDevHost) { + if (!this._environmentService.isBuilt && !this._windowService.getConfiguration().remoteAuthority || this._isExtensionDevHost) { startupTimeoutHandle = setTimeout(() => { const msg = this._isExtensionDevDebugBrk ? nls.localize('extensionHostProcess.startupFailDebug', "Extension host did not start in 10 seconds, it might be stopped on the first line and needs a debugger to continue.") diff --git a/src/vs/workbench/services/extensions/node/rpcProtocol.ts b/src/vs/workbench/services/extensions/node/rpcProtocol.ts index 76e9c3d5727..80840958df3 100644 --- a/src/vs/workbench/services/extensions/node/rpcProtocol.ts +++ b/src/vs/workbench/services/extensions/node/rpcProtocol.ts @@ -66,7 +66,7 @@ function _transformOutgoingURIs(obj: any, transformer: IURITransformer, depth: n return null; } -export function transformOutgoingURIs(obj: any, transformer: IURITransformer): any { +export function transformOutgoingURIs(obj: T, transformer: IURITransformer): T { const result = _transformOutgoingURIs(obj, transformer, 0); if (result === null) { // no change @@ -101,7 +101,7 @@ function _transformIncomingURIs(obj: any, transformer: IURITransformer, depth: n return null; } -function transformIncomingURIs(obj: any, transformer: IURITransformer): any { +function transformIncomingURIs(obj: T, transformer: IURITransformer): T { const result = _transformIncomingURIs(obj, transformer, 0); if (result === null) { // no change -- GitLab