From 34189e4d491bf65f4182c6373ab21f1bba4b922d Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 11 Mar 2021 15:54:25 -0700 Subject: [PATCH] fix(lib/vscode): add getAppRoot to VariableResolverService Not sure if it's used because it can return undefined, but it's there now! --- lib/vscode/src/vs/server/node/channel.ts | 7 +++++++ lib/vscode/src/vs/server/node/server.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/vscode/src/vs/server/node/channel.ts b/lib/vscode/src/vs/server/node/channel.ts index 1074509ee..358c5cac4 100644 --- a/lib/vscode/src/vs/server/node/channel.ts +++ b/lib/vscode/src/vs/server/node/channel.ts @@ -350,6 +350,13 @@ class VariableResolverService extends AbstractVariableResolverService { getConfigurationValue: (_: URI, section: string): string | undefined => { return args.resolvedVariables[`config:${section}`]; }, + getAppRoot: (): string | undefined => { + /* + NOTE@coder: not sure where we could get this from. This is new. + @jsjoeio 3/11/21 + */ + return undefined + }, getExecPath: (): string | undefined => { // Assuming that resolverEnv is just for use in the resolver and not for // the terminal itself. diff --git a/lib/vscode/src/vs/server/node/server.ts b/lib/vscode/src/vs/server/node/server.ts index e83849677..6db6ec44f 100644 --- a/lib/vscode/src/vs/server/node/server.ts +++ b/lib/vscode/src/vs/server/node/server.ts @@ -7,7 +7,7 @@ import { Emitter } from 'vs/base/common/event'; import { Schemas } from 'vs/base/common/network'; import { URI } from 'vs/base/common/uri'; import { getMachineId } from 'vs/base/node/id'; -import { ClientConnectionEvent, IPCServer, IServerChannel, ProxyChannel, StaticRouter } from 'vs/base/parts/ipc/common/ipc'; +import { ClientConnectionEvent, IPCServer, IServerChannel, ProxyChannel } from 'vs/base/parts/ipc/common/ipc'; import { LogsDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner'; import { main } from 'vs/code/node/cliProcessMain'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';