Merge pull request #333 from elixir-lang/fix-list-tuple-indentation

Fix indentation of second element inside list of tuples

Author: tonini

elixir-smie.el

@@ -277,7 +277,8 @@
         "MATCH-STATEMENT-DELIMITER"
       (if (and (looking-at ".+,$")
                (not (> (nth 0 (syntax-ppss)) 0)))
-          "COMMA"";")))
+          "COMMA"
+        ";")))
    ((looking-at elixir-smie--block-operator-regexp)
     (goto-char (match-end 0))
     "->")
@@ -337,6 +338,8 @@
   (pcase (cons kind token)
     (`(:list-intro . ";")
      -4)
+    (`(:list-intro . nil)
+     -4)
     (`(:elem . args)
      -4)
     (`(:before . "COMMA")
@@ -567,10 +570,6 @@
       ((and (smie-rule-parent-p "OP")
             (smie-rule-hanging-p))
        (smie-rule-parent))
-      ((smie-rule-parent-p "[")
-       (if (nth 0 smie--parent)
-           (smie-rule-parent elixir-smie-indent-basic)
-         (smie-rule-parent)))
       ((smie-rule-parent-p "->")
        (if (save-excursion
              (move-end-of-line 1)
@@ -582,8 +581,7 @@
              (move-end-of-line 1)
              (looking-back elixir-smie--block-operator-regexp (- (point) 3) t))
            (smie-rule-parent (- elixir-smie-indent-basic))
-         (smie-rule-parent)))
-      (t (smie-rule-parent elixir-smie-indent-basic))))
+         (smie-rule-parent)))))
     (`(:after . "{")
      (cond
       ((smie-rule-hanging-p)

test/elixir-mode-indentation-test.el

@@ -1874,6 +1874,11 @@ end
 (elixir-def-indentation-test indent-maps-inside-list
                              (:tags '(indentation))
 "
+[{:earmark, \"~> 0.1\", only: :dev},
+             {:earmark, \"~> 0.1\", only: :dev},
+{:ex_doc, \"~> 0.11\", only: :dev},
+        {:ex_doc, \"~> 0.11\", only: :dev}]
+
 [
 {1, 2, 3},
 {4, 5, 6},
@@ -1896,6 +1901,11 @@ email: \"[email protected]\",
 ]
 "
 "
+[{:earmark, \"~> 0.1\", only: :dev},
+ {:earmark, \"~> 0.1\", only: :dev},
+ {:ex_doc, \"~> 0.11\", only: :dev},
+ {:ex_doc, \"~> 0.11\", only: :dev}]
+
 [
   {1, 2, 3},
   {4, 5, 6},