Fix multiple cases of invalid windows line endings handling (#305)

* Fix multiple cases of invalid windows line endings handling

* Update apps/language_server/lib/language_server/providers/formatting.ex

Co-authored-by: Jason Axelson <axelson@users.noreply.github.com>

* Update apps/language_server/lib/language_server/diagnostics.ex

Co-authored-by: Jason Axelson <axelson@users.noreply.github.com>

* Update apps/language_server/lib/language_server/providers/execute_command.ex

Co-authored-by: Jason Axelson <axelson@users.noreply.github.com>

* add alias

Co-authored-by: Jason Axelson <axelson@users.noreply.github.com>

Author: lukaszsamson

apps/elixir_ls_utils/test/support/test_utils.ex

@@ -3,7 +3,7 @@ defmodule ElixirLS.Utils.TestUtils do
 
   def assert_has_cursor_char(text, line, character) do
     char =
-      String.split(text, "\n")
+      String.split(text, ["\r\n", "\r", "\n"])
       |> Enum.at(line + 1)
       |> String.graphemes()
       |> Enum.at(character)

apps/language_server/lib/language_server/diagnostics.ex

@@ -1,4 +1,6 @@
 defmodule ElixirLS.LanguageServer.Diagnostics do
+  alias ElixirLS.LanguageServer.SourceFile
+
   def normalize(diagnostics, root_path) do
     for diagnostic <- diagnostics do
       {type, file, line, description, stacktrace} =
@@ -21,7 +23,7 @@ defmodule ElixirLS.LanguageServer.Diagnostics do
     {reversed_stacktrace, reversed_description} =
       diagnostic_message
       |> String.trim_trailing()
-      |> String.split("\n")
+      |> SourceFile.lines()
       |> Enum.reverse()
       |> Enum.split_while(&is_stack?/1)
 

apps/language_server/lib/language_server/dialyzer/manifest.ex

@@ -152,7 +152,7 @@ defmodule ElixirLS.LanguageServer.Dialyzer.Manifest do
 
     try do
       {:ok, contents} = File.read(vsn_file)
-      String.split(contents, "\n", trim: true)
+      String.split(contents, ["\r\n", "\r", "\n"], trim: true)
     else
       [full] ->
         full

apps/language_server/lib/language_server/erlang_source_file.ex

@@ -1,4 +1,6 @@
 defmodule ElixirLS.LanguageServer.ErlangSourceFile do
+  alias ElixirLS.LanguageServer.SourceFile
+
   def get_beam_file(module, :preloaded) do
     case :code.get_object_code(module) do
       {_module, _binary, beam_file} -> beam_file
@@ -35,7 +37,7 @@ defmodule ElixirLS.LanguageServer.ErlangSourceFile do
     index =
       file
       |> File.read!()
-      |> String.split(["\n", "\r\n"])
+      |> SourceFile.lines()
       |> Enum.find_index(&String.match?(&1, regex))
 
     case index do

apps/language_server/lib/language_server/providers/execute_command.ex

@@ -55,7 +55,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand do
 
         Code.format_string!("@spec #{spec}", line_length: target_line_length)
         |> IO.iodata_to_binary()
-        |> String.split("\n")
+        |> SourceFile.lines()
         |> Enum.map(&(indentation <> &1))
         |> Enum.join("\n")
         |> Kernel.<>("\n")

apps/language_server/lib/language_server/providers/formatting.ex

@@ -71,7 +71,7 @@ defmodule ElixirLS.LanguageServer.Providers.Formatting do
 
   defp advance_pos({line, col}, str) do
     Enum.reduce(String.split(str, "", trim: true), {line, col}, fn char, {line, col} ->
-      if char == "\n" do
+      if char in ["\n", "\r"] do
         {line + 1, 0}
       else
         # LSP contentChanges positions are based on UTF-16 string representation

apps/language_server/lib/language_server/providers/hover.ex

@@ -1,4 +1,6 @@
 defmodule ElixirLS.LanguageServer.Providers.Hover do
+  alias ElixirLS.LanguageServer.SourceFile
+
   @moduledoc """
   Hover provider utilizing Elixir Sense
   """
@@ -10,7 +12,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do
           nil
 
         %{subject: subject, docs: docs} ->
-          line_text = Enum.at(String.split(text, "\n"), line)
+          line_text = Enum.at(SourceFile.lines(text), line)
           range = highlight_range(line_text, line, character, subject)
 
           %{"contents" => contents(docs), "range" => range}

mix.lock

@@ -1,7 +1,7 @@
 %{
   "dialyxir": {:hex, :dialyxir, "1.0.0", "6a1fa629f7881a9f5aaf3a78f094b2a51a0357c843871b8bc98824e7342d00a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "aeb06588145fac14ca08d8061a142d52753dbc2cf7f0d00fc1013f53f8654654"},
   "docsh": {:hex, :docsh, "0.7.2", "f893d5317a0e14269dd7fe79cf95fb6b9ba23513da0480ec6e77c73221cae4f2", [:rebar3], [{:providers, "1.8.1", [hex: :providers, repo: "hexpm", optional: false]}], "hexpm", "4e7db461bb07540d2bc3d366b8513f0197712d0495bb85744f367d3815076134"},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "68dd83576af3ed67c1bc4536ff1673247496f01a", []},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "b307c0024178fbd1842100f23f81cae15e7e1fb1", []},
   "erl2ex": {:git, "https://github.com/dazuma/erl2ex.git", "244c2d9ed5805ef4855a491d8616b8842fef7ca4", []},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "forms": {:hex, :forms, "0.0.1", "45f3b10b6f859f95f2c2c1a1de244d63855296d55ed8e93eb0dd116b3e86c4a6", [:rebar3], [], "hexpm", "530f63ed8ed5a171f744fc75bd69cb2e36496899d19dbef48101b4636b795868"},