Quote SwiftFormat path to handle spaces (#37)

vknabel · May 23, 2024 · a3b9375 · a3b9375
1 parent 4e1e5d8
commit a3b9375
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
       "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
       "stopOnEntry": false,
       "sourceMaps": true,
-      "outFiles": ["${workspaceRoot}/out/src"],
+      "outFiles": ["${workspaceRoot}/out/src/*.js"],
       "preLaunchTask": "npm"
     }
   ]

diff --git a/src/SwiftFormatEditProvider.ts b/src/SwiftFormatEditProvider.ts
@@ -73,9 +73,9 @@ function format(request: {
     }
 
     const newContents = execShellSync(
-      swiftFormatPath[0],
+      quotePath(swiftFormatPath[0]),
       [
-        ...swiftFormatPath.slice(1),
+        ...swiftFormatPath.slice(1).map(quotePath),
         "stdin",
         "--stdinpath",
         fileName,
@@ -102,6 +102,14 @@ function format(request: {
   }
 }
 
+function quotePath(path: string): string {
+  if (path.startsWith('"') && path.endsWith('"')) {
+    return path;
+  } else {
+    return `"${path}"`;
+  }
+}
+
 export class SwiftFormatEditProvider
   implements
     vscode.DocumentRangeFormattingEditProvider,