Check workspace folder client capabilities before fetching metafields

Shopify · Jan 16, 2025 · c3d728b · c3d728b
1 parent 0de2a0f
commit c3d728b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/.changeset/afraid-singers-guess.md b/.changeset/afraid-singers-guess.md
@@ -0,0 +1,6 @@
+---
+'@shopify/theme-language-server-common': patch
+'@shopify/theme-language-server-node': patch
+---
+
+[internal] Check workspace folder client capabilities before fetching metafields
diff --git a/packages/theme-language-server-common/src/ClientCapabilities.ts b/packages/theme-language-server-common/src/ClientCapabilities.ts
@@ -23,6 +23,10 @@ export class ClientCapabilities {
     return !!this.capabilities?.workspace?.applyEdit;
   }
 
+  get hasWorkspaceFoldersSupport() {
+    return !!this.capabilities?.workspace?.workspaceFolders;
+  }
+
   get hasDidChangeConfigurationDynamicRegistrationSupport() {
     return !!this.capabilities?.workspace?.didChangeConfiguration?.dynamicRegistration;
   }

diff --git a/packages/theme-language-server-common/src/server/startServer.ts b/packages/theme-language-server-common/src/server/startServer.ts
@@ -358,15 +358,17 @@ export function startServer(
       ],
     });
 
-    connection.workspace.getWorkspaceFolders().then(async (folders) => {
-      if (!folders) return;
+    if (clientCapabilities.hasWorkspaceFoldersSupport) {
+      connection.workspace.getWorkspaceFolders().then(async (folders) => {
+        if (!folders) return;
 
-      fetchMetafieldDefinitionsForWorkspaceFolders(folders);
-    });
+        fetchMetafieldDefinitionsForWorkspaceFolders(folders);
+      });
 
-    connection.workspace.onDidChangeWorkspaceFolders(async (params) => {
-      fetchMetafieldDefinitionsForWorkspaceFolders(params.added);
-    });
+      connection.workspace.onDidChangeWorkspaceFolders(async (params) => {
+        fetchMetafieldDefinitionsForWorkspaceFolders(params.added);
+      });
+    }
   });
 
   connection.onDidChangeConfiguration((_params) => {

diff --git a/packages/theme-language-server-node/src/metafieldDefinitions.ts b/packages/theme-language-server-node/src/metafieldDefinitions.ts
@@ -8,13 +8,13 @@ const isWin = process.platform === 'win32';
 const shopifyCliPathPromise = getShopifyCliPath();
 
 export async function fetchMetafieldDefinitionsForURI(uri: string) {
-  const path = await shopifyCliPathPromise;
+  try {
+    const path = await shopifyCliPathPromise;
 
-  if (!path) {
-    return;
-  }
+    if (!path) {
+      return;
+    }
 
-  try {
     await exec(`${path} theme metafields pull`, {
       cwd: new URL(uri),
       timeout: 10_000,