From d5c9c0a70e8d396ceb66d7a62df909a8a3605e6b Mon Sep 17 00:00:00 2001
From: Mitchell Hanberg <mitch@mitchellhanberg.com>
Date: Sun, 10 Mar 2024 21:53:48 -0400
Subject: [PATCH] fix: update sourceror (#394)

---
 flake.nix                             | 2 +-
 mix.exs                               | 4 +++-
 mix.lock                              | 4 ++--
 test/next_ls/document_symbol_test.exs | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 419f0c33..b3db1cc3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,7 +115,7 @@
             src = self.outPath;
             inherit version elixir;
             pname = "next-ls-deps";
-            hash = "sha256-G0OZlg3CInKPbmBPWCVnFTzudFdOr9yTwWsKXk+7zVg=";
+            hash = "sha256-WxQoZgD6kOYTTn7QSdL5TpQROUx9/C58aOee+0ImpCg=";
             mixEnv = "prod";
           };
 
diff --git a/mix.exs b/mix.exs
index 9b8ea89b..2f310762 100644
--- a/mix.exs
+++ b/mix.exs
@@ -64,7 +64,9 @@ defmodule NextLS.MixProject do
       {:req, "~> 0.3"},
       {:schematic, "~> 0.2"},
       {:spitfire, github: "elixir-tools/spitfire"},
-      {:sourceror, "~> 1.0"},
+      # {:sourceror, "~> 1.0"},
+      # {:sourceror, path: "../sourceror"},
+      {:sourceror, github: "mhanberg/sourceror", branch: "do-end-blocks-with-eoe"},
 
       {:opentelemetry, "~> 1.3"},
       {:opentelemetry_api, "~> 1.2"},
diff --git a/mix.lock b/mix.lock
index ccf86a98..9ccd37fc 100644
--- a/mix.lock
+++ b/mix.lock
@@ -46,8 +46,8 @@
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
   "req": {:hex, :req, "0.4.0", "1c759054dd64ef1b1a0e475c2d2543250d18f08395d3174c371b7746984579ce", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.9", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "f53eadc32ebefd3e5d50390356ec3a59ed2b8513f7da8c6c3f2e14040e9fe989"},
   "schematic": {:hex, :schematic, "0.2.1", "0b091df94146fd15a0a343d1bd179a6c5a58562527746dadd09477311698dbb1", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0b255d65921e38006138201cd4263fd8bb807d9dfc511074615cd264a571b3b1"},
-  "sourceror": {:hex, :sourceror, "1.0.1", "ec2c41726d181adce888ac94b3f33b359a811b46e019c084509e02c70042e424", [:mix], [], "hexpm", "28225464ffd68bda1843c974f3ff7ccef35e29be09a65dfe8e3df3f7e3600c57"},
-  "spitfire": {:git, "https://github.com/elixir-tools/spitfire.git", "adb18c8f4479ddddf2eef844211e0861bd856fdb", []},
+  "sourceror": {:git, "https://github.com/mhanberg/sourceror.git", "d2031d0c3a7558bfce12c3b3895aff88ac87e04f", [branch: "do-end-blocks-with-eoe"]},
+  "spitfire": {:git, "https://github.com/elixir-tools/spitfire.git", "26e68d4b184caf32ccee840ef0e862c911ff51ef", []},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "styler": {:hex, :styler, "0.8.1", "f3c0f65023e4bfbf7e7aa752d128b8475fdabfd30f96ee7314b84480cc56e788", [:mix], [], "hexpm", "1aa48d3aa689a639289af3d8254d40e068e98c083d6e5e3d1a695e71a147b344"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
diff --git a/test/next_ls/document_symbol_test.exs b/test/next_ls/document_symbol_test.exs
index 6255f0e7..cc1593bf 100644
--- a/test/next_ls/document_symbol_test.exs
+++ b/test/next_ls/document_symbol_test.exs
@@ -315,7 +315,7 @@ defmodule NextLS.DocumentSymbolTest do
                      start: %GenLSP.Structures.Position{character: 2, line: 1}
                    },
                    range: %GenLSP.Structures.Range{
-                     end: %GenLSP.Structures.Position{character: 2, line: 1},
+                     end: %GenLSP.Structures.Position{character: 18, line: 1},
                      start: %GenLSP.Structures.Position{character: 2, line: 1}
                    },
                    deprecated: nil,
@@ -348,7 +348,7 @@ defmodule NextLS.DocumentSymbolTest do
                      start: %GenLSP.Structures.Position{character: 2, line: 5}
                    },
                    range: %GenLSP.Structures.Range{
-                     end: %GenLSP.Structures.Position{character: 2, line: 5},
+                     end: %GenLSP.Structures.Position{character: 18, line: 5},
                      start: %GenLSP.Structures.Position{character: 2, line: 5}
                    },
                    deprecated: nil,