Do not insert end after do: (#426)

* do not insert end after do:

Fixes #424

* Add a couple more tests

Co-authored-by: Jason Axelson <[email protected]>

Author: lukaszsamson

apps/language_server/lib/language_server/providers/on_type_formatting.ex

@@ -56,7 +56,7 @@ defmodule ElixirLS.LanguageServer.Providers.OnTypeFormatting do
   end
 
   defp tokens(line) do
-    Regex.scan(Regex.recompile!(~r/(?:->)|(?:\w+)/), line) |> List.flatten()
+    Regex.scan(Regex.recompile!(~r/(?:->)|(?:[\w\:]+)/), line) |> List.flatten()
   end
 
   defp indentation(line) do

apps/language_server/test/providers/on_type_formatting_test.exs

@@ -0,0 +1,60 @@
+defmodule ElixirLS.LanguageServer.Providers.OnTypeFormattingTest do
+  use ExUnit.Case, async: true
+
+  alias ElixirLS.LanguageServer.Providers.OnTypeFormatting
+  alias ElixirLS.LanguageServer.SourceFile
+
+  test "insert `end` after `do`" do
+    text = """
+    for a <- b do
+    """
+
+    assert {:ok,
+            [
+              %{
+                "newText" => "\nend",
+                "range" => %{
+                  "start" => %{"character" => 0, "line" => 1},
+                  "end" => %{"character" => 0, "line" => 1}
+                }
+              }
+            ]} = OnTypeFormatting.format(%SourceFile{text: text}, 1, 0, "\n", [])
+  end
+
+  test "insert `end` after def `do`" do
+    text = """
+    defmodule TestA do
+      def myfun(a) do
+    end
+    """
+
+    assert {:ok,
+            [
+              %{
+                "newText" => "\n  end",
+                "range" => %{
+                  "start" => %{"character" => 0, "line" => 2},
+                  "end" => %{"character" => 0, "line" => 2}
+                }
+              }
+            ]} = OnTypeFormatting.format(%SourceFile{text: text}, 2, 0, "\n", [])
+  end
+
+  test "don't  insert `end` after `do:`" do
+    text = """
+    for a <- b, do:
+    """
+
+    assert {:ok, nil} = OnTypeFormatting.format(%SourceFile{text: text}, 1, 0, "\n", [])
+  end
+
+  test "don't insert `end` after def `do: a`" do
+    text = """
+    defmodule TestA do
+      def myfun(a), do: a
+    end
+    """
+
+    assert {:ok, nil} = OnTypeFormatting.format(%SourceFile{text: text}, 2, 0, "\n", [])
+  end
+end