Merge remote branch 'origin/master' into edge

(no-precommit-check no-tn-check)

Author: mergerepo

source/ada/lsp-ada_completions-generic_assoc.adb

@@ -37,7 +37,7 @@ package body LSP.Ada_Completions.Generic_Assoc is
       Names        : in out Ada_Completions.Completion_Maps.Map;
       Unsorted_Res : in out LSP.Messages.CompletionItem_Vector)
    is
-      pragma Unreferenced (Filter, Sloc, Names);
+      pragma Unreferenced (Filter, Names);
       use Libadalang.Analysis;
       use Libadalang.Common;
       use LSP.Ada_Completions.Generic_Assoc_Utils;
@@ -49,6 +49,12 @@ package body LSP.Ada_Completions.Generic_Assoc is
 
       Designators       : Laltools.Common.Node_Vectors.Vector;
 
+      Prefix      : VSS.Strings.Virtual_String;
+      --  The whole string before the snippet (including whitespaces)
+
+      Prefix_Span : LSP.Messages.Span;
+      --  The span covering Prefix.
+
       function Match_Designators
         (Child  : Laltools.Common.Node_Vectors.Vector;
          Parent : Laltools.Common.Node_Vectors.Vector)
@@ -120,8 +126,10 @@ package body LSP.Ada_Completions.Generic_Assoc is
          Snippet_Index      : Integer :=
            Integer (Spec_Designators.Length);
          Use_Named_Notation : constant Boolean :=
-           Limit > 0
-           and then (Snippet_Index = 1 or else Snippet_Index >= Limit);
+           (not Designators.Is_Empty)
+           or else (Limit > 0
+                    and then (Snippet_Index = 1
+                              or else Snippet_Index >= Limit));
       begin
          if Match_Designators (Designators, Spec_Designators) then
 
@@ -229,8 +237,7 @@ package body LSP.Ada_Completions.Generic_Assoc is
               and then Token_Kind in Ada_Par_Open | Ada_Comma
             then
                declare
-                  Last    :
-                  VSS.Strings.Character_Iterators.Character_Iterator
+                  Last    : VSS.Strings.Character_Iterators.Character_Iterator
                     := Params_Snippet.At_Last_Character;
                   Success : Boolean with Unreferenced;
 
@@ -249,7 +256,7 @@ package body LSP.Ada_Completions.Generic_Assoc is
                Params_Snippet.Prepend (Snippet_Prefix);
 
                declare
-                  Item : LSP.Messages.CompletionItem;
+                  Item   : LSP.Messages.CompletionItem;
                begin
                   Item.label := Title;
                   Item.insertTextFormat :=
@@ -264,6 +271,13 @@ package body LSP.Ada_Completions.Generic_Assoc is
                      Item                    => Item,
                      Compute_Doc_And_Details =>
                        Self.Compute_Doc_And_Details);
+                  Pretty_Print_Snippet
+                    (Context => Self.Context.all,
+                     Prefix  =>
+                       VSS.Strings.Conversions.To_UTF_8_String (Prefix),
+                     Span    => Prefix_Span,
+                     Rule    => Libadalang.Common.Param_Assoc_Rule,
+                     Result  => Item);
                   Unsorted_Res.Append (Item);
                end;
             end if;
@@ -275,6 +289,14 @@ package body LSP.Ada_Completions.Generic_Assoc is
          return;
       end if;
 
+      Prefix_Span :=
+        Self.Document.To_LSP_Range
+          (Langkit_Support.Slocs.Make_Range
+             (Langkit_Support.Slocs.Start_Sloc (Node.Parent.Sloc_Range),
+              Sloc));
+      Prefix := Self.Document.Get_Text_At
+        (Prefix_Span.first, Prefix_Span.last);
+
       Designators := Get_Designators (Elem_Node);
 
       if Token_Kind = Ada_Whitespace then

source/ada/lsp-ada_completions-names.adb

@@ -67,6 +67,7 @@ package body LSP.Ada_Completions.Names is
                   (Token, Exclude_Trivia => True)))
           = Libadalang.Common.Ada_Dot;
    begin
+
       --  Get the outermost dotted name of which node is a prefix, so that when
       --  completing in a situation such as the following:
       --

source/ada/lsp-ada_completions-parameters.ads

@@ -17,11 +17,13 @@
 --  A completion provider for parameters inside a call
 
 with LSP.Ada_Handlers;
+with LSP.Ada_Documents;
 
 package LSP.Ada_Completions.Parameters is
 
    type Parameter_Completion_Provider
      (Context                  : not null LSP.Ada_Handlers.Context_Access;
+      Document                 : LSP.Ada_Documents.Document_Access;
       Named_Notation_Threshold : Natural;
       Compute_Doc_And_Details  : Boolean)
    is new Completion_Provider with null record;