Skip to content

Commit 9d3250c

Browse files
committed
Merge branch 'topic/fix' into 'master'
Avoid second call of `Register_Commands` See merge request eng/ide/ada_language_server!1399
2 parents 6ab8173 + d90d313 commit 9d3250c

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

source/ada/lsp-ada_driver.adb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,6 @@ begin
305305
GNATCOLL.Memory.Configure (Activate_Monitor => True);
306306
end if;
307307

308-
if not VSS.Command_Line.Is_Specified (Language_GPR_Option) then
309-
-- Load predefined completion items
310-
LSP.Predefined_Completion.Load_Predefined_Completion_Db (Server_Trace);
311-
Register_Commands;
312-
end if;
313-
314308
Ada.Text_IO.Set_Output (Ada.Text_IO.Standard_Error);
315309
-- Protect stdout from pollution by accidental Put_Line calls
316310

@@ -341,6 +335,10 @@ begin
341335
else
342336
Register_Commands;
343337

338+
-- Load predefined completion items
339+
LSP.Predefined_Completion.Load_Predefined_Completion_Db
340+
(Server_Trace);
341+
344342
Server.Run
345343
(Ada_Handler'Unchecked_Access,
346344
Tracer'Unchecked_Access,

0 commit comments

Comments
 (0)