Merge branch 'master' into master

ziglang · Feb 22, 2025 · 6a331d6 · 6a331d6
2 parents 5119d5d + 5e73acb
commit 6a331d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
       - run: npm run build
       - run: npm run typecheck
       - run: npm run lint
-      - run: npm run format -- --check
+      - run: npm run format:check
 
       - name: package extension
         run: |

diff --git a/package.json b/package.json
@@ -375,6 +375,7 @@
     "test": "npm run compile && node ./node_modules/vscode/bin/test",
     "typecheck": "tsc --noEmit",
     "format": "prettier --write .",
+    "format:check": "prettier --check .",
     "lint": "eslint ."
   },
   "devDependencies": {

diff --git a/src/zigMainCodeLens.ts b/src/zigMainCodeLens.ts
@@ -56,7 +56,7 @@ function zigRun() {
 
 function escapePath(rawPath: string): string {
     if (/[ !"#$&'()*,;:<>?\[\\\]^`{|}]/.test(rawPath)) {
-        return `"${rawPath.replaceAll("\"", "\"\\\"\"")}"`;
+        return `"${rawPath.replaceAll('"', '"\\""')}"`;
     }
     return rawPath;
 }

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;
         }
     }