From 5e6c586a017552d6c3954ad71ee8500c9bd24e2f Mon Sep 17 00:00:00 2001
From: Mitchell Hanberg <mitch@mitchellhanberg.com>
Date: Thu, 13 Jun 2024 10:37:11 -0400
Subject: [PATCH] feat: allow using system elixir if 1.17 (#518)

---
 lib/next_ls.ex                           | 32 ++++++++++++++++++------
 priv/monkey/_next_ls_private_compiler.ex |  3 +++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/lib/next_ls.ex b/lib/next_ls.ex
index 20116c50..6cf06945 100644
--- a/lib/next_ls.ex
+++ b/lib/next_ls.ex
@@ -43,6 +43,15 @@ defmodule NextLS do
     mix_home = Keyword.get(args, :mix_home)
     mix_archives = Keyword.get(args, :mix_archives)
 
+    is_1_17 =
+      with {version, 0} <- System.cmd("elixir", ["--short-version"]),
+           {:ok, version} <- version |> String.trim() |> Version.parse() do
+        Version.compare(version, "1.17.0") in [:gt, :eq]
+      else
+        _ ->
+          false
+      end
+
     registry = Keyword.fetch!(args, :registry)
 
     extensions =
@@ -57,6 +66,7 @@ defmodule NextLS do
        bundle_base: bundle_base,
        mix_home: mix_home,
        mix_archives: mix_archives,
+       is_1_17: is_1_17,
        exit_code: 1,
        documents: %{},
        refresh_refs: %{},
@@ -93,14 +103,17 @@ defmodule NextLS do
 
     {:ok, init_opts} = __MODULE__.InitOpts.validate(init_opts)
 
-    mix_home =
-      if init_opts.experimental.completions.enable do
-        BundledElixir.mix_home(lsp.assigns.bundle_base)
-      end
-
-    mix_archives =
-      if init_opts.experimental.completions.enable do
-        BundledElixir.mix_archives(lsp.assigns.bundle_base)
+    # if we are on 1.17, we will not bundle
+    {mix_home, mix_archives} =
+      if lsp.assigns.is_1_17 do
+        {nil, nil}
+      else
+        # if we are not on 1.17, we bundle if completions are enabled
+        if init_opts.experimental.completions.enable do
+          {BundledElixir.mix_home(lsp.assigns.bundle_base), BundledElixir.mix_archives(lsp.assigns.bundle_base)}
+        else
+          {nil, nil}
+        end
       end
 
     {:reply,
@@ -865,6 +878,9 @@ defmodule NextLS do
 
     elixir_bin_path =
       cond do
+        lsp.assigns.is_1_17 ->
+          "elixir" |> System.find_executable() |> Path.dirname()
+
         lsp.assigns.init_opts.elixir_bin_path != nil ->
           lsp.assigns.init_opts.elixir_bin_path
 
diff --git a/priv/monkey/_next_ls_private_compiler.ex b/priv/monkey/_next_ls_private_compiler.ex
index f802a2ff..60f301ae 100644
--- a/priv/monkey/_next_ls_private_compiler.ex
+++ b/priv/monkey/_next_ls_private_compiler.ex
@@ -1363,6 +1363,9 @@ if Version.match?(System.version(), ">= 1.17.0-dev") do
 
         :error ->
           expand_local(meta, fun, args, state, env)
+
+        {:error, _} ->
+          expand_local(meta, fun, args, state, env)
       end
     end