Skip to content

Commit 9c069b9

Browse files
author
automatic-merge
committed
Merge remote branch 'origin/master' into edge
2 parents abf8849 + 41043c3 commit 9c069b9

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
section below it for the last release. -->
55
## \<next>
66

7+
## 25.0.20240915
8+
79
* Implement type hierarchy requests
810
* Migrate the build infrastructure to ALIRE
911
* Migrate the VSIX publication infrastructure out of GitHub Actions

source/ada/lsp-ada_driver.adb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ begin
395395
">"
396396
& (if VSS.Command_Line.Is_Specified (Language_GPR_Option)
397397
then "gpr_ls" else "ada_ls")
398-
& "_log.$T.log:buffer_size=0" & Ada.Characters.Latin_1.LF
398+
& "_log.$T.log:buffer_size=0:buffer_size=0"
399+
& Ada.Characters.Latin_1.LF
399400
& "ALS.MAIN=yes" & Ada.Characters.Latin_1.LF
400401
& "ALS.IN=no" & Ada.Characters.Latin_1.LF
401402
& "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)