Merge remote branch 'origin/master' into edge

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

Author: mergerepo

doc/settings.md

@@ -103,6 +103,16 @@ The value is a boolean.
     'renameInComments': false
 ```
 
+## useCompletionSnippets
+Whether we should use snippets in completion results. Snippets can be
+returned in case of subprogram calls for instance, with placeholders
+for each parameter needed by the subprogram.
+The value is a boolean.
+
+```javascript
+    'useCompletionSnippets': true
+```
+
 ## displayMethodAncestryOnNavigation
 This setting controls the policy for displaying overriding and overridden
 subprograms on navigation requests such as `textDocument/definition`,

integration/vscode/ada/package.json

@@ -333,6 +333,12 @@
                         "default": true,
                         "description": "The emission of diagnostics."
                     },
+                    "ada.useCompletionSnippets": {
+                        "scope": "resource",
+                        "type": "boolean",
+                        "default": false,
+                        "description": "Enable snippets in completion results (e.g: subprogram calls)."
+                    },
                     "ada.renameInComments": {
                         "scope": "resource",
                         "type": "boolean",
@@ -455,4 +461,4 @@
         "vscode-languageclient": "7.0.0",
         "ws": "8.5.0"
     }
-}
+}

source/ada/lsp-ada_handlers.adb

@@ -4059,6 +4059,8 @@ package body LSP.Ada_Handlers is
         "followSymlinks";
       documentationStyle                : constant String :=
         "documentationStyle";
+      useCompletionSnippets             : constant String :=
+        "useCompletionSnippets";
 
       Ada       : constant LSP.Types.LSP_Any := Value.settings.Get ("ada");
       File      : VSS.Strings.Virtual_String;
@@ -4137,6 +4139,14 @@ package body LSP.Ada_Handlers is
             Self.Named_Notation_Threshold := Ada.Get (namedNotationThreshold);
          end if;
 
+         --  Check the 'useCompletionSnippets' flag to see if we should use
+         --  snippets in completion (if the client supports it).
+         if not Self.Completion_Snippets_Enabled then
+            Self.Use_Completion_Snippets := False;
+         elsif Ada.Has_Field (useCompletionSnippets) then
+            Self.Use_Completion_Snippets := Ada.Get (useCompletionSnippets);
+         end if;
+
          --  Retrieve the policy for displaying type hierarchy on navigation
          --  requests.
          if Ada.Has_Field (displayMethodAncestryOnNavigation) then
@@ -5259,7 +5269,7 @@ package body LSP.Ada_Handlers is
         LSP.Ada_Completions.Attributes.Attributes_Completion_Provider;
 
       P6 : aliased LSP.Ada_Completions.Names.Name_Completion_Provider
-        (Self.Completion_Snippets_Enabled);
+        (Self.Use_Completion_Snippets);
       P7 : aliased LSP.Ada_Handlers.Invisibles.Invisible_Completion_Provider
         (Self, Context);
       P8 : aliased

source/ada/lsp-ada_handlers.ads

@@ -268,6 +268,10 @@ private
       Completion_Snippets_Enabled : Boolean := False;
       --  True if the client supports completion snippets
 
+      Use_Completion_Snippets : Boolean := True;
+      --  True if we should use snippets for completion (e.g:
+      --  subprogram calls).
+
       Completion_Resolve_Properties : VSS.String_Vectors.Virtual_String_Vector;
       --  The list of CompletionItem properties that can be resolved
       --  lazily (i.e: when the item is selected on client-side) via