Merge pull request #2753 from Shopify/fix-lazy-activation

Fix activation on files that were previously opened
Shopify · Oct 22, 2024 · 87aef4c · 87aef4c
2 parents 2286ceb + b543e25
commit 87aef4c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/vscode/src/rubyLsp.ts b/vscode/src/rubyLsp.ts
@@ -142,9 +142,14 @@ export class RubyLsp {
       const workspaceFolder = vscode.workspace.getWorkspaceFolder(
         activeDocument.uri,
       );
+      if (workspaceFolder) {
+        const existingWorkspace = this.workspaces.get(
+          workspaceFolder.uri.toString(),
+        );
 
-      if (workspaceFolder && workspaceFolder !== firstWorkspace) {
-        await this.activateWorkspace(workspaceFolder, true);
+        if (workspaceFolder && !existingWorkspace) {
+          await this.activateWorkspace(workspaceFolder, false);
+        }
       }
     }