Merge branch 'gnatstudio_389' into 'master'

Expand SemanticTokenModifiers enumeration type

See merge request eng/ide/ada_language_server!2104

Author: ogorodnik

doc/metaModel.patch.json

@@ -129,6 +129,23 @@
                "value": 3
             }
          ]
+      },
+      {
+         "name": "SemanticTokenModifiers",
+         "type": {
+            "kind": "base",
+            "name": "string"
+         },
+         "values": [
+            {
+               "name": "globalVariable",
+               "value": "globalVariable"
+            },
+            {
+               "name": "localVariable",
+               "value": "localVariable"
+            }
+         ]
       }
    ],
    "structures": [

liblsp_3_16/source/generated/lsp-message_io.adb

@@ -3529,6 +3529,10 @@ package body LSP.Message_IO is
          V := documentation;
       elsif Text = "defaultLibrary" then
          V := defaultLibrary;
+      elsif Text = "globalVariable" then
+         V := globalVariable;
+      elsif Text = "localVariable" then
+         V := localVariable;
       else
          V := SemanticTokenModifiers'First;
       end if;
@@ -3570,6 +3574,10 @@ package body LSP.Message_IO is
                return "documentation";
             when defaultLibrary =>
                return "defaultLibrary";
+            when globalVariable =>
+               return "globalVariable";
+            when localVariable =>
+               return "localVariable";
          end case;
       end To_Virtual_String;
 

liblsp_3_16/source/lsp-messages.ads

@@ -3853,7 +3853,9 @@ package LSP.Messages is
       async,
       modification,
       documentation,
-      defaultLibrary);
+      defaultLibrary,
+      globalVariable,
+      localVariable);
 
    procedure Read_SemanticTokenModifiers
      (S : access Ada.Streams.Root_Stream_Type'Class;

liblsp_3_17/source/generated/lsp-enumerations.ads

@@ -450,7 +450,8 @@ package LSP.Enumerations is
 
    type SemanticTokenModifiers is
      (declaration, definition, readonly, static, deprecated, an_abstract,
-      async, modification, documentation, defaultLibrary);
+      async, modification, documentation, defaultLibrary, globalVariable,
+      localVariable);
    --  A set of predefined token modifiers. This set is not fixed an clients
    --  can specify additional token types via the corresponding client
    --  capabilities.

liblsp_3_17/source/generated/lsp-inputs-part_17.adb

@@ -47,7 +47,9 @@ package body LSP.Inputs.Part_17 is
       "async",
       "modification",
       "documentation",
-      "defaultLibrary"]);
+      "defaultLibrary",
+      "globalVariable",
+      "localVariable"]);
 
    procedure Read_SemanticTokenModifiers
      (Handler : in out VSS.JSON.Pull_Readers.JSON_Pull_Reader'Class;

liblsp_3_17/source/generated/lsp-outputs.adb

@@ -1988,6 +1988,10 @@ package body LSP.Outputs is
             Handler.String_Value ("documentation");
          when LSP.Enumerations.defaultLibrary =>
             Handler.String_Value ("defaultLibrary");
+         when LSP.Enumerations.globalVariable =>
+            Handler.String_Value ("globalVariable");
+         when LSP.Enumerations.localVariable =>
+            Handler.String_Value ("localVariable");
       end case;
    end Write_SemanticTokenModifiers;
 

source/lsp_gen/lsp_gen-meta_models.adb

@@ -69,8 +69,34 @@ package body LSP_Gen.Meta_Models is
          declare
             Item : constant LSP_Gen.Entities.Enumeration :=
               Patch.enumerations (J);
+            Append : Boolean := True;
          begin
-            Self.Model.enumerations.Append (Item);
+            for I in 1 .. Self.Model.enumerations.Length loop
+               declare
+                  Ref : constant LSP_Gen.Entities.
+                    Enumeration_Variable_Reference :=
+                      Self.Model.enumerations.
+                        Get_Enumeration_Variable_Reference (I);
+               begin
+                  if Ref.name = Item.name then
+                     --  we already have the enum, this means we would like to
+                     --  expand their values
+                     Append := False;
+
+                     for I in 1 .. Item.values.Length loop
+                        Ref.values.Append
+                          (Item.values.
+                             Get_EnumerationEntry_Constant_Reference (I));
+                     end loop;
+
+                     exit;
+                  end if;
+               end;
+            end loop;
+
+            if Append then
+               Self.Model.enumerations.Append (Item);
+            end if;
          end;
       end loop;