Skip to content

Commit d2eb6f3

Browse files
committed
fix false positives in feature reporting
1 parent d4d8a30 commit d2eb6f3

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

apps/elixir_ls_debugger/lib/debugger/server.ex

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -728,11 +728,12 @@ defmodule ElixirLS.Debugger.Server do
728728
to_string(Map.get(config, "exitAfterTaskReturns", true)),
729729
"elixir_ls.noDebug" => to_string(Map.get(config, "noDebug", false)),
730730
"elixir_ls.breakOnDbg" => to_string(Map.get(config, "breakOnDbg", true)),
731-
"elixir_ls.env" => to_string(Map.has_key?(config, "env")),
732-
"elixir_ls.requireFiles" => to_string(Map.has_key?(config, "requireFiles")),
731+
"elixir_ls.env" => to_string(Map.get(config, "env", %{}) != %{}),
732+
"elixir_ls.requireFiles" => to_string(Map.get(config, "requireFiles", []) != []),
733733
"elixir_ls.debugInterpretModulesPatterns" =>
734-
to_string(Map.has_key?(config, "debugInterpretModulesPatterns")),
735-
"elixir_ls.excludeModules" => to_string(Map.has_key?(config, "excludeModules")),
734+
to_string(Map.get(config, "debugInterpretModulesPatterns", []) != []),
735+
"elixir_ls.excludeModules" =>
736+
to_string(Map.get(config, "excludeModules", []) != []),
736737
"elixir_ls.task" => to_string(Map.get(config, "task", ":default_task"))
737738
},
738739
%{}

apps/language_server/lib/language_server/server.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ defmodule ElixirLS.LanguageServer.Server do
14701470
JsonRpc.telemetry(
14711471
"lsp_config",
14721472
%{
1473-
"elixir_ls.projectDir" => to_string(Map.has_key?(settings, "projectDir")),
1473+
"elixir_ls.projectDir" => to_string(Map.get(settings, "projectDir", "") != ""),
14741474
"elixir_ls.autoBuild" => to_string(Map.get(settings, "autoBuild", true)),
14751475
"elixir_ls.dialyzerEnabled" => to_string(Map.get(settings, "dialyzerEnabled", true)),
14761476
"elixir_ls.fetchDeps" => to_string(Map.get(settings, "fetchDeps", false)),
@@ -1481,8 +1481,8 @@ defmodule ElixirLS.LanguageServer.Server do
14811481
to_string(Map.get(settings, "signatureAfterComplete", true)),
14821482
"elixir_ls.enableTestLenses" => to_string(Map.get(settings, "enableTestLenses", false)),
14831483
"elixir_ls.languageServerOverridePath" =>
1484-
to_string(Map.has_key?(settings, "languageServerOverridePath")),
1485-
"elixir_ls.envVariables" => to_string(Map.has_key?(settings, "envVariables")),
1484+
to_string(Map.get(settings, "languageServerOverridePath", "") != ""),
1485+
"elixir_ls.envVariables" => to_string(Map.get(settings, "envVariables", %{}) != %{}),
14861486
"elixir_ls.mixEnv" => to_string(Map.get(settings, "mixEnv", "test")),
14871487
"elixir_ls.mixTarget" => to_string(Map.get(settings, "mixTarget", "host")),
14881488
"elixir_ls.dialyzerFormat" =>

0 commit comments

Comments
 (0)