fix tests on OTP 27

Author: lukaszsamson

apps/elixir_ls_utils/test/complete_test.exs

@@ -2019,7 +2019,8 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
                type: :function,
                args: "timerRef",
                origin: ":erlang",
-               summary: summary1
+               summary: summary1,
+               metadata: meta1
              },
              %{
                arity: 2,
@@ -2033,8 +2034,14 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
            ] = expand(~c":erlang.cancel_time")
 
     if System.otp_release() |> String.to_integer() >= 23 do
-      assert "Cancels a timer\\." <> _ = summary1
       assert "Cancels a timer that has been created by" <> _ = summary2
+
+      if System.otp_release() |> String.to_integer() >= 27 do
+        assert "" == summary1
+        assert %{group: :time, equiv: "erlang:cancel_timer(TimerRef, [])", app: :erts} == meta1
+      else
+        assert "Cancels a timer\\." <> _ = summary1
+      end
     end
   end
 

apps/language_server/lib/language_server/location.ex

@@ -149,7 +149,7 @@ defmodule ElixirLS.LanguageServer.Location do
       |> Atom.to_string()
       |> Regex.escape()
 
-    case find_line_by_regex(file, ~r/^#{escaped}\b/u) do
+    case find_line_by_regex(file, ~r/^#{escaped}\b\(/u) do
       nil -> nil
       position -> {position, :function}
     end

apps/language_server/lib/language_server/markdown_utils.ex

@@ -74,8 +74,14 @@ defmodule ElixirLS.LanguageServer.MarkdownUtils do
   defp get_metadata_entry_md({:types, _text}), do: nil
 
   # erlang :equiv
+  # OTP < 27
   defp get_metadata_entry_md({:equiv, {:function, name, arity}}) do
-    "**Equivalent** #{name}/#{arity}"
+    "**Equivalent to** #{name}/#{arity}"
+  end
+
+  # OTP >= 27
+  defp get_metadata_entry_md({:equiv, text}) when is_binary(text) do
+    "**Equivalent to** #{text}"
   end
 
   defp get_metadata_entry_md({:deprecated, text}) when is_binary(text) do

apps/language_server/test/providers/completion/suggestions_test.exs

@@ -682,7 +682,11 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
            ] = list
 
     if System.otp_release() |> String.to_integer() >= 23 do
-      assert "- OldVsn = Vsn" <> _ = summary
+      if System.otp_release() |> String.to_integer() >= 27 do
+        assert "This function is called" <> _ = summary
+      else
+        assert "- OldVsn = Vsn" <> _ = summary
+      end
     end
   end
 
@@ -1256,11 +1260,17 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                  name: "init",
                  origin: "MyLocalModule",
                  spec: "@callback init(args :: term()) ::" <> _,
-                 summary: "- Args = term" <> _,
+                 summary: documentation,
                  type: :function,
                  visibility: :public
                }
              ] = list
+
+      if System.otp_release() |> String.to_integer() >= 27 do
+        assert "Whenever" <> _ = documentation
+      else
+        assert "- Args = " <> _ = documentation
+      end
     end
   end
 
@@ -1370,11 +1380,17 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
     if System.otp_release() |> String.to_integer() >= 23 do
       assert %{
-               summary: "- InitArgs = Args" <> _,
+               summary: documentation,
                metadata: %{implementing: :gen_event},
                spec: "@callback init(initArgs :: term()) ::" <> _,
                args_list: ["arg"]
              } = init_res
+
+      if System.otp_release() |> String.to_integer() >= 27 do
+        assert "Whenever a new event" <> _ = documentation
+      else
+        assert "- InitArgs = Args" <> _ = documentation
+      end
     end
   end
 
@@ -1455,11 +1471,17 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                  origin: "ElixirSenseExample.ExampleBehaviourWithDocCallbackErlang",
                  snippet: nil,
                  spec: "@callback init(args :: term()) :: init_result(state())",
-                 summary: "- Args = term" <> _,
+                 summary: documentation,
                  type: :function,
                  visibility: :public
                }
              ] = list
+
+      if System.otp_release() |> String.to_integer() >= 27 do
+        assert "Whenever" <> _ = documentation
+      else
+        assert "- Args = " <> _ = documentation
+      end
     end
   end
 
@@ -1484,11 +1506,17 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                  origin: ":file_server",
                  snippet: nil,
                  spec: "@callback init(args :: term()) ::" <> _,
-                 summary: "- Args = term" <> _,
+                 summary: documentation,
                  type: :function,
                  visibility: :public
                }
              ] = list
+
+      if System.otp_release() |> String.to_integer() >= 27 do
+        assert "Whenever" <> _ = documentation
+      else
+        assert "- Args = " <> _ = documentation
+      end
     end
   end
 
@@ -4212,12 +4240,16 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
              ] = suggestions
 
       if System.otp_release() |> String.to_integer() >= 23 do
-        assert summary =~ "Supported time unit representations:"
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "The time unit used" <> _ = summary
+        else
+          assert "Supported time unit representations:" <> _ = summary
+        end
       end
     end
 
     test "no erlang private types" do
-      buffer = "defmodule My, do: @type my_type :: :erlang.cpu_topo"
+      buffer = "defmodule My, do: @type my_type :: :dialyzer_plt.dialyzer_p"
 
       suggestions = suggestions_by_type(:type_spec, buffer)
 

apps/language_server/test/providers/hover/docs_test.exs

@@ -184,7 +184,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
                By convention,\
                """
 
-        assert %{name: "erlang", otp_doc_vsn: {1, 0, 0}} = doc.metadata
+        assert %{app: :erts, otp_doc_vsn: {1, 0, 0}} = doc.metadata
       end
     end
 
@@ -724,8 +724,12 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
              } = doc
 
       if System.otp_release() |> String.to_integer() >= 23 do
-        assert doc.docs =~
-                 "this function is called by"
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "Whenever" <> _ = doc.docs
+        else
+          assert doc.docs =~
+                   "this function is called by"
+        end
 
         assert %{since: "OTP 19.0", implementing: :gen_statem} = doc.metadata
       end
@@ -933,18 +937,22 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
       } = Docs.docs(buffer, 3, 12)
 
       assert %{
-               args: ["deepList"],
+               args: params,
                function: :flatten,
                module: :lists,
                kind: :function
              } = doc
 
       if System.otp_release() |> String.to_integer() >= 23 do
-        assert doc.docs =~ """
-               Returns a flattened version of `DeepList`\\.
-               """
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert params == ["DeepList"]
+        else
+          assert params == ["deepList"]
+        end
+
+        assert doc.docs =~ "Returns a flattened version of `DeepList`"
 
-        assert %{signature: _} = doc.metadata
+        assert %{app: :stdlib} = doc.metadata
       end
     end
 
@@ -1628,7 +1636,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
                Supported time unit representations:
                """
 
-        assert %{signature: _} = doc.metadata
+        assert %{app: :erts} = doc.metadata
       end
     end
 

apps/language_server/test/providers/hover_test.exs

@@ -139,7 +139,7 @@ defmodule ElixirLS.LanguageServer.Providers.HoverTest do
     assert {:ok, %{"contents" => %{kind: "markdown", value: v}}} =
              Hover.hover(parser_context, line, char)
 
-    assert String.starts_with?(v, "```elixir\n:timer.sleep(time)\n```\n\n*function*")
+    assert String.starts_with?(v, "```elixir\n:timer.sleep(")
     # TODO hexdocs and standard lib docs
     assert not String.contains?(
              v,

apps/language_server/test/providers/signature_help/signature_test.exs

@@ -244,7 +244,11 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
              } = Signature.signature(code, 2, 32)
 
       if System.otp_release() |> String.to_integer() >= 23 do
-        assert summary =~ "Supported time unit representations:"
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "The time unit" <> _ = summary
+        else
+          assert "Supported time unit representations" <> _ = summary
+        end
       end
     end
 
@@ -328,24 +332,30 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                  %{
                    documentation: summary1,
                    name: "flatten",
-                   params: ["deepList"],
+                   params: [_],
                    spec:
                      "@spec flatten(deepList) :: list when deepList: [term() | deepList], list: [term()]"
                  },
                  %{
                    documentation: summary2,
                    name: "flatten",
-                   params: ["deepList", "tail"],
+                   params: params,
                    spec:
                      "@spec flatten(deepList, tail) :: list when deepList: [term() | deepList], tail: [term()], list: [term()]"
                  }
                ]
              } = Signature.signature(code, 2, 24)
 
       if System.otp_release() |> String.to_integer() >= 23 do
-        assert "Returns a flattened version of `DeepList`\\." <> _ = summary1
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert params == ["DeepList", "Tail"]
+        else
+          assert params == ["deepList", "tail"]
+        end
+
+        assert "Returns a flattened version of `DeepList`" <> _ = summary1
 
-        assert "Returns a flattened version of `DeepList` with tail `Tail` appended\\." <> _ =
+        assert "Returns a flattened version of `DeepList` with tail `Tail` appended" <> _ =
                  summary2
       end
     end
@@ -1013,7 +1023,11 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
              } = Signature.signature(code, 5, 10)
 
       if System.otp_release() |> String.to_integer() >= 23 do
-        assert "- Args = term\\(\\)\n- Result" <> _ = summary
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "Whenever" <> _ = summary
+        else
+          assert "- Args = " <> _ = summary
+        end
       end
     end
 
@@ -1048,13 +1062,19 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                  active_param: 0,
                  signatures: [
                    %{
-                     documentation: "- Args = " <> _,
+                     documentation: documentation,
                      name: "init",
                      params: ["_"],
                      spec: "@callback init(args :: term()) :: init_result(state())"
                    }
                  ]
                } = res
+
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "Whenever" <> _ = documentation
+        else
+          assert "- Args = " <> _ = documentation
+        end
       end
     end
 
@@ -1070,13 +1090,19 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                  active_param: 0,
                  signatures: [
                    %{
-                     documentation: "- Args = " <> _,
+                     documentation: summary,
                      name: "init",
                      params: ["args"],
                      spec: "@callback init(args :: term()) ::" <> _
                    }
                  ]
                } = res
+
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "Whenever a" <> _ = summary
+        else
+          assert "- Args = " <> _ = summary
+        end
       end
     end
 
@@ -1251,13 +1277,19 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                  active_param: 0,
                  signatures: [
                    %{
-                     documentation: "- Args = term" <> _,
+                     documentation: summary,
                      name: "init",
                      params: ["list"],
                      spec: "@callback init(args :: term()) :: init_result(state())"
                    }
                  ]
                } = res
+
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "Whenever a" <> _ = summary
+        else
+          assert "- Args = term" <> _ = summary
+        end
       end
     end
 
@@ -1577,21 +1609,28 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                  %{
                    documentation: summary1,
                    name: "cancel_timer",
-                   params: ["timerRef"],
+                   params: [_],
                    spec: "@spec cancel_timer(timerRef) :: result" <> _
                  },
                  %{
                    documentation: summary2,
                    name: "cancel_timer",
-                   params: ["timerRef", "options"],
+                   params: params,
                    spec: "@spec cancel_timer(timerRef, options) :: result" <> _
                  }
                ]
              } = Signature.signature(buffer, 4, 24)
 
       if System.otp_release() |> String.to_integer() >= 23 do
-        assert "Cancels a timer\\." <> _ = summary1
         assert "Cancels a timer that has been created by" <> _ = summary2
+
+        if System.otp_release() |> String.to_integer() >= 27 do
+          assert "" == summary1
+          assert params == ["TimerRef", "Options"]
+        else
+          assert "Cancels a timer\\." <> _ = summary1
+          assert params == ["timerRef", "options"]
+        end
       end
     end
   end

dep_versions.exs

@@ -1,5 +1,5 @@
 [
-  elixir_sense: "a41777a8d47b64b5886f1c2e7b09e38c462ad3ff",
+  elixir_sense: "314e77f7914aeb38e2d8d150582174c579795b9f",
   dialyxir_vendored: "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",