Skip to content

Commit 41043c3

Browse files
Merge branch 'topic/eng/ide/ada_language_server#143' into 'master'
Make sure to bufferize ALS/GLS logs See merge request eng/ide/ada_language_server!1697
2 parents 1c92b43 + ed757f0 commit 41043c3

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

source/ada/lsp-ada_driver.adb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ begin
394394
">"
395395
& (if VSS.Command_Line.Is_Specified (Language_GPR_Option)
396396
then "gpr_ls" else "ada_ls")
397-
& "_log.$T.log:buffer_size=0" & Ada.Characters.Latin_1.LF
397+
& "_log.$T.log:buffer_size=0:buffer_size=0"
398+
& Ada.Characters.Latin_1.LF
398399
& "ALS.MAIN=yes" & Ada.Characters.Latin_1.LF
399400
& "ALS.IN=no" & Ada.Characters.Latin_1.LF
400401
& "ALS.OUT=no" & Ada.Characters.Latin_1.LF;

source/ada/lsp-ada_handlers.adb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,9 @@ package body LSP.Ada_Handlers is
237237
-- Browse the log files in reverse timestamp order
238238
for F of reverse Files.all loop
239239
-- Filter out files like traces.cfg
240-
if GNATCOLL.Utils.Ends_With (+F.Base_Name, ".log") then
240+
if GNATCOLL.Utils.Ends_With (+F.Base_Name, ".log")
241+
or else GNATCOLL.Utils.Ends_With (+F.Base_Name, ".txt")
242+
then
241243
Cpt := Cpt + 1;
242244
-- Delete the old logs
243245
if Cpt > Self.Configuration.Log_Threshold then

0 commit comments

Comments
 (0)