Formatting new files lead to an error #6

vknabel · Mar 1, 2019 · 9d6dadd · 9d6dadd
1 parent 5dc875a
commit 9d6dadd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.1
+
+* Formatting new files lead to an error. #6 - [@vknabel](https://github.com/vknabel/)
+
 # 1.3.0
 
 * Automatically load SwiftFormat config files. #5 - [@vknabel](https://github.com/vknabel/)

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

diff --git a/src/SwiftFormatEditProvider.ts b/src/SwiftFormatEditProvider.ts
@@ -19,7 +19,9 @@ function userDefinedFormatOptionsForDocument(
   if (formatOptions.indexOf("--config") != -1) return formatOptions;
   const workspaceFolder = vscode.workspace.getWorkspaceFolder(document.uri);
   const rootPath =
-    workspaceFolder!.uri.fsPath || vscode.workspace.rootPath || "./";
+    (workspaceFolder && workspaceFolder.uri.fsPath) ||
+    vscode.workspace.rootPath ||
+    "./";
   const searchPaths = Current.config
     .formatConfigSearchPaths()
     .map(current => join(rootPath, current));