Skip to content

Commit 9740cf2

Browse files
author
mergerepo
committed
Merge remote branch 'origin/master' into edge
(no-precommit-check no-tn-check)
2 parents 2af8e0c + fceb876 commit 9740cf2

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

source/ada/lsp-ada_handlers.adb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ package body LSP.Ada_Handlers is
101101
-- Convenient constants
102102

103103
Line_Feed : constant Character := Ada.Characters.Latin_1.LF;
104+
Backspace : constant Character := Ada.Characters.Latin_1.BS;
104105

105106
function "+" (Text : Ada.Strings.UTF_Encoding.UTF_8_String)
106107
return LSP.Types.LSP_String renames
@@ -696,7 +697,7 @@ package body LSP.Ada_Handlers is
696697
Response.result.capabilities.signatureHelpProvider :=
697698
(True,
698699
(triggerCharacters => (True, Empty_Vector & (+",") & (+"(")),
699-
retriggerCharacters => (True, Empty_Vector & (+(1 => ASCII.BS))),
700+
retriggerCharacters => (True, Empty_Vector & (+(1 => Backspace))),
700701
workDoneProgress => LSP.Types.None));
701702
Response.result.capabilities.completionProvider :=
702703
(True,
@@ -2667,7 +2668,7 @@ package body LSP.Ada_Handlers is
26672668
-- Check if the trigger character is a backspace
26682669
((not Value.context.Value.triggerCharacter.Is_Set)
26692670
or else Value.context.Value.triggerCharacter.Value /=
2670-
(+(1 => ASCII.BS))))
2671+
(+(1 => Backspace))))
26712672
then
26722673
-- At this point, we are filtering the previous signatures:
26732674
-- * Don't recompute the list of signature

source/server/lsp-servers.ads

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,14 @@ private
201201
type Input_Queue_Access is access Message_Queues.Queue;
202202
type Output_Queue_Access is access Message_Queues.Queue;
203203

204+
Processing_Task_Stack_Size : constant := 32 * 1_024 * 1_024;
205+
-- Size of the stack for request processing task. Set it to high enough
206+
-- value to prevent crashes on deep nesting calls inside LAL.
207+
204208
-- The processing task
205209
task type Processing_Task_Type
206210
(Server : access LSP.Servers.Server)
211+
with Storage_Size => Processing_Task_Stack_Size
207212
is
208213
entry Start
209214
(Request : not null LSP.Server_Request_Handlers

0 commit comments

Comments
 (0)