From 3eb45b99223ae6a708d82c52d656c697bc993c3b Mon Sep 17 00:00:00 2001
From: Tim <tdhutt@gmail.com>
Date: Tue, 31 Mar 2020 10:23:18 +0100
Subject: Pass string instread of WorkspaceFolder

---
 editors/code/src/client.ts | 4 ++--
 editors/code/src/ctx.ts    | 4 ++--
 editors/code/src/main.ts   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'editors/code')

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index 0de45bb30..f909f8db2 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -30,14 +30,14 @@ export function configToServerOptions(config: Config) {
     };
 }
 
-export async function createClient(config: Config, serverPath: string, workspaceFolder: vscode.WorkspaceFolder): Promise<lc.LanguageClient> {
+export async function createClient(config: Config, serverPath: string, cwd: string): Promise<lc.LanguageClient> {
     // '.' Is the fallback if no folder is open
     // TODO?: Workspace folders support Uri's (eg: file://test.txt).
     // It might be a good idea to test if the uri points to a file.
 
     const run: lc.Executable = {
         command: serverPath,
-        options: { cwd: workspaceFolder.uri.fsPath },
+        options: { cwd },
     };
     const serverOptions: lc.ServerOptions = {
         run,
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 255d57f5e..86b5f3629 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -19,9 +19,9 @@ export class Ctx {
         config: Config,
         extCtx: vscode.ExtensionContext,
         serverPath: string,
-        workspaceFolder: vscode.WorkspaceFolder,
+        cwd: string,
     ): Promise<Ctx> {
-        const client = await createClient(config, serverPath, workspaceFolder);
+        const client = await createClient(config, serverPath, cwd);
         const res = new Ctx(config, extCtx, client, serverPath);
         res.pushCleanup(client.start());
         await client.onReady();
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index c1e2b97c3..7ba16120c 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -53,7 +53,7 @@ export async function activate(context: vscode.ExtensionContext) {
     // registers its `onDidChangeDocument` handler before us.
     //
     // This a horribly, horribly wrong way to deal with this problem.
-    ctx = await Ctx.create(config, context, serverPath, workspaceFolder);
+    ctx = await Ctx.create(config, context, serverPath, workspaceFolder.uri.fsPath);
 
     // Commands which invokes manually via command palette, shortcut, etc.
 
-- 
cgit v1.2.3