Skip to content

Commit b7420ea

Browse files
author
Étienne Lévesque
committed
Handle errors in server request
1 parent bd49269 commit b7420ea

File tree

1 file changed

+12
-10
lines changed
  • apps/language_server/lib/language_server

1 file changed

+12
-10
lines changed

apps/language_server/lib/language_server/server.ex

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -531,16 +531,10 @@ defmodule ElixirLS.LanguageServer.Server do
531531

532532
defp handle_request(code_lens_req(_id, uri), state) do
533533
fun = fn ->
534-
{:ok, spec_code_lens} =
535-
if dialyzer_enabled?(state) and state.settings["suggestSpecs"] != false do
536-
CodeLens.spec_code_lens(state.server_instance_id, uri, state.source_files[uri].text)
537-
else
538-
[]
539-
end
540-
541-
{:ok, test_code_lens} = CodeLens.test_code_lens(uri, state.source_files[uri].text)
542-
543-
{:ok, spec_code_lens ++ test_code_lens}
534+
with {:ok, spec_code_lens} <- get_spec_code_lens(state, uri),
535+
{:ok, test_code_lens} <- CodeLens.test_code_lens(uri, state.source_files[uri].text) do
536+
{:ok, spec_code_lens ++ test_code_lens}
537+
end
544538
end
545539

546540
{:async, fun, state}
@@ -602,6 +596,14 @@ defmodule ElixirLS.LanguageServer.Server do
602596
}
603597
end
604598

599+
defp get_spec_code_lens(state, uri) do
600+
if dialyzer_enabled?(state) and state.settings["suggestSpecs"] != false do
601+
CodeLens.spec_code_lens(state.server_instance_id, uri, state.source_files[uri].text)
602+
else
603+
{:ok, []}
604+
end
605+
end
606+
605607
# Build
606608

607609
defp trigger_build(state) do

0 commit comments

Comments
 (0)