Support passing target and env options from LSP

elixir-tools · Oct 2, 2023 · 8f8f276 · 8f8f276
1 parent 7099370
commit 8f8f276
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/lib/next_ls.ex b/lib/next_ls.ex
@@ -91,7 +91,12 @@ defmodule NextLS do
   @impl true
   def handle_request(
         %Initialize{
-          params: %InitializeParams{root_uri: root_uri, workspace_folders: workspace_folders, capabilities: caps}
+          params: %InitializeParams{
+            root_uri: root_uri,
+            workspace_folders: workspace_folders,
+            capabilities: caps,
+            initialization_options: init_opts
+          }
         },
         lsp
       ) do
@@ -102,6 +107,15 @@ defmodule NextLS do
         %{name: Path.basename(root_uri), uri: root_uri}
       end
 
+    safe_opt = fn opts, key, default ->
+      if val = opts[key] in ["", nil], do: default, else: val
+    end
+
+    safe_init_opts = %{
+      mix_env: safe_opt.(init_opts, "mix_env", "dev"),
+      mix_target: safe_opt.(init_opts, "mix_target", "host")
+    }
+
     {:reply,
      %InitializeResult{
        capabilities: %ServerCapabilities{
@@ -124,7 +138,13 @@ defmodule NextLS do
          }
        },
        server_info: %{name: "Next LS"}
-     }, assign(lsp, root_uri: root_uri, workspace_folders: workspace_folders, client_capabilities: caps)}
+     },
+     assign(lsp,
+       root_uri: root_uri,
+       workspace_folders: workspace_folders,
+       client_capabilities: caps,
+       init_opts: safe_init_opts
+     )}
   end
 
   def handle_request(%TextDocumentDefinition{params: %{text_document: %{uri: uri}, position: position}}, lsp) do
@@ -555,6 +575,8 @@ defmodule NextLS do
              task_supervisor: lsp.assigns.runtime_task_supervisor,
              working_dir: working_dir,
              uri: uri,
+             mix_env: lsp.assigns.init_opts.mix_env,
+             mix_target: lsp.assigns.init_opts.mix_target,
              on_initialized: fn status ->
                if status == :ready do
                  Progress.stop(lsp, token, "NextLS runtime for folder #{name} has initialized!")
@@ -668,6 +690,8 @@ defmodule NextLS do
                task_supervisor: lsp.assigns.runtime_task_supervisor,
                working_dir: working_dir,
                uri: uri,
+               mix_env: lsp.assigns.init_opts.mix_env,
+               mix_target: lsp.assigns.init_opts.mix_target,
                on_initialized: fn status ->
                  if status == :ready do
                    Progress.stop(lsp, token, "NextLS runtime for folder #{name} has initialized!")

diff --git a/lib/next_ls/runtime.ex b/lib/next_ls/runtime.ex
@@ -49,6 +49,8 @@ defmodule NextLS.Runtime do
     registry = Keyword.fetch!(opts, :registry)
     on_initialized = Keyword.fetch!(opts, :on_initialized)
     db = Keyword.fetch!(opts, :db)
+    mix_env = Keyword.fetch!(opts, :mix_env)
+    mix_target = Keyword.fetch!(opts, :mix_target)
 
     Registry.register(registry, :runtimes, %{name: name, uri: uri, path: working_dir, db: db})
 
@@ -86,7 +88,8 @@ defmodule NextLS.Runtime do
             env: [
               {~c"LSP", ~c"nextls"},
               {~c"NEXTLS_PARENT_PID", parent},
-              {~c"MIX_ENV", ~c"dev"},
+              {~c"MIX_ENV", ~c"#{mix_env}"},
+              {~c"MIX_TARGET", ~c"#{mix_target}"},
               {~c"MIX_BUILD_ROOT", ~c".elixir-tools/_build"},
               {~c"ROOTDIR", false},
               {~c"BINDIR", false},

diff --git a/test/next_ls/runtime_test.exs b/test/next_ls/runtime_test.exs
@@ -67,6 +67,8 @@ defmodule NextLs.RuntimeTest do
          parent: self(),
          logger: logger,
          db: :some_db,
+         mix_env: "dev",
+         mix_target: "host",
          registry: RuntimeTest.Registry},
         restart: :temporary
       )
@@ -97,6 +99,8 @@ defmodule NextLs.RuntimeTest do
            parent: self(),
            logger: logger,
            db: :some_db,
+           mix_env: "dev",
+           mix_target: "host",
            registry: RuntimeTest.Registry},
           restart: :temporary
         )
@@ -127,6 +131,8 @@ defmodule NextLs.RuntimeTest do
            parent: self(),
            logger: logger,
            db: :some_db,
+           mix_env: "dev",
+           mix_target: "host",
            registry: RuntimeTest.Registry}
         )
 
@@ -153,6 +159,8 @@ defmodule NextLs.RuntimeTest do
            parent: self(),
            logger: logger,
            db: :some_db,
+           mix_env: "dev",
+           mix_target: "host",
            registry: RuntimeTest.Registry}
         )
 
@@ -180,6 +188,8 @@ defmodule NextLs.RuntimeTest do
            parent: self(),
            logger: logger,
            db: :some_db,
+           mix_env: "dev",
+           mix_target: "host",
            registry: RuntimeTest.Registry}
         )
 
@@ -232,6 +242,8 @@ defmodule NextLs.RuntimeTest do
            parent: self(),
            logger: logger,
            db: :some_db,
+           mix_env: "dev",
+           mix_target: "host",
            registry: RuntimeTest.Registry}
         )