Merge remote branch 'origin/master' into edge

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

Author: mergerepo

source/ada/lsp-ada_handlers.adb

@@ -3952,15 +3952,26 @@ package body LSP.Ada_Handlers is
         Request.params;
       Response  : LSP.Messages.Server_Responses.CompletionItemResolve_Response
         (Is_Error => False);
-      C         : constant Context_Access :=
-        Self.Contexts.Get_Best_Context (Item.data.Value.uri);
-      Node      : Libadalang.Analysis.Ada_Node := Get_Node_At
+      C         : Context_Access;
+      Node      : Libadalang.Analysis.Ada_Node;
+   begin
+      --  Return immediately if we don't have data that allows us to compute
+      --  additional information for the given item.
+      --  This is the case when all the completion item's fields have already
+      --  been computed.
+      if not Item.data.Is_Set then
+         Response.result := Item;
+         return Response;
+      end if;
+
+      C := Self.Contexts.Get_Best_Context (Item.data.Value.uri);
+      Node := Get_Node_At
         (Self     => C.all,
          Document => null,
          Position => LSP.Messages.TextDocumentPositionParams'
            (textDocument => (uri => Item.data.Value.uri),
             position     => Item.data.Value.span.first));
-   begin
+
       --  Retrieve the Basic_Decl from the completion item's SLOC
       while not Node.Is_Null
         and then Node.Kind not in Libadalang.Common.Ada_Basic_Decl

testsuite/ada_lsp/completion.invisible.runtime/test.json

@@ -162,7 +162,7 @@
                }
             }
          },
-         "waitFactor": "4000",
+         "waitFactor": "40",
          "wait": [
             {
                 "jsonrpc": "2.0",
@@ -212,21 +212,22 @@
          },
          "wait": [
             {
-               "id": 6,
-               "result": {
-                  "isIncomplete": true,
-                  "items": ["<HAS>",
-                     {
-                        "label": "Text_IO (invisible)",
-                        "kind": 9,
-                        "detail": "package Ada.Text_IO with\n  Abstract_State    => (File_System),\n  Initializes       => (File_System),\n  Initial_Condition => Line_Length = 0 and Page_Length = 0\n",
-                        "documentation": "at a-textio.ads (58:1)\n\nPreconditions in this unit are meant for analysis only, not for run-time\nchecking, so that the expected exceptions are raised. This is enforced by\nsetting the corresponding assertion policy to Ignore. These preconditions\nare partial. They protect fully against Status_Error and Mode_Error,\npartially against Layout_Error (see SPARK User's Guide for details), and\nnot against other types of errors.",
-                        "sortText": "~Text_IO",
-                        "filterText": "Text_IO",
-                        "insertText": "Text_IO",
-                        "additionalTextEdits": []
-                     }
-                  ]
+                "id": 6,
+                "result": {
+                    "isIncomplete": true,
+                    "items": ["<HAS>",
+                              {
+                                  "label": "Short_Float_Text_IO (invisible)",
+                                  "kind": 9,
+                                  "detail": "package Ada.Short_Float_Text_IO is\nnew Ada.Text_IO.Float_IO (Short_Float);",
+                                  "documentation": "at a-sfteio.ads (18:1)",
+                                  "sortText": "~Short_Float_Text_IO",
+                                  "filterText": "Short_Float_Text_IO",
+                                  "insertText": "Short_Float_Text_IO",
+                                  "additionalTextEdits": [
+                                  ]
+                              }
+                             ]
                }
             }
          ]

testsuite/ada_lsp/completion.lazy_computation/default.gpr

@@ -0,0 +1,2 @@
+project Default is
+end Default;

testsuite/ada_lsp/completion.lazy_computation/main.adb

@@ -0,0 +1,6 @@
+with Test; use Test;
+
+procedure Main is
+begin
+   Selec
+end Main;

testsuite/ada_lsp/completion.lazy_computation/test.ads

@@ -0,0 +1,6 @@
+package Test is
+
+   procedure Select_Some is null;
+   --  This a very useful comment.
+
+end Test;