Merge remote branch 'origin/master' into edge

Author: automatic-merge

.gitignore

@@ -91,6 +91,9 @@ ENV/
 # Object directory
 .obj
 
+# VS Code settings
+/.vscode/settings.json
+
 # Expected testsuite output
 testsuite/.als/inout.txt
 

.gitlab-ci.yml

@@ -4,6 +4,7 @@ variables:
 
 stages:
   - build_and_test
+  - run_downstream_ci
 
 .detect-branches:
   #  Version 2.
@@ -156,3 +157,23 @@ build_and_test:
      reports:
        junit: xunit_output.xml
        lsif: dump.lsif
+
+.run_ci_common: &run_ci_common
+  stage: run_downstream_ci
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      when: manual
+  trigger:
+    strategy: depend
+  inherit:
+    variables: false
+  variables:
+    ACI_UPSTREAM_PROJECT_PATH: $CI_PROJECT_PATH
+    ACI_UPSTREAM_REF_NAME: $CI_COMMIT_REF_NAME
+    ACI_UPSTREAM_SOURCE_BRANCH: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    ACI_UPSTREAM_TARGET_BRANCH: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+
+run_gs_ci:
+  <<: *run_ci_common
+  trigger:
+    project: eng/ide/gnatstudio

.vscode/settings.json renamed to .vscode/settings.json.tmpl

@@ -806,13 +806,14 @@ package body LSP.Lal_Utils is
    is
       pragma Unreferenced (Trace);
 
-      Options : constant
+      Options    : constant
         GNATdoc.Comments.Options.Extractor_Options :=
           (Style    => Style,
            Pattern  => <>,
            Fallback => True);
-      Decl_Lines         : VSS.String_Vectors.Virtual_String_Vector;
-      Doc_Lines     : VSS.String_Vectors.Virtual_String_Vector;
+      Decl_Lines : VSS.String_Vectors.Virtual_String_Vector;
+      Doc_Lines  : VSS.String_Vectors.Virtual_String_Vector;
+
    begin
       --  Extract documentation with GNATdoc when supported.
 
@@ -827,7 +828,8 @@ package body LSP.Lal_Utils is
 
       --  If GNATdoc failed to compute the declaration text, use the old engine
       if Decl_Text.Is_Empty
-        or else not BD.P_Subp_Spec_Or_Null.Is_Null
+        or else (BD.Kind not in Ada_Enum_Literal_Decl
+                   and not BD.P_Subp_Spec_Or_Null.Is_Null)
       then
          --  For subprograms additional information is added, use old code to
          --  obtain it yet.

source/ada/lsp-lal_utils.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2021, AdaCore                     --
+--                     Copyright (C) 2018-2023, 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- --
@@ -16,6 +16,7 @@
 ------------------------------------------------------------------------------
 
 with VSS.JSON.Pull_Readers.Simple;
+with VSS.JSON.Streams;
 with VSS.Stream_Element_Vectors.Conversions;
 with VSS.Strings.Conversions;
 with VSS.Text_Streams.Memory_UTF8_Input;
@@ -632,7 +633,7 @@ package body LSP.Clients is
          Token    : out LSP.Types.LSP_Number_Or_String;
          Is_Error : in out Boolean)
       is
-         use all type VSS.JSON.Pull_Readers.JSON_Event_Kind;
+         use all type VSS.JSON.Streams.JSON_Stream_Element_Kind;
 
          R  : aliased VSS.JSON.Pull_Readers.Simple.JSON_Simple_Pull_Reader;
          JS : aliased LSP.JSON_Streams.JSON_Stream (False, R'Access);
@@ -653,7 +654,7 @@ package body LSP.Clients is
                R.Read_Next;
 
                if Key = "id" then
-                  case R.Event_Kind is
+                  case R.Element_Kind is
                      when String_Value =>
                         Id :=
                           (Is_Number => False,
@@ -695,7 +696,7 @@ package body LSP.Clients is
                         R.Read_Next;
 
                         if Key = "token" then
-                           case R.Event_Kind is
+                           case R.Element_Kind is
                               when String_Value =>
                                  Token :=
                                    (Is_Number => False,

source/client/lsp-clients.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2021, AdaCore                     --
+--                     Copyright (C) 2018-2023, 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- --
@@ -15,6 +15,8 @@
 -- of the license.                                                          --
 ------------------------------------------------------------------------------
 
+with VSS.JSON.Streams;
+
 package body LSP.JSON_Streams is
 
    procedure Write_Key (Self : in out Write_Stream);
@@ -94,18 +96,19 @@ package body LSP.JSON_Streams is
 
    procedure Skip_Value (Self : in out JSON_Stream'Class) is
    begin
-      case Self.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.No_Token |
-              VSS.JSON.Pull_Readers.Invalid |
-              VSS.JSON.Pull_Readers.Start_Document |
-              VSS.JSON.Pull_Readers.End_Document |
-              VSS.JSON.Pull_Readers.End_Array |
-              VSS.JSON.Pull_Readers.End_Object |
-              VSS.JSON.Pull_Readers.Key_Name =>
+      case Self.R.Element_Kind is
+         when VSS.JSON.Streams.None |
+              VSS.JSON.Streams.Invalid |
+              VSS.JSON.Streams.Start_Document |
+              VSS.JSON.Streams.End_Document |
+              VSS.JSON.Streams.Comment |
+              VSS.JSON.Streams.End_Array |
+              VSS.JSON.Streams.End_Object |
+              VSS.JSON.Streams.Key_Name =>
 
             raise Program_Error;
 
-         when VSS.JSON.Pull_Readers.Start_Array =>
+         when VSS.JSON.Streams.Start_Array =>
 
             Self.R.Read_Next;
 
@@ -115,7 +118,7 @@ package body LSP.JSON_Streams is
 
             Self.R.Read_Next;
 
-         when VSS.JSON.Pull_Readers.Start_Object =>
+         when VSS.JSON.Streams.Start_Object =>
 
             Self.R.Read_Next;
 
@@ -128,10 +131,10 @@ package body LSP.JSON_Streams is
 
             Self.R.Read_Next;
 
-         when VSS.JSON.Pull_Readers.String_Value
-            | VSS.JSON.Pull_Readers.Number_Value
-            | VSS.JSON.Pull_Readers.Boolean_Value
-            | VSS.JSON.Pull_Readers.Null_Value =>
+         when VSS.JSON.Streams.String_Value
+            | VSS.JSON.Streams.Number_Value
+            | VSS.JSON.Streams.Boolean_Value
+            | VSS.JSON.Streams.Null_Value =>
 
             Self.R.Read_Next;
 

source/protocol/lsp-json_streams.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                         Language Server Protocol                         --
 --                                                                          --
---                     Copyright (C) 2018-2021, AdaCore                     --
+--                     Copyright (C) 2018-2023, 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- --
@@ -21,9 +21,9 @@ with Ada.Tags.Generic_Dispatching_Constructor;
 
 with Interfaces;
 
-with VSS.JSON.Pull_Readers;
-with VSS.Strings.Conversions;
 with VSS.JSON.Pull_Readers.Look_Ahead;
+with VSS.JSON.Streams;
+with VSS.Strings.Conversions;
 
 with LSP.JSON_Streams;
 with LSP.Message_IO;
@@ -2892,13 +2892,13 @@ package body LSP.Messages is
       JS : LSP.JSON_Streams.JSON_Stream'Class renames
         LSP.JSON_Streams.JSON_Stream'Class (S.all);
    begin
-      case JS.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.String_Value =>
+      case JS.R.Element_Kind is
+         when VSS.JSON.Streams.String_Value =>
             V := (Is_String => True,
                   value     => JS.R.String_Value);
 
             JS.R.Read_Next;
-         when VSS.JSON.Pull_Readers.Start_Object =>
+         when VSS.JSON.Streams.Start_Object =>
             V := (Is_String => False, others => <>);
 
             JS.R.Read_Next;
@@ -2991,20 +2991,20 @@ package body LSP.Messages is
       JS : LSP.JSON_Streams.JSON_Stream'Class renames
         LSP.JSON_Streams.JSON_Stream'Class (S.all);
    begin
-      case JS.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.String_Value =>
+      case JS.R.Element_Kind is
+         when VSS.JSON.Streams.String_Value =>
 
             V := (Is_MarkupContent => False,
                   Vector           => <>);
             V.Vector.Append
               (MarkedString'(Is_String => True,
                              value     => JS.R.String_Value));
             JS.R.Read_Next;
-         when VSS.JSON.Pull_Readers.Start_Array =>
+         when VSS.JSON.Streams.Start_Array =>
             V := (Is_MarkupContent => False,
                   Vector           => <>);
             MarkedString_Vector'Read (S, V.Vector);
-         when VSS.JSON.Pull_Readers.Start_Object =>
+         when VSS.JSON.Streams.Start_Object =>
             Read_Object (JS);
          when others =>
             JS.Skip_Value;
@@ -3022,14 +3022,14 @@ package body LSP.Messages is
       JS : LSP.JSON_Streams.JSON_Stream'Class renames
         LSP.JSON_Streams.JSON_Stream'Class (S.all);
    begin
-      case JS.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.Null_Value =>
+      case JS.R.Element_Kind is
+         when VSS.JSON.Streams.Null_Value =>
             V := (False, False);
             JS.R.Read_Next;
-         when VSS.JSON.Pull_Readers.Start_Object =>
+         when VSS.JSON.Streams.Start_Object =>
             V := (True, False, others => <>);
             TextDocumentSyncOptions'Read (S, V.Options);
-         when VSS.JSON.Pull_Readers.Number_Value =>
+         when VSS.JSON.Streams.Number_Value =>
             V := (True, True, others => <>);
             TextDocumentSyncKind'Read (S, V.Value);
          when others =>
@@ -3048,12 +3048,12 @@ package body LSP.Messages is
       JS : LSP.JSON_Streams.JSON_Stream'Class renames
         LSP.JSON_Streams.JSON_Stream'Class (S.all);
    begin
-      case JS.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.String_Value =>
+      case JS.R.Element_Kind is
+         when VSS.JSON.Streams.String_Value =>
             V := (Is_String => True,
                   String    => JS.R.String_Value);
             JS.R.Read_Next;
-         when VSS.JSON.Pull_Readers.Start_Array =>
+         when VSS.JSON.Streams.Start_Array =>
             JS.R.Read_Next;
             UTF_16_Index'Read (S, V.From);
             UTF_16_Index'Read (S, V.Till);
@@ -3075,12 +3075,12 @@ package body LSP.Messages is
       JS : LSP.JSON_Streams.JSON_Stream'Class renames
         LSP.JSON_Streams.JSON_Stream'Class (S.all);
    begin
-      case JS.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.Boolean_Value =>
+      case JS.R.Element_Kind is
+         when VSS.JSON.Streams.Boolean_Value =>
             V := (Is_Boolean => True,
                   Bool       => JS.R.Boolean_Value);
             JS.R.Read_Next;
-         when VSS.JSON.Pull_Readers.Start_Object =>
+         when VSS.JSON.Streams.Start_Object =>
             V := (Is_Boolean => False,
                   Options    => (Is_Set => True, Value => <>));
 
@@ -3103,13 +3103,13 @@ package body LSP.Messages is
       JS : LSP.JSON_Streams.JSON_Stream'Class renames
         LSP.JSON_Streams.JSON_Stream'Class (S.all);
    begin
-      case JS.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.String_Value =>
+      case JS.R.Element_Kind is
+         when VSS.JSON.Streams.String_Value =>
             V := (Is_String => True,
                   String    => JS.R.String_Value);
             JS.R.Read_Next;
 
-         when VSS.JSON.Pull_Readers.Start_Object =>
+         when VSS.JSON.Streams.Start_Object =>
             V := (Is_String => False, Content => <>);
             MarkupContent'Read (S, V.Content);
          when others =>
@@ -3344,8 +3344,8 @@ package body LSP.Messages is
       Result : Integer;
       Mask   : Integer := 4;
    begin
-      case JS.R.Event_Kind is
-         when VSS.JSON.Pull_Readers.Number_Value =>
+      case JS.R.Element_Kind is
+         when VSS.JSON.Streams.Number_Value =>
             Result := Integer (JS.R.Number_Value.Integer_Value);
 
             for J in reverse WatchKind loop