Skip to content

Commit 91d4866

Browse files
committed
Merge branch 'topic/fix_reload' into 'master'
Fix project reloading on `didChangeConfiguration` See merge request eng/ide/ada_language_server!1393
2 parents fd2acd5 + 3033ff4 commit 91d4866

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

source/ada/lsp-ada_configurations.adb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,15 @@ package body LSP.Ada_Configurations is
103103
Index : Positive := From;
104104
Variables_Names : VSS.String_Vectors.Virtual_String_Vector;
105105
Variables_Values : VSS.String_Vectors.Virtual_String_Vector;
106+
Follow_Symlinks : constant Boolean := Self.Follow_Symlinks;
106107

107108
procedure Parse_Variables (From : Positive);
108109
procedure Swap_Variables (Left, Right : Positive);
109110

110111
procedure Set
111112
(Target : in out VSS.Strings.Virtual_String;
112113
Value : VSS.Strings.Virtual_String);
114+
-- If Target /= Value then assign Target and set Reload to Trues
113115

114116
---------------------
115117
-- Parse_Variables --
@@ -146,6 +148,7 @@ package body LSP.Ada_Configurations is
146148
begin
147149
if Target /= Value then
148150
Target := Value;
151+
Reload := True;
149152
end if;
150153
end Set;
151154

@@ -248,6 +251,7 @@ package body LSP.Ada_Configurations is
248251
and then JSON (Index).Kind = Boolean_Value
249252
then
250253
Self.Follow_Symlinks := JSON (Index).Boolean_Value;
254+
Reload := Reload or else Follow_Symlinks /= Self.Follow_Symlinks;
251255

252256
elsif Name = "documentationStyle"
253257
and then JSON (Index).Kind = String_Value

0 commit comments

Comments
 (0)