Skip to content

Commit 6813b52

Browse files
committed
Fix dialyzer issues
1 parent a2a6a28 commit 6813b52

File tree

13 files changed

+56
-23
lines changed

13 files changed

+56
-23
lines changed

apps/engine/lib/engine/engine/code_action.ex

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,9 @@ defmodule Engine.CodeAction do
99

1010
defstruct [:title, :kind, :changes, :uri]
1111

12-
@type code_action_kind ::
13-
:empty
14-
| :quick_fix
15-
| :refactor
16-
| :refactor_extract
17-
| :refactor_inline
18-
| :refactor_rewrite
19-
| :source
20-
| :source_organize_imports
21-
| :source_fix_all
12+
@type code_action_kind :: GenLSP.Enumerations.CodeActionKind.t()
2213

23-
@type trigger_kind :: :invoked | :automatic
14+
@type trigger_kind :: GenLSP.Enumerations.CodeActionTriggerKind.t()
2415

2516
@type t :: %__MODULE__{
2617
title: String.t(),

apps/engine/lib/engine/engine/code_action/handlers/add_alias.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ defmodule Engine.CodeAction.Handlers.AddAlias do
6969
CodeAction.new(
7070
analysis.document.uri,
7171
"alias #{Formats.module(potential_alias_module)}",
72-
:quick_fix,
72+
CodeActionKind.quick_fix(),
7373
changes
7474
)
7575
end

apps/engine/lib/engine/engine/code_action/handlers/organize_aliases.ex

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@ defmodule Engine.CodeAction.Handlers.OrganizeAliases do
2424
[]
2525
else
2626
changes = Changes.new(doc, edits)
27-
[CodeAction.new(doc.uri, "Organize aliases", :source_organize_imports, changes)]
27+
28+
[
29+
CodeAction.new(
30+
doc.uri,
31+
"Organize aliases",
32+
CodeActionKind.source_organize_imports(),
33+
changes
34+
)
35+
]
2836
end
2937
else
3038
_ ->

apps/engine/lib/engine/engine/code_action/handlers/remove_unused_alias.ex

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@ defmodule Engine.CodeAction.Handlers.RemoveUnusedAlias do
5252
case to_edit(document, range.start, diagnostic) do
5353
{:ok, module_name, edit} ->
5454
changes = Changes.new(document, [edit])
55-
action = CodeAction.new(document.uri, "Remove alias #{module_name}", :source, changes)
55+
56+
action =
57+
CodeAction.new(
58+
document.uri,
59+
"Remove alias #{module_name}",
60+
Enumerations.CodeActionKind.source(),
61+
changes
62+
)
5663

5764
[action | acc]
5865

apps/engine/lib/engine/engine/code_action/handlers/replace_remote_function.ex

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ defmodule Engine.CodeAction.Handlers.ReplaceRemoteFunction do
4141
case apply_transform(doc, line_number, module, function, suggestion) do
4242
{:ok, edits} ->
4343
changes = Changes.new(doc, edits)
44-
code_action = CodeAction.new(doc.uri, "Rename to #{suggestion}", :quick_fix, changes)
44+
45+
code_action =
46+
CodeAction.new(
47+
doc.uri,
48+
"Rename to #{suggestion}",
49+
CodeActionKind.quick_fix(),
50+
changes
51+
)
4552

4653
[code_action | acc]
4754

apps/engine/lib/engine/engine/code_action/handlers/replace_with_underscore.ex

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,13 @@ defmodule Engine.CodeAction.Handlers.ReplaceWithUnderscore do
1515
Enum.reduce(diagnostics, [], fn %Diagnostic{} = diagnostic, acc ->
1616
with {:ok, variable_name, line_number} <- extract_variable_and_line(diagnostic),
1717
{:ok, changes} <- to_changes(doc, line_number, variable_name) do
18-
action = CodeAction.new(doc.uri, "Rename to _#{variable_name}", :quick_fix, changes)
18+
action =
19+
CodeAction.new(
20+
doc.uri,
21+
"Rename to _#{variable_name}",
22+
CodeActionKind.quick_fix(),
23+
changes
24+
)
1925

2026
[action | acc]
2127
else

apps/expert/lib/expert.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ defmodule Expert do
2525
@dialyzer {:nowarn_function, apply_to_state: 2}
2626

2727
@spec server_request(
28-
Requests.request(),
29-
(Requests.request(), {:ok, any()} | {:error, term()} -> term())
28+
term(),
29+
(term(), {:ok, any()} | {:error, term()} -> term())
3030
) :: :ok
3131
def server_request(request, on_response) when is_function(on_response, 2) do
3232
GenServer.call(__MODULE__, {:server_request, request, on_response})
3333
end
3434

35-
@spec server_request(Requests.request()) :: :ok
35+
@spec server_request(term()) :: :ok
3636
def server_request(request) do
3737
server_request(request, fn _, _ -> :ok end)
3838
end

apps/expert/lib/expert/configuration.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ defmodule Expert.Configuration do
7575
apply_config_change(config, default_config())
7676
end
7777

78-
@spec on_change(t, DidChangeConfiguration.t()) ::
78+
@spec on_change(t, WorkspaceDidChangeConfiguration.t()) ::
7979
{:ok, t}
80-
| {:ok, t, Requests.RegisterCapability.t()}
80+
| {:ok, t, Requests.ClientRegisterCapability.t()}
8181
def on_change(%__MODULE__{} = old_config, :defaults) do
8282
apply_config_change(old_config, default_config())
8383
end

apps/expert/lib/expert/task_queue.ex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ defmodule Expert.TaskQueue do
126126
Transport.write(%{id: id, error: error})
127127
end
128128

129+
@dialyzer {:nowarn_function, map_code: 1}
130+
129131
defp map_code(:parse_error), do: ErrorCodes.parse_error()
130132
defp map_code(:invalid_request), do: ErrorCodes.invalid_request()
131133
defp map_code(:method_not_found), do: ErrorCodes.method_not_found()

apps/expert/lib/expert/transport/std_io.ex

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ defmodule Expert.Transport.StdIO do
8181
dump_lsp(request)
8282
end
8383

84+
# Dialyzer complains about Schematic.dump not existing, but it does
85+
# This will be removed by #20 anyways
86+
@dialyzer {:nowarn_function, dump_lsp: 1}
87+
8488
defp dump_lsp(%module{} = item) do
8589
with {:ok, item} <- Convert.to_lsp(item) do
8690
Schematic.dump(module.schematic(), item)

0 commit comments

Comments
 (0)