Skip to content

Commit 9f978c1

Browse files
Add new LSP.Ada_Handler.Refactor package
For eng/ide/ada_language_server#1149
1 parent 5e9f675 commit 9f978c1

29 files changed

+138
-107
lines changed

source/ada/lsp-ada_driver.adb

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ with LSP.Ada_Handlers;
4444
with LSP.Ada_Handlers.Named_Parameters_Commands;
4545
with LSP.Ada_Handlers.Other_File_Commands;
4646
with LSP.Ada_Handlers.Project_Reload_Commands;
47-
with LSP.Ada_Handlers.Refactor_Imports_Commands;
48-
with LSP.Ada_Handlers.Refactor_Add_Parameter;
49-
with LSP.Ada_Handlers.Refactor_Remove_Parameter;
50-
with LSP.Ada_Handlers.Refactor_Move_Parameter;
51-
with LSP.Ada_Handlers.Refactor_Change_Parameter_Mode;
52-
with LSP.Ada_Handlers.Refactor_Change_Parameters_Type;
53-
with LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value;
54-
with LSP.Ada_Handlers.Refactor_Suppress_Seperate;
55-
with LSP.Ada_Handlers.Refactor_Extract_Subprogram;
56-
with LSP.Ada_Handlers.Refactor_Introduce_Parameter;
57-
with LSP.Ada_Handlers.Refactor_Pull_Up_Declaration;
58-
with LSP.Ada_Handlers.Refactor_Replace_Type;
59-
with LSP.Ada_Handlers.Refactor_Sort_Dependencies;
47+
with LSP.Ada_Handlers.Refactor.Imports_Commands;
48+
with LSP.Ada_Handlers.Refactor.Add_Parameter;
49+
with LSP.Ada_Handlers.Refactor.Remove_Parameter;
50+
with LSP.Ada_Handlers.Refactor.Move_Parameter;
51+
with LSP.Ada_Handlers.Refactor.Change_Parameter_Mode;
52+
with LSP.Ada_Handlers.Refactor.Change_Parameters_Type;
53+
with LSP.Ada_Handlers.Refactor.Change_Parameters_Default_Value;
54+
with LSP.Ada_Handlers.Refactor.Suppress_Seperate;
55+
with LSP.Ada_Handlers.Refactor.Extract_Subprogram;
56+
with LSP.Ada_Handlers.Refactor.Introduce_Parameter;
57+
with LSP.Ada_Handlers.Refactor.Pull_Up_Declaration;
58+
with LSP.Ada_Handlers.Refactor.Replace_Type;
59+
with LSP.Ada_Handlers.Refactor.Sort_Dependencies;
6060
with LSP.Commands;
6161
with LSP.Error_Decorators;
6262
with LSP.Fuzz_Decorators;
@@ -148,33 +148,33 @@ procedure LSP.Ada_Driver is
148148
LSP.Commands.Register
149149
(LSP.Ada_Handlers.Named_Parameters_Commands.Command'Tag);
150150
LSP.Commands.Register
151-
(LSP.Ada_Handlers.Refactor_Imports_Commands.Command'Tag);
151+
(LSP.Ada_Handlers.Refactor.Imports_Commands.Command'Tag);
152152
LSP.Commands.Register
153-
(LSP.Ada_Handlers.Refactor_Suppress_Seperate.Command'Tag);
153+
(LSP.Ada_Handlers.Refactor.Suppress_Seperate.Command'Tag);
154154
LSP.Commands.Register
155-
(LSP.Ada_Handlers.Refactor_Extract_Subprogram.Command'Tag);
155+
(LSP.Ada_Handlers.Refactor.Extract_Subprogram.Command'Tag);
156156
LSP.Commands.Register
157-
(LSP.Ada_Handlers.Refactor_Introduce_Parameter.Command'Tag);
157+
(LSP.Ada_Handlers.Refactor.Introduce_Parameter.Command'Tag);
158158
LSP.Commands.Register
159-
(LSP.Ada_Handlers.Refactor_Pull_Up_Declaration.Command'Tag);
159+
(LSP.Ada_Handlers.Refactor.Pull_Up_Declaration.Command'Tag);
160160
LSP.Commands.Register
161-
(LSP.Ada_Handlers.Refactor_Replace_Type.Command'Tag);
161+
(LSP.Ada_Handlers.Refactor.Replace_Type.Command'Tag);
162162
LSP.Commands.Register
163-
(LSP.Ada_Handlers.Refactor_Sort_Dependencies.Command'Tag);
163+
(LSP.Ada_Handlers.Refactor.Sort_Dependencies.Command'Tag);
164164

165165
-- Refactoring - Change Subprogram Signature Commands
166166
LSP.Commands.Register
167-
(LSP.Ada_Handlers.Refactor_Add_Parameter.Command'Tag);
167+
(LSP.Ada_Handlers.Refactor.Add_Parameter.Command'Tag);
168168
LSP.Commands.Register
169-
(LSP.Ada_Handlers.Refactor_Remove_Parameter.Command'Tag);
169+
(LSP.Ada_Handlers.Refactor.Remove_Parameter.Command'Tag);
170170
LSP.Commands.Register
171-
(LSP.Ada_Handlers.Refactor_Move_Parameter.Command'Tag);
171+
(LSP.Ada_Handlers.Refactor.Move_Parameter.Command'Tag);
172172
LSP.Commands.Register
173-
(LSP.Ada_Handlers.Refactor_Change_Parameter_Mode.Command'Tag);
173+
(LSP.Ada_Handlers.Refactor.Change_Parameter_Mode.Command'Tag);
174174
LSP.Commands.Register
175-
(LSP.Ada_Handlers.Refactor_Change_Parameters_Type.Command'Tag);
175+
(LSP.Ada_Handlers.Refactor.Change_Parameters_Type.Command'Tag);
176176
LSP.Commands.Register
177-
(LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value.
177+
(LSP.Ada_Handlers.Refactor.Change_Parameters_Default_Value.
178178
Command'Tag);
179179
end Register_Commands;
180180

source/ada/lsp-ada_handlers-refactor_add_parameter.adb renamed to source/ada/lsp-ada_handlers-refactor-add_parameter.adb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ with LSP.Lal_Utils;
3030

3131
with VSS.Strings.Conversions;
3232

33-
package body LSP.Ada_Handlers.Refactor_Add_Parameter is
33+
package body LSP.Ada_Handlers.Refactor.Add_Parameter is
3434

3535
------------------------
3636
-- Append_Code_Action --
@@ -246,4 +246,4 @@ package body LSP.Ada_Handlers.Refactor_Add_Parameter is
246246
JS.End_Object;
247247
end Write_Command;
248248

249-
end LSP.Ada_Handlers.Refactor_Add_Parameter;
249+
end LSP.Ada_Handlers.Refactor.Add_Parameter;

source/ada/lsp-ada_handlers-refactor_add_parameter.ads renamed to source/ada/lsp-ada_handlers-refactor-add_parameter.ads

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ with LSP.JSON_Streams;
2727

2828
with VSS.Strings;
2929

30-
package LSP.Ada_Handlers.Refactor_Add_Parameter is
30+
package LSP.Ada_Handlers.Refactor.Add_Parameter is
3131

3232
type Command is new LSP.Commands.Command with private;
3333

@@ -79,4 +79,4 @@ private
7979
for Command'Write use Write_Command;
8080
for Command'External_Tag use "als-refactor-add-parameters";
8181

82-
end LSP.Ada_Handlers.Refactor_Add_Parameter;
82+
end LSP.Ada_Handlers.Refactor.Add_Parameter;

source/ada/lsp-ada_handlers-refactor_change_parameter_mode.adb renamed to source/ada/lsp-ada_handlers-refactor-change_parameter_mode.adb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ with LSP.Lal_Utils;
2929

3030
with VSS.Strings.Conversions;
3131

32-
package body LSP.Ada_Handlers.Refactor_Change_Parameter_Mode is
32+
package body LSP.Ada_Handlers.Refactor.Change_Parameter_Mode is
3333

3434
------------------------
3535
-- Append_Code_Action --
@@ -400,4 +400,4 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameter_Mode is
400400
LSP.Types.Write_String (S, C.New_Mode);
401401
JS.End_Object;
402402
end Write_Command;
403-
end LSP.Ada_Handlers.Refactor_Change_Parameter_Mode;
403+
end LSP.Ada_Handlers.Refactor.Change_Parameter_Mode;

source/ada/lsp-ada_handlers-refactor_change_parameter_mode.ads renamed to source/ada/lsp-ada_handlers-refactor-change_parameter_mode.ads

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ with Libadalang.Common;
3131

3232
with LAL_Refactor.Subprogram_Signature; use LAL_Refactor.Subprogram_Signature;
3333

34-
package LSP.Ada_Handlers.Refactor_Change_Parameter_Mode is
34+
package LSP.Ada_Handlers.Refactor.Change_Parameter_Mode is
3535

3636
type Command is new LSP.Commands.Command with private;
3737

@@ -87,4 +87,4 @@ private
8787
for Command'Write use Write_Command;
8888
for Command'External_Tag use "als-refactor-change-parameter-mode";
8989

90-
end LSP.Ada_Handlers.Refactor_Change_Parameter_Mode;
90+
end LSP.Ada_Handlers.Refactor.Change_Parameter_Mode;

source/ada/lsp-ada_handlers-refactor_change_parameters_default_value.adb renamed to source/ada/lsp-ada_handlers-refactor-change_parameters_default_value.adb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ with LSP.Lal_Utils;
3535

3636
with VSS.Strings.Conversions;
3737

38-
package body LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value is
38+
package body LSP.Ada_Handlers.Refactor.Change_Parameters_Default_Value is
3939

4040
------------------------
4141
-- Append_Code_Action --
@@ -257,4 +257,4 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value is
257257
JS.End_Object;
258258
end Write_Command;
259259

260-
end LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value;
260+
end LSP.Ada_Handlers.Refactor.Change_Parameters_Default_Value;

source/ada/lsp-ada_handlers-refactor_change_parameters_default_value.ads renamed to source/ada/lsp-ada_handlers-refactor-change_parameters_default_value.ads

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ with LSP.JSON_Streams;
2727

2828
private with VSS.Strings;
2929

30-
package LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value is
30+
package LSP.Ada_Handlers.Refactor.Change_Parameters_Default_Value is
3131

3232
type Command is new LSP.Commands.Command with private;
3333

@@ -77,4 +77,4 @@ private
7777
for Command'Write use Write_Command;
7878
for Command'External_Tag use "als-refactor-change_parameters_default_value";
7979

80-
end LSP.Ada_Handlers.Refactor_Change_Parameters_Default_Value;
80+
end LSP.Ada_Handlers.Refactor.Change_Parameters_Default_Value;

source/ada/lsp-ada_handlers-refactor_change_parameters_type.adb renamed to source/ada/lsp-ada_handlers-refactor-change_parameters_type.adb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ with LSP.Lal_Utils;
3636
with VSS.String_Vectors;
3737
with VSS.Strings.Conversions;
3838

39-
package body LSP.Ada_Handlers.Refactor_Change_Parameters_Type is
39+
package body LSP.Ada_Handlers.Refactor.Change_Parameters_Type is
4040

4141
function To_Virtual_String_Vector
4242
(Grammar_Rules : Laltools.Common.Grammar_Rule_Vector)
@@ -281,4 +281,4 @@ package body LSP.Ada_Handlers.Refactor_Change_Parameters_Type is
281281
JS.End_Object;
282282
end Write_Command;
283283

284-
end LSP.Ada_Handlers.Refactor_Change_Parameters_Type;
284+
end LSP.Ada_Handlers.Refactor.Change_Parameters_Type;

source/ada/lsp-ada_handlers-refactor_change_parameters_type.ads renamed to source/ada/lsp-ada_handlers-refactor-change_parameters_type.ads

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ with LSP.JSON_Streams;
2929

3030
private with VSS.Strings;
3131

32-
package LSP.Ada_Handlers.Refactor_Change_Parameters_Type is
32+
package LSP.Ada_Handlers.Refactor.Change_Parameters_Type is
3333

3434
type Command is new LSP.Commands.Command with private;
3535

@@ -82,4 +82,4 @@ private
8282
for Command'Write use Write_Command;
8383
for Command'External_Tag use "als-refactor-change_parameters_type";
8484

85-
end LSP.Ada_Handlers.Refactor_Change_Parameters_Type;
85+
end LSP.Ada_Handlers.Refactor.Change_Parameters_Type;

source/ada/lsp-ada_handlers-refactor_extract_subprogram.adb renamed to source/ada/lsp-ada_handlers-refactor-extract_subprogram.adb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ with LSP.Lal_Utils;
3232

3333
with VSS.Strings.Conversions;
3434

35-
package body LSP.Ada_Handlers.Refactor_Extract_Subprogram is
35+
package body LSP.Ada_Handlers.Refactor.Extract_Subprogram is
3636

3737
------------------------
3838
-- Append_Code_Action --
@@ -264,4 +264,4 @@ package body LSP.Ada_Handlers.Refactor_Extract_Subprogram is
264264
JS.End_Object;
265265
end Write_Command;
266266

267-
end LSP.Ada_Handlers.Refactor_Extract_Subprogram;
267+
end LSP.Ada_Handlers.Refactor.Extract_Subprogram;

0 commit comments

Comments
 (0)