Merge pull request #364 from elixir-lang/fix-hang-after-do

Fix issue that emacs hangs after def? statements

Author: tonini

elixir-smie.el

@@ -115,12 +115,7 @@
      '((id)
        (statements (statement)
                    (statement ";" statements))
-       (statement ("def" non-block-expr "do" statements "end")
-                  ("defp" non-block-expr "do" statements "end")
-		  ("defp" non-block-expr "COMMA" "do:" non-block-expr)
-                  ("defmacro" non-block-expr "do" statements "end")
-                  ("defmacrop" non-block-expr "do" statements "end")
-                  (non-block-expr "fn" match-statements "end")
+       (statement (non-block-expr "fn" match-statements "end")
                   (non-block-expr "do" statements "end")
                   ("if" non-block-expr "do" statements "else" statements "end")
                   ("if" non-block-expr "do" statements "end")
@@ -312,7 +307,7 @@
            (elixir-smie--implicit-semi-p))
       (if (elixir-smie--semi-ends-match)
           "MATCH-STATEMENT-DELIMITER"
-        (if (and (looking-back ",$" (- (point) 2) t)
+        (if (and (looking-back ",$" (- (point) 3) t)
                  (not (> (nth 0 (syntax-ppss)) 0)))
 	    "COMMA"
 	  ";")))

test/elixir-mode-indentation-test.el

@@ -1013,14 +1013,14 @@ end
                              (:tags '(indentation))
   "
 def foo do
-  case is_string(x) do
-    true ->
-      x2 = \" one\"
-      x <> x2
-    false ->
-      x2 = \" two\"
-      x <> x2
-  end
+case is_string(x) do
+true ->
+x2 = \" one\"
+x <> x2
+false ->
+x2 = \" two\"
+x <> x2
+end
 end"
   "
 def foo do
@@ -1566,30 +1566,6 @@ defmodule Foo do
 end
 ")
 
-(elixir-def-indentation-test complex-case-with-matches
-                             (:tags '(indentation))
-"
-case parse do
-{ [ help: true ], _, _ }
-                  -> :help
-{ _, [ user, project, count ], _ } ->
-{ user, project, count }
-              { _, [ user, project ], _ } -> { user, project, @default_count }
-{ _, [ _, project ], _ } -> { _, project, @default_count }
-_ -> :help
-end"
-"
-case parse do
-  { [ help: true ], _, _ }
-    -> :help
-  { _, [ user, project, count ], _ } ->
-    { user, project, count }
-  { _, [ user, project ], _ } -> { user, project, @default_count }
-  { _, [ _, project ], _ } -> { _, project, @default_count }
-  _ -> :help
-end")
-
-
 (elixir-def-indentation-test complex-case-with-matches/2
                              (:tags '(indentation))
 "
@@ -1685,16 +1661,14 @@ end
 "case statement do
   %{\"foo\" => \"foo\",
      \"baz\" => \"baz\"} ->
-    :ok
-
-  _ ->
+:ok
+_ ->
     :ok
 end"
 "case statement do
   %{\"foo\" => \"foo\",
     \"baz\" => \"baz\"} ->
     :ok
-
   _ ->
     :ok
 end")