Merge remote branch 'origin/master' into edge

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

Author: mergerepo

integration/vscode/ada/package.json

@@ -245,8 +245,8 @@
     },
     "scripts": {
         "vscode:prepublish": "npm run compile",
-        "compile": "./node_modules/typescript/bin/tsc",
-        "watch": "./node_modules/typescript/bin/tsc -watch",
+        "compile": "node ./node_modules/typescript/bin/tsc",
+        "watch": "node ./node_modules/typescript/bin/tsc -watch",
         "pretest": "npm run compile",
         "lint": "eslint './src/**/*.{js,ts,tsx}' --quiet --fix",
         "test": "node ./out/test/runTest.js"

source/ada/lsp-ada_contexts.adb

@@ -781,9 +781,10 @@ package body LSP.Ada_Contexts is
    -----------------
 
    function Get_Node_At
-     (Self     : Context;
-      Document : LSP.Ada_Documents.Document_Access;
-      Position : LSP.Messages.TextDocumentPositionParams'Class)
+     (Self         : Context;
+      Document     : LSP.Ada_Documents.Document_Access;
+      Position     : LSP.Messages.TextDocumentPositionParams'Class;
+      Project_Only : Boolean := True)
       return Libadalang.Analysis.Ada_Node
    is
       use type Libadalang.Analysis.Ada_Node;
@@ -801,12 +802,13 @@ package body LSP.Ada_Contexts is
       --  We're about to get a node from an analysis unit. Either the document
       --  is open for it, in which case we read the document, or the
       --  document is not open for it. In this case, resolve this only
-      --  if the file belongs to the project: we don't want to pollute the
-      --  LAL context with units that are not in the project.
+      --  if the file belongs to the project (unless if Project_Only is False):
+      --  we don't want to pollute the LAL context with units that are not in
+      --  the project.
 
       if Document /= null then
          return Document.Get_Node_At (Self, Position.position);
-      elsif Self.Is_Part_Of_Project (File) then
+      elsif not Project_Only or else Self.Is_Part_Of_Project (File) then
          Unit := Self.LAL_Context.Get_From_File
            (Name,
             Charset => Self.Get_Charset);

source/ada/lsp-ada_contexts.ads

@@ -83,13 +83,15 @@ package LSP.Ada_Contexts is
       return Ada.Strings.UTF_Encoding.UTF_8_String;
 
    function Get_Node_At
-     (Self     : Context;
-      Document : LSP.Ada_Documents.Document_Access;
-      Position : LSP.Messages.TextDocumentPositionParams'Class)
+     (Self         : Context;
+      Document     : LSP.Ada_Documents.Document_Access;
+      Position     : LSP.Messages.TextDocumentPositionParams'Class;
+      Project_Only : Boolean := True)
       return Libadalang.Analysis.Ada_Node;
    --  Return the node at the given location.
    --  If Document is not null, get the location from the document, otherwise
-   --  get it from the file.
+   --  get it from the file if it belongs to the context's project when
+   --  Project_Only is True.
 
    procedure Format
      (Self     : in out Context;

source/ada/lsp-ada_documents.ads

@@ -148,7 +148,7 @@ package LSP.Ada_Documents is
       Limit       : Ada.Containers.Count_Type;
       Only_Public : Boolean;
       Canceled    : access function return Boolean;
-      Result  : in out LSP.Ada_Completions.Completion_Maps.Map);
+      Result      : in out LSP.Ada_Completions.Completion_Maps.Map);
    --  See Contexts.Get_Any_Symbol
 
    procedure Get_Folding_Blocks

source/ada/lsp-ada_handlers-invisibles.adb

@@ -138,12 +138,12 @@ package body LSP.Ada_Handlers.Invisibles is
 
                for Doc of Self.Handler.Open_Documents loop
                   Doc.Get_Any_Symbol
-                    (Self.Context.all,
-                     Pattern,
-                     Limit,
-                     True,
-                     Dummy_Canceled'Access,
-                     Names);
+                    (Context     => Self.Context.all,
+                     Pattern     => Pattern,
+                     Limit       => Limit,
+                     Only_Public => True,
+                     Canceled    => Dummy_Canceled'Access,
+                     Result      => Names);
                end loop;
             end;
          end if;

source/ada/lsp-ada_handlers.adb

@@ -3766,14 +3766,17 @@ package body LSP.Ada_Handlers is
       Request : LSP.Messages.Server_Requests.Workspace_Symbols_Request)
       return LSP.Messages.Server_Responses.Symbol_Response
    is
+      use type LSP.Messages.Search_Kind;
+      use type VSS.Strings.Character_Count;
+
       procedure On_Inaccessible_Name
         (File : GNATCOLL.VFS.Virtual_File;
          Name : Libadalang.Analysis.Defining_Name;
          Stop : in out Boolean);
 
       Names : LSP.Ada_Completions.Completion_Maps.Map;
 
-      package Canceled is new LSP.Generic_Cancel_Check (Request, 127);
+      package Canceled is new LSP.Generic_Cancel_Check (Request'Access, 127);
 
       procedure Write_Symbols is
         new LSP.Ada_Completions.Generic_Write_Symbols
@@ -3818,6 +3821,16 @@ package body LSP.Ada_Handlers is
         (Is_Error => False);
 
    begin
+      if Pattern.Get_Kind /= LSP.Messages.Start_Word_Text
+        and then Pattern.Get_Canonical_Pattern.Character_Length < 2
+      then
+         --  Do not process too small pattern because
+         --  this produces a huge response that is useless
+         --  and costs a while.
+
+         return Response;
+      end if;
+
       for Context of Self.Contexts.Each_Context loop
          Context.Get_Any_Symbol
            (Pattern     => Pattern,
@@ -3968,9 +3981,10 @@ package body LSP.Ada_Handlers is
 
       C := Self.Contexts.Get_Best_Context (Item.data.Value.uri);
       Node := Get_Node_At
-        (Self     => C.all,
-         Document => null,
-         Position => LSP.Messages.TextDocumentPositionParams'
+        (Self         => C.all,
+         Document     => null,
+         Project_Only => False,
+         Position     => LSP.Messages.TextDocumentPositionParams'
            (textDocument => (uri => Item.data.Value.uri),
             position     => Item.data.Value.span.first));
 

source/server/lsp-generic_cancel_check.ads

@@ -23,14 +23,14 @@
 with LSP.Messages.Server_Requests;
 
 generic
-   Request : LSP.Messages.Server_Requests.Server_Request'Class;
+   Request : access constant LSP.Messages.Server_Requests.Server_Request'Class;
    --  A request to check cancelation
+
    Max_Skip_Count : Natural;
    --  How much checks to skip before make a real atomic flag check
 
 package LSP.Generic_Cancel_Check is
 
-   function Has_Been_Canceled return Boolean
-     with Inline;
+   function Has_Been_Canceled return Boolean with Inline;
 
 end LSP.Generic_Cancel_Check;

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

@@ -162,7 +162,7 @@
                }
             }
          },
-         "waitFactor": "40",
+         "waitFactor": "10",
          "wait": [
             {
                 "jsonrpc": "2.0",

testsuite/ada_lsp/workspace_symbol/test.json

@@ -71,30 +71,13 @@
                 "id":"wsSymbol",
                 "method":"workspace/symbol",
                 "params":{
-                    "query":""
+                    "query":"Test"
                 }
             },
             "sortReply": {"result":"name"},
             "wait":[{
                 "id": "wsSymbol",
                 "result": [
-                    {
-                        "name": "Main",
-                        "kind": 12,
-                        "location": {
-                            "uri": "$URI{main.adb}",
-                            "range": {
-                                "start": {
-                                    "line": 0,
-                                    "character": 10
-                                },
-                                "end": {
-                                    "line": 0,
-                                    "character": 14
-                                }
-                            }
-                        }
-                    },
                     {
                         "name": "Test1",
                         "kind": 12,