Not all options were respected #14

vknabel · Oct 3, 2020 · 93fc521 · 93fc521
1 parent 5fa3927
commit 93fc521
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.3.6
+
+* Fixed: `swiftformat.options` were not always respected vknabel/vscode-swiftlint#14 - [@vknabel](https://github.com/vknabel/)
+
 # 1.3.5
 
 * Fixed: `configSearchPaths` did not support `~` vknabel/vscode-swiftlint#8 - [@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.5",
+  "version": "1.3.6",
   "license": "MIT",
   "author": {
     "name": "Valentin Knabel",

diff --git a/src/SwiftFormatEditProvider.ts b/src/SwiftFormatEditProvider.ts
@@ -26,7 +26,7 @@ function userDefinedFormatOptionsForDocument(
     .formatConfigSearchPaths()
     .map(current => resolve(rootPath, current));
   const existingConfig = searchPaths.find(existsSync);
-  return existingConfig != null ? ["--config", existingConfig] : [];
+  return existingConfig != null ? ["--config", existingConfig, ...formatOptions] : formatOptions;
 }
 
 function format(request: {