Skip to content

Commit 3009b45

Browse files
joaopsazevedojoaopsazevedo
committed
Merge branch 'laltools_split_edge' into 'edge'
Update dependencies due to Laltools split See merge request eng/ide/ada_language_server!1235
2 parents 067b49c + 58c1f01 commit 3009b45

21 files changed

+109
-109
lines changed

‎gnat/lsp_server.gpr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
with "gpr2.gpr";
1919
with "libadalang";
2020
with "lal_tools.gpr";
21+
with "lal_refactor.gpr";
2122
with "ada_libfswatch.gpr";
2223
with "libgnatdoc.gpr";
2324
with "spawn.gpr";

‎source/ada/lsp-ada_handlers-refactor_add_parameter.adb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ with Langkit_Support.Slocs;
2121

2222
with Libadalang.Analysis; use Libadalang.Analysis;
2323

24-
with Laltools.Refactor.Subprogram_Signature;
25-
use Laltools.Refactor.Subprogram_Signature;
24+
with LAL_Refactor.Subprogram_Signature;
25+
use LAL_Refactor.Subprogram_Signature;
2626

2727
with LSP.Common;
2828
with LSP.Messages.Client_Requests;
@@ -132,7 +132,7 @@ package body LSP.Ada_Handlers.Refactor_Add_Parameter is
132132
Error : in out LSP.Errors.Optional_ResponseError)
133133
is
134134
use Langkit_Support.Slocs;
135-
use Laltools.Refactor;
135+
use LAL_Refactor;
136136
use LSP.Messages;
137137
use LSP.Types;
138138
use VSS.Strings.Conversions;
@@ -162,7 +162,7 @@ package body LSP.Ada_Handlers.Refactor_Add_Parameter is
162162
New_Parameter =>
163163
VSS.Strings.Conversions.To_Unbounded_UTF_8_String
164164
(Self.New_Parameter));
165-
Edits : constant Laltools.Refactor.Refactoring_Edits :=
165+
Edits : constant LAL_Refactor.Refactoring_Edits :=
166166
Adder.Refactor (Analysis_Units'Access);
167167

168168
begin

‎source/ada/lsp-ada_handlers-refactor_change_parameter_mode.adb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameter_Mode is
247247
Client_Message_Receiver'Class;
248248
Error : in out LSP.Errors.Optional_ResponseError)
249249
is
250-
use Laltools.Refactor;
250+
use LAL_Refactor;
251251
use LSP.Messages;
252252
use LSP.Types;
253253
use VSS.Strings.Conversions;
@@ -274,7 +274,7 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameter_Mode is
274274
Last => Positive (Self.Last_Param_Index));
275275

276276
Changer : Mode_Changer;
277-
Edits : Laltools.Refactor.Refactoring_Edits;
277+
Edits : LAL_Refactor.Refactoring_Edits;
278278

279279
function Analysis_Units return Analysis_Unit_Array is
280280
(Context.Analysis_Units);

‎source/ada/lsp-ada_handlers-refactor_change_parameter_mode.ads‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ with LSP.JSON_Streams;
2929
with Libadalang.Analysis;
3030
with Libadalang.Common;
3131

32-
with Laltools.Refactor.Subprogram_Signature;
33-
use Laltools.Refactor.Subprogram_Signature;
32+
with LAL_Refactor.Subprogram_Signature; use LAL_Refactor.Subprogram_Signature;
3433

3534
package LSP.Ada_Handlers.Refactor_Change_Parameter_Mode is
3635

‎source/ada/lsp-ada_handlers-refactor_change_parameters_default_value.adb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ with Langkit_Support.Slocs; use Langkit_Support.Slocs;
2727

2828
with Libadalang.Analysis; use Libadalang.Analysis;
2929

30-
with Laltools.Refactor.Subprogram_Signature.Change_Parameters_Default_Value;
30+
with LAL_Refactor.Subprogram_Signature.Change_Parameters_Default_Value;
3131

3232
with LSP.Common;
3333
with LSP.Messages.Client_Requests;
@@ -138,8 +138,8 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value is
138138
Client_Message_Receiver'Class;
139139
Error : in out LSP.Errors.Optional_ResponseError)
140140
is
141-
use Laltools.Refactor;
142-
use Laltools.Refactor.Subprogram_Signature.
141+
use LAL_Refactor;
142+
use LAL_Refactor.Subprogram_Signature.
143143
Change_Parameters_Default_Value;
144144
use LSP.Messages;
145145
use LSP.Types;
@@ -176,7 +176,7 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value is
176176
(Context.Analysis_Units);
177177
-- Provides the Context Analysis_Unit_Array to the Pull_Upper
178178

179-
Edits : constant Laltools.Refactor.Refactoring_Edits :=
179+
Edits : constant LAL_Refactor.Refactoring_Edits :=
180180
Changer.Refactor (Analysis_Units'Access);
181181

182182
begin

‎source/ada/lsp-ada_handlers-refactor_change_parameters_type.adb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ with Langkit_Support.Slocs; use Langkit_Support.Slocs;
2727

2828
with Libadalang.Analysis; use Libadalang.Analysis;
2929

30-
with Laltools.Refactor.Subprogram_Signature.Change_Parameters_Type;
30+
with LAL_Refactor.Subprogram_Signature.Change_Parameters_Type;
3131

3232
with LSP.Common;
3333
with LSP.Messages.Client_Requests;
@@ -161,8 +161,8 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameters_Type is
161161
Client_Message_Receiver'Class;
162162
Error : in out LSP.Errors.Optional_ResponseError)
163163
is
164-
use Laltools.Refactor;
165-
use Laltools.Refactor.Subprogram_Signature.Change_Parameters_Type;
164+
use LAL_Refactor;
165+
use LAL_Refactor.Subprogram_Signature.Change_Parameters_Type;
166166
use LSP.Messages;
167167
use LSP.Types;
168168
use VSS.Strings.Conversions;
@@ -197,7 +197,7 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameters_Type is
197197
Parameters_SLOC_Range,
198198
New_Parameters_Type =>
199199
To_Unbounded_UTF_8_String (Self.New_Parameters_Type));
200-
Edits : constant Laltools.Refactor.Refactoring_Edits :=
200+
Edits : constant LAL_Refactor.Refactoring_Edits :=
201201
Changer.Refactor (Analysis_Units'Access);
202202

203203
begin

‎source/ada/lsp-ada_handlers-refactor_extract_subprogram.adb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ with Langkit_Support.Slocs; use Langkit_Support.Slocs;
2222
with Libadalang.Analysis; use Libadalang.Analysis;
2323
with Libadalang.Common; use Libadalang.Common;
2424

25-
with Laltools.Refactor; use Laltools.Refactor;
26-
with Laltools.Refactor.Extract_Subprogram;
27-
use Laltools.Refactor.Extract_Subprogram;
25+
with LAL_Refactor; use LAL_Refactor;
26+
with LAL_Refactor.Extract_Subprogram;
27+
use LAL_Refactor.Extract_Subprogram;
2828

2929
with LSP.Common;
3030
with LSP.Messages.Client_Requests;

‎source/ada/lsp-ada_handlers-refactor_imports_commands.adb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ package body LSP.Ada_Handlers.Refactor_Imports_Commands is
9898
Context : Context_Access;
9999
Where : LSP.Messages.Location;
100100
Commands_Vector : in out LSP.Messages.CodeAction_Vector;
101-
Suggestion : Laltools.Refactor_Imports.Import_Suggestion)
101+
Suggestion : LAL_Refactor.Refactor_Imports.Import_Suggestion)
102102
is
103103
Pointer : LSP.Commands.Command_Pointer;
104104
Item : LSP.Messages.CodeAction;
105105

106106
function Create_Suggestion_Title
107-
(Suggestion : Laltools.Refactor_Imports.Import_Suggestion)
107+
(Suggestion : LAL_Refactor.Refactor_Imports.Import_Suggestion)
108108
return VSS.Strings.Virtual_String;
109109
-- Creates the suggestion text that will be shown by the client to
110110
-- to the developer. The text is costumized based on the need of
@@ -114,7 +114,7 @@ package body LSP.Ada_Handlers.Refactor_Imports_Commands is
114114
-- Create_Suggestions_Title --
115115
------------------------------
116116
function Create_Suggestion_Title
117-
(Suggestion : Laltools.Refactor_Imports.Import_Suggestion)
117+
(Suggestion : LAL_Refactor.Refactor_Imports.Import_Suggestion)
118118
return VSS.Strings.Virtual_String
119119
is
120120
Title : Ada.Strings.Wide_Wide_Unbounded.
@@ -188,20 +188,20 @@ package body LSP.Ada_Handlers.Refactor_Imports_Commands is
188188
(Self : Command;
189189
Context : LSP.Ada_Contexts.Context;
190190
Document : LSP.Ada_Documents.Document_Access)
191-
return Laltools.Refactor.Refactoring_Edits
191+
return LAL_Refactor.Refactoring_Edits
192192
is
193193
use Langkit_Support.Text;
194194
use Libadalang.Analysis;
195195
use Libadalang.Common;
196196
use Libadalang.Slocs;
197-
use Laltools.Refactor;
197+
use LAL_Refactor;
198198
use VSS.Strings;
199199
use VSS.Strings.Conversions;
200200

201201
Node : Ada_Node :=
202202
Document.Get_Node_At (Context, Self.Where.position);
203203

204-
Edits : Laltools.Refactor.Refactoring_Edits;
204+
Edits : LAL_Refactor.Refactoring_Edits;
205205

206206
begin
207207
-- Add prefix
@@ -317,7 +317,7 @@ package body LSP.Ada_Handlers.Refactor_Imports_Commands is
317317
Client_Message_Receiver'Class;
318318
Error : in out LSP.Errors.Optional_ResponseError)
319319
is
320-
use Laltools.Refactor;
320+
use LAL_Refactor;
321321
use LSP.Messages;
322322
use LSP.Types;
323323
use VSS.Strings;

‎source/ada/lsp-ada_handlers-refactor_imports_commands.ads‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ with Ada.Streams;
2121

2222
with VSS.Strings;
2323

24-
with Laltools.Refactor;
25-
with Laltools.Refactor_Imports;
24+
with LAL_Refactor;
25+
with LAL_Refactor.Refactor_Imports;
2626

2727
with LSP.Client_Message_Receivers;
2828
with LSP.Commands;
@@ -46,7 +46,7 @@ package LSP.Ada_Handlers.Refactor_Imports_Commands is
4646
Context : Context_Access;
4747
Where : LSP.Messages.Location;
4848
Commands_Vector : in out LSP.Messages.CodeAction_Vector;
49-
Suggestion : Laltools.Refactor_Imports.Import_Suggestion);
49+
Suggestion : LAL_Refactor.Refactor_Imports.Import_Suggestion);
5050
-- Initializes Command based on Suggestion and appends it to
5151
-- Commands_Vector.
5252

@@ -80,8 +80,8 @@ private
8080
(Self : Command;
8181
Context : LSP.Ada_Contexts.Context;
8282
Document : LSP.Ada_Documents.Document_Access)
83-
return Laltools.Refactor.Refactoring_Edits;
84-
-- Converts Self into Laltools.Refactor.Refactoring_Edits that can be
83+
return LAL_Refactor.Refactoring_Edits;
84+
-- Converts Self into LAL_Refactor.Refactoring_Edits that can be
8585
-- converted in a WorkspaceEdit.
8686

8787
for Command'Write use Write_Command;

‎source/ada/lsp-ada_handlers-refactor_introduce_parameter.adb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ with Langkit_Support.Slocs;
2121

2222
with Libadalang.Analysis; use Libadalang.Analysis;
2323

24-
with Laltools.Refactor.Introduce_Parameter;
25-
use Laltools.Refactor.Introduce_Parameter;
24+
with LAL_Refactor.Introduce_Parameter;
25+
use LAL_Refactor.Introduce_Parameter;
2626

2727
with LSP.Common;
2828
with LSP.Messages.Client_Requests;
@@ -125,7 +125,7 @@ package body LSP.Ada_Handlers.Refactor_Introduce_Parameter is
125125
Error : in out LSP.Errors.Optional_ResponseError)
126126
is
127127
use Langkit_Support.Slocs;
128-
use Laltools.Refactor;
128+
use LAL_Refactor;
129129
use LSP.Errors;
130130
use LSP.Messages;
131131
use LSP.Types;

0 commit comments

Comments
 (0)