Merge branch 'master' into techatrix/ci-check-formatting

ziglang · Feb 22, 2025 · fbf32f7 · fbf32f7
2 parents c209af4 + 8372c38
commit fbf32f7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/zls.ts b/src/zls.ts
@@ -186,6 +186,11 @@ async function configurationMiddleware(
             inspect?.workspaceValue === undefined &&
             inspect?.workspaceFolderValue === undefined;
         if (isDefaultValue) {
+            if (name === "zig.zls.semanticTokens") {
+                // The extension has a different default value for this config
+                // option compared to ZLS
+                continue;
+            }
             result[index] = null;
         }
     }