Merge pull request #232 from elixir-lang/closing-map

correct indentation for closing Map curly bracket fixes #223

Author: tonini

elixir-smie.el

@@ -377,7 +377,10 @@
            (smie-rule-parent elixir-smie-indent-basic)
          (if (elixir-smie-last-line-start-with-block-operator-p)
              (smie-rule-parent -2)
-           (smie-rule-parent))))))
+           (smie-rule-parent))))
+      ((and (smie-rule-parent-p "OP")
+            (smie-rule-hanging-p))
+       (smie-rule-parent))))
     (`(:after . "{")
      (cond
       ((smie-rule-hanging-p)

test/elixir-mode-indentation-test.el

@@ -1184,7 +1184,8 @@ defmodule Foo do
 end
 ")
 
-(elixir-def-indentation-test complex-case-with-matches (:tags '(indentation))
+(elixir-def-indentation-test complex-case-with-matches
+                             (:tags '(indentation))
 "
 case parse do
 { [ help: true ], _, _ }
@@ -1207,7 +1208,8 @@ case parse do
 end")
 
 
-(elixir-def-indentation-test complex-case-with-matches/2 (:tags '(indentation))
+(elixir-def-indentation-test complex-case-with-matches/2
+                             (:tags '(indentation))
 "
 case parse do
 { [ help: true ], _, _ }
@@ -1229,6 +1231,24 @@ case parse do
   _ -> :help
 end")
 
+(elixir-def-indentation-test close-map-curly-brackt
+                             (:tags '(indentation))
+"
+config = %{
+  async_cases: [],
+exclude: opts[:exclude],
+include: opts[:include],
+           timeout: opts[:timeout],
+  trace: opts[:trace]
+        }"
+"
+config = %{
+  async_cases: [],
+  exclude: opts[:exclude],
+  include: opts[:include],
+  timeout: opts[:timeout],
+  trace: opts[:trace]
+}")
 
 ;; We don't want automatic whitespace cleanup here because of the significant
 ;; whitespace after `Record' above. By setting `whitespace-action' to nil,