Merge branch 'lal_refactor_38' into 'master'

Corresponding changes according to lal-refactor

See merge request eng/ide/ada_language_server!2117

Author: ogorodnik

doc/refactoring_tools.md

@@ -251,8 +251,8 @@ Demo source is `sort_dependencies/` in [Code Samples](https://github.com/AdaCore
 
 ## Swap If/else statments
 
-**Command name:** `als-refactor-swap_if_not`
+**Command name:** `als-refactor-swap_if_else`
 
-* Swap If and else code branches and correct condition by adding/deleting `not`.
+* Swap If and else code branches and invert condition.
 
-See `src/lal_refactor-swap_if_not` in [LAL Refactor repository](https://github.com/AdaCore/lal-refactor).
+See `src/lal_refactor-swap_if_else` in [LAL Refactor repository](https://github.com/AdaCore/lal-refactor).

source/ada/lsp-ada_driver.adb

@@ -80,7 +80,7 @@ with LSP.Ada_Handlers.Refactor.Replace_Type;
 with LSP.Ada_Handlers.Refactor.Sort_Case;
 with LSP.Ada_Handlers.Refactor.Sort_Dependencies;
 with LSP.Ada_Handlers.Refactor.Suppress_Seperate;
-with LSP.Ada_Handlers.Refactor.Swap_If_Not;
+with LSP.Ada_Handlers.Refactor.Swap_If_Else;
 with LSP.Ada_Handlers.Show_Dependencies_Commands;
 with LSP.Ada_Handlers.GPR_Dependencies_Commands;
 with LSP.Ada_Handlers.Source_Dirs_Commands;
@@ -242,7 +242,7 @@ procedure LSP.Ada_Driver is
       LSP.Ada_Commands.Register
         (LSP.Ada_Handlers.Refactor.Sort_Dependencies.Command'Tag);
       LSP.Ada_Commands.Register
-        (LSP.Ada_Handlers.Refactor.Swap_If_Not.Command'Tag);
+        (LSP.Ada_Handlers.Refactor.Swap_If_Else.Command'Tag);
 
       --  Refactoring - Change Subprogram Signature Commands
       LSP.Ada_Commands.Register

source/ada/lsp-ada_handlers-refactor-swap_if_not.adb renamed to source/ada/lsp-ada_handlers-refactor-swap_if_else.adb

@@ -20,15 +20,15 @@ with Langkit_Support.Slocs; use Langkit_Support.Slocs;
 with Libadalang.Analysis;   use Libadalang.Analysis;
 
 with LAL_Refactor; use LAL_Refactor;
-with LAL_Refactor.Swap_If_Not;
-use LAL_Refactor.Swap_If_Not;
+with LAL_Refactor.Swap_If_Else;
+use LAL_Refactor.Swap_If_Else;
 
 with VSS.JSON.Streams;
 
 with LSP.Enumerations;
 with LSP.Structures.LSPAny_Vectors; use LSP.Structures.LSPAny_Vectors;
 
-package body LSP.Ada_Handlers.Refactor.Swap_If_Not is
+package body LSP.Ada_Handlers.Refactor.Swap_If_Else is
 
    pragma Warnings (Off);
 
@@ -194,4 +194,4 @@ package body LSP.Ada_Handlers.Refactor.Swap_If_Not is
       return Result;
    end Write_Command;
 
-end LSP.Ada_Handlers.Refactor.Swap_If_Not;
+end LSP.Ada_Handlers.Refactor.Swap_If_Else;

source/ada/lsp-ada_handlers-refactor-swap_if_not.ads renamed to source/ada/lsp-ada_handlers-refactor-swap_if_else.ads

@@ -22,12 +22,12 @@ with VSS.Strings;
 with LSP.Ada_Contexts;
 with LSP.Server_Jobs;
 
-package LSP.Ada_Handlers.Refactor.Swap_If_Not is
+package LSP.Ada_Handlers.Refactor.Swap_If_Else is
 
    type Command is new LSP.Ada_Handlers.Refactor.Command with private;
 
    overriding function Name (Self : Command) return String
-   is ("Swap If Not");
+   is ("Swap If Else");
 
    procedure Append_Code_Action
      (Self            : in out Command;
@@ -69,6 +69,6 @@ private
    function Write_Command
      (Self : Command) return LSP.Structures.LSPAny_Vector;
 
-   for Command'External_Tag use "als-refactor-swap_if_not";
+   for Command'External_Tag use "als-refactor-swap_if_else";
 
-end LSP.Ada_Handlers.Refactor.Swap_If_Not;
+end LSP.Ada_Handlers.Refactor.Swap_If_Else;

source/ada/lsp-ada_handlers.adb

@@ -49,7 +49,7 @@ with LAL_Refactor.Subprogram_Signature.Change_Parameters_Default_Value;
 with LAL_Refactor.Subprogram_Signature.Change_Parameters_Type;
 with LAL_Refactor.Subprogram_Signature.Remove_Parameter;
 with LAL_Refactor.Suppress_Separate;
-with LAL_Refactor.Swap_If_Not;
+with LAL_Refactor.Swap_If_Else;
 
 with LSP.Ada_Completions.Aspects;
 with LSP.Ada_Completions.Attributes;
@@ -87,7 +87,7 @@ with LSP.Ada_Handlers.Refactor.Replace_Type;
 with LSP.Ada_Handlers.Refactor.Sort_Case;
 with LSP.Ada_Handlers.Refactor.Sort_Dependencies;
 with LSP.Ada_Handlers.Refactor.Suppress_Seperate;
-with LSP.Ada_Handlers.Refactor.Swap_If_Not;
+with LSP.Ada_Handlers.Refactor.Swap_If_Else;
 with LSP.Ada_Handlers.Renaming;
 with LSP.Ada_Handlers.Symbols;
 with LSP.Ada_Commands;
@@ -1385,15 +1385,15 @@ package body LSP.Ada_Handlers is
          -----------------------------
 
          procedure Swap_If_Not_Code_Action is
-            use LSP.Ada_Handlers.Refactor.Swap_If_Not;
+            use LSP.Ada_Handlers.Refactor.Swap_If_Else;
             use Langkit_Support.Slocs;
-            use LAL_Refactor.Swap_If_Not;
+            use LAL_Refactor.Swap_If_Else;
             use type LSP.Structures.Position;
 
             Single_Location : constant Boolean :=
               Value.a_range.start = Value.a_range.an_end;
 
-            Location        : Source_Location :=
+            Location        : constant Source_Location :=
               (Langkit_Support.Slocs.Line_Number
                  (Value.a_range.start.line) + 1,
                Column_Number (Value.a_range.start.character) + 1);