@@ -427,10 +427,8 @@ defmodule ElixirLS.Debugger.Server do
427
427
request ( _ , command ) ->
428
428
raise ServerError ,
429
429
message: "invalidRequest" ,
430
- format: "Debugger request {command} was not expected" ,
431
- variables: % {
432
- "command" => command
433
- }
430
+ format: "Debugger request #{ command } was not expected" ,
431
+ variables: % { }
434
432
end
435
433
else
436
434
state =
@@ -658,10 +656,8 @@ defmodule ElixirLS.Debugger.Server do
658
656
defp handle_request ( initialize_req ( _ , _client_info ) , _state = % __MODULE__ { } ) do
659
657
raise ServerError ,
660
658
message: "invalidRequest" ,
661
- format: "Debugger request {command} was not expected" ,
662
- variables: % {
663
- "command" => "initialize"
664
- }
659
+ format: "Debugger request #{ command } was not expected" ,
660
+ variables: % { }
665
661
end
666
662
667
663
defp handle_request ( cancel_req ( _ , args ) , % __MODULE__ { requests: requests } = state ) do
@@ -697,7 +693,8 @@ defmodule ElixirLS.Debugger.Server do
697
693
format: "Request or progress {reguestOrProgressId} cannot be cancelled" ,
698
694
variables: % {
699
695
"reguestOrProgressId" => inspect ( request_or_progress_id )
700
- }
696
+ } ,
697
+ send_telemetry: false
701
698
end
702
699
703
700
state = % {
@@ -749,22 +746,30 @@ defmodule ElixirLS.Debugger.Server do
749
746
config
750
747
751
748
{ :DOWN , ^ ref , :process , _pid , reason } ->
752
- if reason != :normal do
753
- message = "Launch request failed with reason\n " <> Exception . format_exit ( reason )
749
+ case reason do
750
+ :normal ->
751
+ :ok
754
752
755
- Output . debugger_console ( message )
753
+ :shutdown ->
754
+ :ok
756
755
757
- exit_code = 1
758
- Output . send_event ( "exited" , % { "exitCode" => exit_code } )
759
- Output . send_event ( "terminated" , % { "restart" => false } )
756
+ { :shutdown , _ } ->
757
+ :ok
760
758
761
- raise ServerError ,
762
- message: "launchError" ,
763
- format: message ,
764
- variables: % { } ,
765
- show_user: true
766
- else
767
- raise "exit reason #{ inspect ( reason ) } was not expected"
759
+ _other ->
760
+ message = "Launch request failed with reason\n " <> Exception . format_exit ( reason )
761
+
762
+ Output . debugger_console ( message )
763
+
764
+ exit_code = 1
765
+ Output . send_event ( "exited" , % { "exitCode" => exit_code } )
766
+ Output . send_event ( "terminated" , % { "restart" => false } )
767
+
768
+ raise ServerError ,
769
+ message: "launchError" ,
770
+ format: message ,
771
+ variables: % { } ,
772
+ show_user: true
768
773
end
769
774
end
770
775
@@ -1138,7 +1143,8 @@ defmodule ElixirLS.Debugger.Server do
1138
1143
format: "frameId not found: {frameId}" ,
1139
1144
variables: % {
1140
1145
"frameId" => inspect ( frame_id )
1141
- }
1146
+ } ,
1147
+ send_telemetry: false
1142
1148
end
1143
1149
1144
1150
{ % { "scopes" => scopes } , state }
@@ -1319,10 +1325,9 @@ defmodule ElixirLS.Debugger.Server do
1319
1325
defp handle_request ( request ( _ , command ) , % __MODULE__ { } ) when is_binary ( command ) do
1320
1326
raise ServerError ,
1321
1327
message: "notSupported" ,
1322
- format: "Debugger request {command} is currently not supported" ,
1323
- variables: % {
1324
- "command" => command
1325
- }
1328
+ format: "Debugger request #{ command } is currently not supported" ,
1329
+ variables: % { } ,
1330
+ show_user: true
1326
1331
end
1327
1332
1328
1333
defp maybe_continue_other_processes ( state , % { "singleThread" => true } ) do
@@ -1424,7 +1429,8 @@ defmodule ElixirLS.Debugger.Server do
1424
1429
format: "pid no longer paused: {pid}" ,
1425
1430
variables: % {
1426
1431
"pid" => inspect ( pid )
1427
- }
1432
+ } ,
1433
+ send_telemetry: false
1428
1434
end
1429
1435
end )
1430
1436
|> Enum . reverse ( )
@@ -1514,7 +1520,8 @@ defmodule ElixirLS.Debugger.Server do
1514
1520
raise ServerError ,
1515
1521
message: "argumentError" ,
1516
1522
format: "Unable to find frame {frameId}" ,
1517
- variables: % { "frameId" => frame_id }
1523
+ variables: % { "frameId" => frame_id } ,
1524
+ send_telemetry: false
1518
1525
end
1519
1526
end
1520
1527
@@ -1535,7 +1542,8 @@ defmodule ElixirLS.Debugger.Server do
1535
1542
format: "variablesReference not found: {variablesReference}" ,
1536
1543
variables: % {
1537
1544
"variablesReference" => inspect ( var_id )
1538
- }
1545
+ } ,
1546
+ send_telemetry: false
1539
1547
1540
1548
other ->
1541
1549
other
0 commit comments