Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: Max Reznik <reznik@adacore.com>

Author: ogorodnik

doc/extensions.md

@@ -69,6 +69,7 @@ related resources.
  * [Project file](project_file.md)
  * [Source dirs](source_dirs.md)
  * [Workspace symbol params](workspace_symbol_params.md)
+ * [Global/local variables](global_local_variables.md)
 
 ```{toctree}
 :maxdepth: 1

doc/global_local_variables.md

@@ -0,0 +1,13 @@
+# Global/local variables
+
+## Short introduction
+
+This feature uses custom modifiers for SemanticTokenModifiers to mark
+ global/local variable in the semanticTokens request.
+
+
+## Change description
+
+We extend the `SemanticTokenModifiers` by adding extra modifiers:
+  - "globalVariable" marks global variable
+  - "localVariable" marks local variable

source/ada/lsp-ada_highlighters.adb

@@ -766,7 +766,7 @@ package body LSP.Ada_Highlighters is
             Node_Enclosing_Declarative_Part : constant Declarative_Part :=
                 Laltools.Common.Get_Enclosing_Declarative_Part (Node);
 
-            Decl_Declarative_Part : Declarative_Part;
+            Parent : Ada_Node;
          begin
             if Compare
                (Node_Enclosing_Declarative_Part.Sloc_Range,
@@ -775,29 +775,24 @@ package body LSP.Ada_Highlighters is
                Highlight_Token (Node.Token_Start, localVariable);
 
             else
-               Decl_Declarative_Part :=
-                 Laltools.Common.Get_Enclosing_Declarative_Part (Decl);
-
-               if Decl_Declarative_Part.Parent /= No_Ada_Node
-                  and then
-                    (Decl_Declarative_Part.Parent.Kind in
-                         Ada_Package_Body_Range
-                       or else Decl_Declarative_Part.Parent.Kind in
-                         Ada_Base_Package_Decl)
-               then
-                  Highlight_Token (Node.Token_Start, globalVariable);
-               end if;
+               Parent := Decl.Parent;
+               while not Parent.Is_Null loop
+                  if Parent.Kind in Ada_Subp_Body_Range
+                    or else Parent.Kind in Ada_Entry_Body
+                  then
+                     return;
+                  end if;
+                  Parent := Parent.Parent;
+               end loop;
+
+               Highlight_Token (Node.Token_Start, globalVariable);
             end if;
          end Investigate_Variable;
 
       begin
          case Decl.Kind is
-            when Ada_Base_Formal_Param_Decl =>
-               if Ada_Base_Formal_Param_Decl'(Decl.Kind) =
-                 Ada_Generic_Formal_Obj_Decl
-               then
-                  Investigate_Variable;
-               end if;
+            when Ada_Generic_Formal_Obj_Decl =>
+               Investigate_Variable;
 
             when Ada_Entry_Index_Spec | Ada_Object_Decl |
                  Ada_Single_Protected_Decl | Ada_Single_Task_Decl =>