Skip to content

Commit d2463ad

Browse files
authored
Revert "Add basic code action support (#718)" (#775)
This reverts commit 9fe8ea1.
1 parent 8c34886 commit d2463ad

File tree

4 files changed

+2
-144
lines changed

4 files changed

+2
-144
lines changed

apps/language_server/lib/language_server/protocol.ex

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -200,17 +200,6 @@ defmodule ElixirLS.LanguageServer.Protocol do
200200
end
201201
end
202202

203-
defmacro code_action_req(id, uri, diagnostics) do
204-
quote do
205-
request(unquote(id), "textDocument/codeAction", %{
206-
"context" => %{"diagnostics" => unquote(diagnostics)},
207-
"textDocument" => %{
208-
"uri" => unquote(uri)
209-
}
210-
})
211-
end
212-
end
213-
214203
# Other utilities
215204

216205
defmacro range(start_line, start_character, end_line, end_character) do

apps/language_server/lib/language_server/providers/code_action.ex

Lines changed: 0 additions & 61 deletions
This file was deleted.

apps/language_server/lib/language_server/server.ex

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ defmodule ElixirLS.LanguageServer.Server do
3232
OnTypeFormatting,
3333
CodeLens,
3434
ExecuteCommand,
35-
FoldingRange,
36-
CodeAction
35+
FoldingRange
3736
}
3837

3938
alias ElixirLS.Utils.Launch
@@ -780,10 +779,6 @@ defmodule ElixirLS.LanguageServer.Server do
780779
end
781780
end
782781

783-
defp handle_request(code_action_req(_id, uri, diagnostics), state = %__MODULE__{}) do
784-
{:async, fn -> CodeAction.code_actions(uri, diagnostics) end, state}
785-
end
786-
787782
defp handle_request(%{"method" => "$/" <> _}, state = %__MODULE__{}) do
788783
# "$/" requests that the server doesn't support must return method_not_found
789784
{:error, :method_not_found, nil, state}
@@ -835,8 +830,7 @@ defmodule ElixirLS.LanguageServer.Server do
835830
"workspace" => %{
836831
"workspaceFolders" => %{"supported" => false, "changeNotifications" => false}
837832
},
838-
"foldingRangeProvider" => true,
839-
"codeActionProvider" => true
833+
"foldingRangeProvider" => true
840834
}
841835
end
842836

apps/language_server/test/server_test.exs

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,70 +1525,6 @@ defmodule ElixirLS.LanguageServer.ServerTest do
15251525
end
15261526
end
15271527

1528-
describe "textDocument/codeAction" do
1529-
test "return code actions on unused variables", %{server: server} do
1530-
uri = "file:///file.ex"
1531-
fake_initialize(server)
1532-
1533-
Server.receive_packet(server, did_open(uri, "elixir", 1, ""))
1534-
1535-
Server.receive_packet(
1536-
server,
1537-
code_action_req(1, uri, [
1538-
%{
1539-
"message" =>
1540-
"variable \"foo\" is unused (if the variable is not meant to be used, prefix it with an underscore)",
1541-
"range" => %{
1542-
"end" => %{"character" => 13, "line" => 19},
1543-
"start" => %{"character" => 4, "line" => 19}
1544-
},
1545-
"severity" => 1,
1546-
"source" => "Elixir"
1547-
}
1548-
])
1549-
)
1550-
1551-
resp = assert_receive(%{"id" => 1}, 5000)
1552-
1553-
assert response(1, [
1554-
%{
1555-
"edit" => %{
1556-
"changes" => %{
1557-
"file:///file.ex" => [
1558-
%{
1559-
"newText" => "_",
1560-
"range" => %{
1561-
"end" => %{"character" => 4, "line" => 19},
1562-
"start" => %{"character" => 4, "line" => 19}
1563-
}
1564-
}
1565-
]
1566-
}
1567-
},
1568-
"kind" => "quickfix",
1569-
"title" => "Add '_' to unused variable"
1570-
},
1571-
%{
1572-
"edit" => %{
1573-
"changes" => %{
1574-
"file:///file.ex" => [
1575-
%{
1576-
"newText" => "",
1577-
"range" => %{
1578-
"end" => %{"character" => 13, "line" => 19},
1579-
"start" => %{"character" => 4, "line" => 19}
1580-
}
1581-
}
1582-
]
1583-
}
1584-
},
1585-
"kind" => "quickfix",
1586-
"title" => "Remove unused variable"
1587-
}
1588-
]) == resp
1589-
end
1590-
end
1591-
15921528
defp with_new_server(func) do
15931529
server = start_supervised!({Server, nil})
15941530
packet_capture = start_supervised!({PacketCapture, self()})

0 commit comments

Comments
 (0)