Merge remote branch 'origin/master' into edge

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

Author: mergerepo

source/ada/lsp-ada_completions-parameters.adb

@@ -46,11 +46,14 @@ package body LSP.Ada_Completions.Parameters is
       use Libadalang.Analysis;
       use Libadalang.Common;
 
-      Call_Expr_Node : constant Libadalang.Analysis.Call_Expr :=
+      Call_Expr_Node    : constant Libadalang.Analysis.Call_Expr :=
         LSP.Lal_Utils.Get_Call_Expr (Node);
-      Token_Kind     : Libadalang.Common.Token_Kind :=
+      Token_Kind        : Libadalang.Common.Token_Kind :=
         Kind (Data (Token));
-      Designators : Laltools.Common.Node_Vectors.Vector;
+      Whitespace_Prefix : LSP_String := Empty_LSP_String;
+      --  Empty if we already have a whitespace before a ","
+
+      Designators     : Laltools.Common.Node_Vectors.Vector;
 
       function Is_Present (Id_Text : Text_Type) return Boolean;
       --  Return True if Id_Name match one of the designators
@@ -78,6 +81,8 @@ package body LSP.Ada_Completions.Parameters is
 
       if Token_Kind = Ada_Whitespace then
          Token_Kind := Kind (Data (Previous (Token, Exclude_Trivia => True)));
+      elsif Token_Kind = Ada_Comma then
+         Whitespace_Prefix := Whitespace_Prefix & " ";
       end if;
 
       declare
@@ -119,7 +124,9 @@ package body LSP.Ada_Completions.Parameters is
                                     Item.label := To_Virtual_String (Name);
                                     Item.insertTextFormat :=
                                       (True, LSP.Messages.PlainText);
-                                    Item.insertText := (True, Name & " => ");
+                                    Item.insertText :=
+                                      (True,
+                                       Whitespace_Prefix & Name & " => ");
                                     Item.kind := (True, LSP.Messages.Text);
                                     Result.items.Append (Item);
                                  end if;
@@ -139,7 +146,9 @@ package body LSP.Ada_Completions.Parameters is
                      end loop;
 
                      --  If the string is empty => nothing to do
-                     if Params_Snippet /= Empty_LSP_String then
+                     if Params_Snippet /= Empty_LSP_String
+                       and then Token_Kind in Ada_Par_Open | Ada_Comma
+                     then
                         --  Remove the last 2 characters which are ", " and
                         --  replace it by ")" and the final tab stop
                         Params_Snippet := Unbounded_Slice
@@ -156,7 +165,8 @@ package body LSP.Ada_Completions.Parameters is
                           (Snippet_Name);
                         Item.insertTextFormat :=
                           (True, LSP.Messages.Snippet);
-                        Item.insertText := (True, Params_Snippet);
+                        Item.insertText :=
+                          (True, Whitespace_Prefix & Params_Snippet);
                         Item.kind := (True, LSP.Messages.Snippet);
                         Result.items.Append (Item);
                      end if;

source/ada/lsp-ada_completions-parameters.ads

@@ -32,6 +32,7 @@ package LSP.Ada_Completions.Parameters is
       Filter : in out LSP.Ada_Completions.Filters.Filter;
       Names  : out Ada_Completions.Completion_Maps.Map;
       Result : out LSP.Messages.CompletionList);
-   --  Get completion for keywords, filtering them with the prefix.
+   --  Using the context, check if we are inside a function call and get its
+   --  unset parameters while filtering them with the prefix.
 
 end LSP.Ada_Completions.Parameters;

source/ada/lsp-ada_documents.adb

@@ -2227,6 +2227,11 @@ package body LSP.Ada_Documents is
 
       Filter : LSP.Ada_Completions.Filters.Filter;
    begin
+      if Node.Kind in Libadalang.Common.Ada_String_Literal_Range then
+         --  Do nothing when inside a string
+         return;
+      end if;
+
       Context.Trace.Trace
         ("Getting completions, Pos = ("
          & Sloc.Line'Image & ", " & Sloc.Column'Image & ") Node = "

source/ada/lsp-ada_handlers.adb

@@ -721,7 +721,8 @@ package body LSP.Ada_Handlers is
       Response.result.capabilities.completionProvider :=
         (True,
          (resolveProvider     => LSP.Types.True,
-          triggerCharacters   => (True, Empty_Vector & (+".") & (+"(")),
+          triggerCharacters   => (True,
+                                  Empty_Vector & (+".") & (+",") & (+"(")),
           allCommitCharacters => (Is_Set => False),
           workDoneProgress    => LSP.Types.None));
       Response.result.capabilities.hoverProvider :=

source/protocol/lsp-generic_notifications.adb

@@ -17,7 +17,6 @@
 
 with VSS.Strings.Conversions;
 
-with LSP.Types;
 with LSP.Messages.Common_Writers;
 
 package body LSP.Generic_Notifications is
@@ -81,6 +80,18 @@ package body LSP.Generic_Notifications is
       raise Program_Error;
    end Visit;
 
+   -----------
+   -- Visit --
+   -----------
+
+   procedure Visit
+     (Self    : Notification;
+      Token   : LSP.Types.LSP_Number_Or_String;
+      Handler : access Visitor) is
+   begin
+      raise Program_Error;
+   end Visit;
+
    -----------
    -- Write --
    -----------

source/protocol/lsp-generic_notifications.ads

@@ -22,6 +22,7 @@ with Ada.Streams;
 
 with LSP.JSON_Streams;
 with LSP.Messages;
+with LSP.Types;
 
 generic
    type Base_Message is abstract new LSP.Messages.NotificationMessage
@@ -45,6 +46,11 @@ package LSP.Generic_Notifications is
      (Self    : Notification;
       Handler : access Visitor);
 
+   procedure Visit
+     (Self    : Notification;
+      Token   : LSP.Types.LSP_Number_Or_String;
+      Handler : access Visitor);
+
    procedure Read
      (S : access Ada.Streams.Root_Stream_Type'Class;
       V : out Notification);

testsuite/ada_lsp/C825-005.xrefs.extending/test.json

@@ -41,6 +41,7 @@
                      "completionProvider": {
                         "triggerCharacters": [
                             ".",
+                            ",",
                             "("
                         ],
                         "resolveProvider": true

testsuite/ada_lsp/D301-004.xrefs.generics/test.json

@@ -41,6 +41,7 @@
                      "completionProvider": {
                         "triggerCharacters": [
                             ".",
+                            ",",
                             "("
                         ],
                         "resolveProvider": true

testsuite/ada_lsp/D803-003.xrefs.generics_go_to_body/test.json

@@ -41,6 +41,7 @@
                      "completionProvider": {
                         "triggerCharacters": [
                             ".",
+                            ",",
                             "("
                         ],
                         "resolveProvider": true

testsuite/ada_lsp/F131-024.xrefs.separate_body/test.json

@@ -48,6 +48,7 @@
                      "completionProvider": {
                         "triggerCharacters": [
                             ".",
+                            ",",
                             "("
                         ],
                         "resolveProvider": true