Skip to content

Commit 6ddb79c

Browse files
committed
raise on invalid cancel request
1 parent 6d3d667 commit 6ddb79c

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

apps/elixir_ls_debugger/lib/debugger/server.ex

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -521,11 +521,12 @@ defmodule ElixirLS.Debugger.Server do
521521
}
522522

523523
_ ->
524-
Output.debugger_console(
525-
"Received cancel request for unknown requestId: #{inspect(request_or_progress_id)}\n"
526-
)
527-
528-
state
524+
raise ServerError,
525+
message: "invalidRequest",
526+
format: "Request or progress {reguestOrProgressId} cannot be cancelled",
527+
variables: %{
528+
"reguestOrProgressId" => inspect(request_or_progress_id)
529+
}
529530
end
530531

531532
{%{}, state}

apps/elixir_ls_debugger/test/debugger_test.exs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2914,7 +2914,7 @@ defmodule ElixirLS.Debugger.ServerTest do
29142914
end)
29152915
end
29162916

2917-
describe "Watch section" do
2917+
describe "evaluate" do
29182918
defp gen_watch_expression_packet(seq, expr) do
29192919
%{
29202920
"arguments" => %{
@@ -3372,7 +3372,16 @@ defmodule ElixirLS.Debugger.ServerTest do
33723372
cancel_req(2, %{"requestId" => 1})
33733373
)
33743374

3375-
assert_receive(response(_, 2, "cancel", _))
3375+
assert_receive(
3376+
error_response(
3377+
_,
3378+
2,
3379+
"cancel",
3380+
"invalidRequest",
3381+
"Request or progress {reguestOrProgressId} cannot be cancelled",
3382+
%{"reguestOrProgressId" => "1"}
3383+
)
3384+
)
33763385

33773386
assert Process.alive?(server)
33783387
end)

0 commit comments

Comments
 (0)