Merge branch 'topic/doc_sym' into 'master'

Rewrite document symbol, tokens requests as jobs

See merge request eng/ide/ada_language_server!1541

Author: reznikmm

source/ada/lsp-ada_document_symbol.adb

@@ -0,0 +1,38 @@
+------------------------------------------------------------------------------
+--                         Language Server Protocol                         --
+--                                                                          --
+--                        Copyright (C) 2024, AdaCore                       --
+--                                                                          --
+-- This is free software;  you can redistribute it  and/or modify it  under --
+-- terms of the  GNU General Public License as published  by the Free Soft- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  This software is distributed in the hope  that it will be useful, --
+-- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
+-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public --
+-- License for  more details.  You should have  received  a copy of the GNU --
+-- General  Public  License  distributed  with  this  software;   see  file --
+-- COPYING3.  If not, go to http://www.gnu.org/licenses for a complete copy --
+-- of the license.                                                          --
+------------------------------------------------------------------------------
+
+--  This package provides handler and job types for textDocument/documentSymbol
+--  requests.
+
+with LSP.Ada_Job_Contexts;
+with LSP.Server_Jobs;
+with LSP.Server_Message_Handlers;
+with LSP.Server_Messages;
+
+package LSP.Ada_Document_Symbol is
+
+   type Ada_Document_Symbol_Handler
+     (Context : not null access LSP.Ada_Job_Contexts.Ada_Job_Context'Class) is
+       limited new LSP.Server_Message_Handlers.Server_Message_Handler
+         with null record;
+
+   overriding function Create_Job
+     (Self    : Ada_Document_Symbol_Handler;
+      Message : LSP.Server_Messages.Server_Message_Access)
+        return LSP.Server_Jobs.Server_Job_Access;
+
+end LSP.Ada_Document_Symbol;

source/ada/lsp-ada_document_symbol.ads

@@ -1139,18 +1139,6 @@ package body LSP.Ada_Documents is
    is
      (Self.Unit (Context).Lookup_Token (Self.To_Source_Location (Position)));
 
-   ----------------
-   -- Get_Tokens --
-   ----------------
-
-   function Get_Tokens
-     (Self        : Document'Class; Context : LSP.Ada_Contexts.Context;
-      Highlighter : LSP.Ada_Highlighters.Ada_Highlighter;
-      Span        : LSP.Structures.A_Range := ((1, 1), (0, 0)))
-      return LSP.Structures.Natural_Vector
-   is
-      (Highlighter.Get_Tokens (Self.Unit (Context), Context.Tracer.all, Span));
-
    -----------------
    -- Get_Word_At --
    -----------------

source/ada/lsp-ada_documents.adb

@@ -32,7 +32,6 @@ with Pp.Command_Lines;
 limited with LSP.Ada_Contexts;
 limited with LSP.Ada_Handlers;
 with LSP.Ada_Completions;
-with LSP.Ada_Highlighters;
 with LSP.Constants;
 with LSP.Diagnostic_Sources;
 with LSP.Text_Documents.Langkit_Documents;
@@ -286,14 +285,6 @@ package LSP.Ada_Documents is
       return Libadalang.Common.Token_Reference;
    --  Return a token at the given Position.
 
-   function Get_Tokens
-     (Self        : Document'Class;
-      Context     : LSP.Ada_Contexts.Context;
-      Highlighter : LSP.Ada_Highlighters.Ada_Highlighter;
-      Span        : LSP.Structures.A_Range := ((1, 1), (0, 0)))
-        return LSP.Structures.Natural_Vector;
-   --  Return semantic tokens in the document. See details in LSP specification
-
 private
 
    type Name_Information is record

source/ada/lsp-ada_documents.ads

@@ -40,6 +40,7 @@ with GNATCOLL.Utils;
 with LSP.Ada_Commands;
 with LSP.Ada_Definition;
 with LSP.Ada_Declaration;
+with LSP.Ada_Document_Symbol;
 with LSP.Ada_Did_Change_Configurations;
 with LSP.Ada_Did_Change_Document;
 with LSP.Ada_Hover;
@@ -68,6 +69,8 @@ with LSP.Ada_Handlers.Refactor.Suppress_Seperate;
 with LSP.Ada_Handlers.Show_Dependencies_Commands;
 with LSP.Ada_Handlers.Source_Dirs_Commands;
 with LSP.Ada_Handlers.Suspend_Executions;
+with LSP.Ada_Tokens_Full;
+with LSP.Ada_Tokens_Range;
 with LSP.GNATCOLL_Trace_Streams;
 with LSP.GNATCOLL_Tracers;
 with LSP.GPR_Handlers;
@@ -80,8 +83,11 @@ with LSP.Server_Notifications.DidChange;
 with LSP.Server_Notifications.DidChangeConfiguration;
 with LSP.Server_Requests.Definition;
 with LSP.Server_Requests.Declaration;
+with LSP.Server_Requests.DocumentSymbol;
 with LSP.Server_Requests.Hover;
 with LSP.Server_Requests.References;
+with LSP.Server_Requests.Tokens_Full;
+with LSP.Server_Requests.Tokens_Range;
 with LSP.Servers;
 with LSP.Stdio_Streams;
 
@@ -201,6 +207,18 @@ procedure LSP.Ada_Driver is
      LSP.Ada_Declaration.Ada_Declaration_Handler
        (Ada_Handler'Unchecked_Access);
 
+   Ada_Document_Symbol_Handler : aliased
+     LSP.Ada_Document_Symbol.Ada_Document_Symbol_Handler
+       (Ada_Handler'Unchecked_Access);
+
+   Ada_Tokens_Full_Handler : aliased
+     LSP.Ada_Tokens_Full.Ada_Tokens_Full_Handler
+       (Ada_Handler'Unchecked_Access);
+
+   Ada_Tokens_Range_Handler : aliased
+     LSP.Ada_Tokens_Range.Ada_Tokens_Range_Handler
+       (Ada_Handler'Unchecked_Access);
+
    GPR_Did_Change_Doc_Handler : aliased
      LSP.GPR_Did_Change_Document.GPR_Did_Change_Handler
        (GPR_Handler'Unchecked_Access);
@@ -421,6 +439,18 @@ begin
            (LSP.Server_Requests.Declaration.Request'Tag,
             Ada_Declaration_Handler'Unchecked_Access);
 
+         Server.Register_Handler
+           (LSP.Server_Requests.DocumentSymbol.Request'Tag,
+            Ada_Document_Symbol_Handler'Unchecked_Access);
+
+         Server.Register_Handler
+           (LSP.Server_Requests.Tokens_Full.Request'Tag,
+            Ada_Tokens_Full_Handler'Unchecked_Access);
+
+         Server.Register_Handler
+           (LSP.Server_Requests.Tokens_Range.Request'Tag,
+            Ada_Tokens_Range_Handler'Unchecked_Access);
+
          Server.Register_Handler
            (LSP.Server_Requests.References.Request'Tag,
             Ada_References_Handler'Unchecked_Access);