fix #191

Jintin · Sep 1, 2018 · a01fbcd · a01fbcd
1 parent 9ff005e
commit a01fbcd
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/Parser/Indent.swift b/Parser/Indent.swift
@@ -82,12 +82,11 @@ class Indent {
             self.extraAdd = false
         }
 
-        switch block {
-        case .parentheses:
-            self.leading = max(offset - count * Indent.size - 1, 0)
-        default: break
-        }
-        if !Indent.paraAlign {
+        if Indent.paraAlign {
+            if block != .curly {
+                self.leading = max(offset - count * Indent.size - 1, 0)
+            }
+        } else {
             self.leading = 0
         }
     }

diff --git a/SwimatTests/tests/n-statement-align/after.swift b/SwimatTests/tests/n-statement-align/after.swift
@@ -0,0 +1,13 @@
+// #191
+let x = ["one",
+         "two",
+         "three"]
+
+let x = [
+    "one",
+    "two",
+    "three"]
+
+let x = (one ||
+    two ||
+    three)
diff --git a/SwimatTests/tests/n-statement-align/before.swift b/SwimatTests/tests/n-statement-align/before.swift
@@ -0,0 +1,13 @@
+// #191
+let x = ["one",
+         "two",
+         "three"]
+
+let x = [
+    "one",
+    "two",
+    "three"]
+
+let x = (one ||
+    two ||
+    three)
diff --git a/SwimatTests/tests/n-statement-align/preferences.json b/SwimatTests/tests/n-statement-align/preferences.json
@@ -0,0 +1,5 @@
+{
+    "areParametersAligned": true,
+    "areSemicolonsRemoved": false
+}
+