fix: join paths correctly on windows #21

vknabel · Apr 13, 2023 · a14ead5 · a14ead5
1 parent c74557c
commit a14ead5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.6.3
+
+- fix: join paths correctly on windows #21
+
+# 1.6.2
+
+- fix: re-release
+
 # 1.6.1
 
 - fix: improved error message when swiftformat is missing

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/vknabel/vscode-swiftformat"
   },
-  "version": "1.6.1",
+  "version": "1.6.3",
   "license": "MIT",
   "author": {
     "name": "Valentin Knabel",

diff --git a/src/Current.ts b/src/Current.ts
@@ -29,7 +29,7 @@ import * as vscode from "vscode";
 import { url } from "./UrlLiteral";
 import { absolutePath } from "./AbsolutePath";
 import { existsSync } from "fs";
-import { join } from "path";
+import * as paths from "path";
 
 export function prodEnvironment(): Current {
   return {
@@ -84,7 +84,7 @@ export function prodEnvironment(): Current {
           if (workspace == null) {
             continue;
           }
-          const fullPath = join(workspace.uri.fsPath, path);
+          const fullPath = paths.resolve(workspace.uri.fsPath, path);
 
           if (existsSync(fullPath)) {
             return [absolutePath(fullPath)];