Merge branch 'topic/inline_val' into 'master'

Implementation of the `inlineValues` request

See merge request eng/ide/ada_language_server!2017

Author: reznikmm

CHANGELOG.md

@@ -6,6 +6,7 @@ section below it for the last release. -->
 ## \<next>
 
 * Added `onEnterRules` for Ada/GPR files to split long comments by adding automatically a comment tag to the next line
+* Added support for new LSP request `textDocument/inlineValue`
 
 ## 26.0.202504171
 

liblsp_3_17/source/lsp-constants.ads

@@ -35,6 +35,14 @@ package LSP.Constants is
      return LSP.Structures.implementationProvider_OfServerCapabilities_Optional
        is (Is_Set => True, Value => True);
 
+   function True
+     return LSP.Structures.inlineValueProvider_OfServerCapabilities
+       is (Kind => LSP.Structures.Variant_1, Variant_1 => True);
+
+   function True
+     return LSP.Structures.inlineValueProvider_OfServerCapabilities_Optional
+       is (Is_Set => True, Value => True);
+
    function True
      return LSP.Structures.declarationProvider_OfServerCapabilities
        is (Kind => LSP.Structures.Variant_1, Variant_1 => True);

source/ada/lsp-ada_client_capabilities.adb

@@ -418,6 +418,7 @@ package body LSP.Ada_Client_Capabilities is
          Result.foldingRangeProvider            := LSP.Constants.True;
          Result.hoverProvider                   := LSP.Constants.True;
          Result.implementationProvider          := LSP.Constants.True;
+         Result.inlineValueProvider             := LSP.Constants.True;
          Result.referencesProvider              := LSP.Constants.True;
          Result.selectionRangeProvider          := LSP.Constants.True;
          Result.typeDefinitionProvider          := LSP.Constants.True;

source/ada/lsp-ada_driver.adb

@@ -79,6 +79,7 @@ with LSP.Ada_Handlers.Refactor.Suppress_Seperate;
 with LSP.Ada_Handlers.Show_Dependencies_Commands;
 with LSP.Ada_Handlers.Source_Dirs_Commands;
 with LSP.Ada_Handlers.Suspend_Executions;
+with LSP.Ada_Inline_Value;
 with LSP.Ada_Selection_Range;
 with LSP.Ada_Tokens_Full;
 with LSP.Ada_Tokens_Range;
@@ -111,6 +112,7 @@ with LSP.Server_Requests.ExecuteCommand;
 with LSP.Server_Requests.FoldingRange;
 with LSP.Server_Requests.Hover;
 with LSP.Server_Requests.Initialize;
+with LSP.Server_Requests.InlineValue;
 with LSP.Server_Requests.PrepareTypeHierarchy;
 with LSP.Server_Requests.References;
 with LSP.Server_Requests.SelectionRange;
@@ -308,6 +310,10 @@ procedure LSP.Ada_Driver is
      LSP.Ada_Selection_Range.Ada_Selection_Range_Handler
        (Ada_Handler'Unchecked_Access);
 
+   Ada_Inline_Value_Handler : aliased
+     LSP.Ada_Inline_Value.Ada_Inline_Value_Handler
+       (Ada_Handler'Unchecked_Access);
+
    Ada_Tokens_Full_Handler : aliased
      LSP.Ada_Tokens_Full.Ada_Tokens_Full_Handler
        (Ada_Handler'Unchecked_Access);
@@ -689,6 +695,10 @@ begin
            (LSP.Server_Requests.SelectionRange.Request'Tag,
             Ada_Selection_Range_Handler'Unchecked_Access);
 
+         Server.Register_Handler
+           (LSP.Server_Requests.InlineValue.Request'Tag,
+            Ada_Inline_Value_Handler'Unchecked_Access);
+
          Server.Register_Handler
            (LSP.Server_Requests.Tokens_Full.Request'Tag,
             Ada_Tokens_Full_Handler'Unchecked_Access);

source/ada/lsp-ada_handlers-locations.adb

@@ -31,6 +31,11 @@ package body LSP.Ada_Handlers.Locations is
       Sloc : Langkit_Support.Slocs.Source_Location_Range)
         return LSP.Structures.A_Range;
 
+   function From_LSP_Range
+     (Unit : Libadalang.Analysis.Analysis_Unit;
+      Sloc : LSP.Structures.A_Range)
+        return Langkit_Support.Slocs.Source_Location_Range;
+
    ---------------------
    -- Append_Location --
    ---------------------
@@ -80,6 +85,99 @@ package body LSP.Ada_Handlers.Locations is
       end if;
    end Append_Location;
 
+   --------------------
+   -- From_LSP_Range --
+   --------------------
+
+   function From_LSP_Range
+     (Self : in out Message_Handler'Class;
+      Unit : Libadalang.Analysis.Analysis_Unit;
+      Sloc : LSP.Structures.A_Range)
+      return Langkit_Support.Slocs.Source_Location_Range
+   is
+      use type LSP.Ada_Documents.Document_Access;
+
+      URI : constant LSP.Structures.DocumentUri :=
+        (VSS.Strings.Conversions.To_Virtual_String
+           (URIs.Conversions.From_File (Unit.Get_Filename))
+         with null record);
+
+      Doc : constant LSP.Ada_Documents.Document_Access :=
+        Self.Get_Open_Document (URI);
+
+   begin
+      if Doc /= null then
+         return Doc.To_Source_Location_Range (Sloc);
+
+      else
+         return From_LSP_Range (Unit, Sloc);
+      end if;
+   end From_LSP_Range;
+
+   --------------------
+   -- From_LSP_Range --
+   --------------------
+
+   function From_LSP_Range
+     (Unit : Libadalang.Analysis.Analysis_Unit;
+      Sloc : LSP.Structures.A_Range)
+        return Langkit_Support.Slocs.Source_Location_Range
+   is
+      use type Langkit_Support.Slocs.Column_Number;
+
+      Result : Langkit_Support.Slocs.Source_Location_Range :=
+        (Start_Line => Positive'Pos (Sloc.start.line + 1),
+         End_Line   => Positive'Pos (Sloc.an_end.line + 1),
+         others => 0);
+   begin
+      declare
+         Line : constant VSS.Strings.Virtual_String :=
+           VSS.Strings.To_Virtual_String
+             (Unit.Get_Line (Sloc.start.line + 1));
+
+         Cursor : VSS.Strings.Character_Iterators.Character_Iterator :=
+           Line.Before_First_Character;
+
+      begin
+         while Cursor.Forward and then
+           Natural (Cursor.First_UTF16_Offset) <= Sloc.start.character
+         loop
+            Result.Start_Column := @ + 1;
+         end loop;
+
+         if Sloc.start.line = Sloc.an_end.line then
+
+            Result.End_Column := Result.Start_Column;
+
+            while Cursor.Forward and then
+              Natural (Cursor.First_UTF16_Offset) <= Sloc.an_end.character
+            loop
+               Result.End_Column := @ + 1;
+            end loop;
+
+            return Result;
+         end if;
+      end;
+
+      declare
+         Line : constant VSS.Strings.Virtual_String :=
+           VSS.Strings.To_Virtual_String
+             (Unit.Get_Line (Sloc.an_end.line + 1));
+
+         Cursor : VSS.Strings.Character_Iterators.Character_Iterator :=
+           Line.Before_First_Character;
+
+      begin
+         while Cursor.Forward and then
+           Natural (Cursor.First_UTF16_Offset) <= Sloc.an_end.character
+         loop
+            Result.End_Column := @ + 1;
+         end loop;
+
+         return Result;
+      end;
+   end From_LSP_Range;
+
    -----------------
    -- Get_Node_At --
    -----------------

source/ada/lsp-ada_handlers-locations.ads

@@ -56,6 +56,12 @@ package LSP.Ada_Handlers.Locations is
       Node : Libadalang.Analysis.Ada_Node'Class)
       return LSP.Structures.A_Range;
 
+   function From_LSP_Range
+     (Self : in out Message_Handler'Class;
+      Unit : Libadalang.Analysis.Analysis_Unit;
+      Sloc : LSP.Structures.A_Range)
+      return Langkit_Support.Slocs.Source_Location_Range;
+
    function Get_Node_At
      (Self     : in out Message_Handler'Class;
       Context  : LSP.Ada_Contexts.Context;

source/ada/lsp-ada_handlers.adb

@@ -33,7 +33,6 @@ with VSS.Strings.Templates;
 with Laltools.Common;
 with Laltools.Partial_GNATPP;
 
-with Langkit_Support.Slocs;
 with Langkit_Support.Text;
 
 with LAL_Refactor.Extract_Subprogram;
@@ -163,6 +162,13 @@ package body LSP.Ada_Handlers is
       return LSP.Structures.A_Range is
         (LSP.Ada_Handlers.Locations.To_LSP_Range (Self, Unit, Token));
 
+   overriding function From_LSP_Range
+     (Self : in out Message_Handler;
+      Unit : Libadalang.Analysis.Analysis_Unit;
+      Sloc : LSP.Structures.A_Range)
+      return Langkit_Support.Slocs.Source_Location_Range is
+        (LSP.Ada_Handlers.Locations.From_LSP_Range (Self, Unit, Sloc));
+
    overriding function Get_Node_At
      (Self     : in out Message_Handler;
       Context  : LSP.Ada_Contexts.Context;

source/ada/lsp-ada_handlers.ads

@@ -28,6 +28,7 @@ with GNATCOLL.VFS;
 with GPR2.Build.Source.Sets;
 with GPR2.Project.Tree;
 
+with Langkit_Support.Slocs;
 with Libadalang.Analysis;
 with Libadalang.Common;
 
@@ -557,6 +558,12 @@ private
       Node   : Libadalang.Analysis.Ada_Node'Class)
       return LSP.Structures.A_Range;
 
+   overriding function From_LSP_Range
+     (Self : in out Message_Handler;
+      Unit : Libadalang.Analysis.Analysis_Unit;
+      Sloc : LSP.Structures.A_Range)
+      return Langkit_Support.Slocs.Source_Location_Range;
+
    overriding procedure Append_Location
      (Self   : in out Message_Handler;
       Result : in out LSP.Structures.Location_Vector;