From 875dfb66a418685716655f4ee98b0e17d8751fae Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 12 Mar 2021 14:43:05 -0700
Subject: [PATCH] fix(lib/vscode): update path for logService

---
 lib/vscode/src/vs/server/node/channel.ts     | 4 ++--
 lib/vscode/src/vs/server/node/marketplace.ts | 4 ++--
 lib/vscode/src/vs/server/node/server.ts      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/vscode/src/vs/server/node/channel.ts b/lib/vscode/src/vs/server/node/channel.ts
index 358c5cac..3ba30dba 100644
--- a/lib/vscode/src/vs/server/node/channel.ts
+++ b/lib/vscode/src/vs/server/node/channel.ts
@@ -33,7 +33,7 @@ import { TerminalDataBufferer } from 'vs/platform/terminal/common/terminalDataBu
 import * as terminalEnvironment from 'vs/workbench/contrib/terminal/common/terminalEnvironment';
 import { getMainProcessParentEnv } from 'vs/workbench/contrib/terminal/node/terminalEnvironment';
 import { TerminalProcess } from 'vs/platform/terminal/node/terminalProcess';
-import { ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess'
+import { ISetTerminalLayoutInfoArgs, IGetTerminalLayoutInfoArgs } from 'vs/platform/terminal/common/terminalProcess';
 import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/common/variableResolver';
 import { ExtensionScanner, ExtensionScannerInput } from 'vs/workbench/services/extensions/node/extensionPoints';
 
@@ -355,7 +355,7 @@ class VariableResolverService extends AbstractVariableResolverService {
 					NOTE@coder: not sure where we could get this from. This is new.
 					@jsjoeio 3/11/21
 				*/
-				return undefined
+				return undefined;
 			},
 			getExecPath: (): string | undefined => {
 				// Assuming that resolverEnv is just for use in the resolver and not for
diff --git a/lib/vscode/src/vs/server/node/marketplace.ts b/lib/vscode/src/vs/server/node/marketplace.ts
index 66ebc84b..1cb9262b 100644
--- a/lib/vscode/src/vs/server/node/marketplace.ts
+++ b/lib/vscode/src/vs/server/node/marketplace.ts
@@ -137,7 +137,7 @@ const extractTar = async (tarPath: string, targetPath: string, options: IExtract
 					See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7
 					3/11/21 @jsjoeio
 				*/
-				return fs.promises.mkdir(targetFileName, { recursive: true }).then(nextEntry)
+				return fs.promises.mkdir(targetFileName, { recursive: true }).then(nextEntry);
 			}
 
 			const dirName = path.dirname(fileName);
@@ -151,7 +151,7 @@ const extractTar = async (tarPath: string, targetPath: string, options: IExtract
 				See commit: https://github.com/microsoft/vscode/commit/a0d76bb9834b63a02fba8017a6306511fe1ab4fe#diff-2bf233effbb62ea789bb7c4739d222a43ccd97ed9f1219f75bb07e9dee91c1a7
 				3/11/21 @jsjoeio
 			*/
-			await fs.promises.mkdir(targetDirName, { recursive: true })
+			await fs.promises.mkdir(targetDirName, { recursive: true });
 
 			const fstream = fs.createWriteStream(targetFileName, { mode: header.mode });
 			fstream.once('close', () => next());
diff --git a/lib/vscode/src/vs/server/node/server.ts b/lib/vscode/src/vs/server/node/server.ts
index 6db6ec44..de187b00 100644
--- a/lib/vscode/src/vs/server/node/server.ts
+++ b/lib/vscode/src/vs/server/node/server.ts
@@ -234,12 +234,12 @@ export class Vscode {
 		*/
 		const logService = new MultiplexLogService([
 			new ConsoleLogger(getLogLevel(environmentService)),
-			new SpdLogLogger(RemoteExtensionLogFileName, environmentService.logsPath, false, getLogLevel(environmentService))
-		])
+			new SpdLogLogger(RemoteExtensionLogFileName, path.join(environmentService.logsPath, 'server.log'), false, getLogLevel(environmentService))
+		]);
 		const fileService = new FileService(logService);
 		fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(logService));
 
-		const loggerService = new LoggerService(logService, fileService)
+		const loggerService = new LoggerService(logService, fileService);
 
 		const piiPaths = [
 			path.join(environmentService.userDataPath, 'clp'), // Language packs.