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

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

Author: 2 people

CHANGELOG.md

@@ -16,6 +16,7 @@ section below it for the last release. -->
 * Provide an integration of the [e3-testsuite](https://github.com/AdaCore/e3-testsuite) framework with the VS Code testing UI
 * Provide an interactive options picker for GNATprove invocations
 * Automatically open SARIF reports generated by GNATprove
+* New SemanticTokenModifiers for global/local variables have been added.
 
 ## 26.0.202507021
 

doc/Custom-colors-in-VS-Code.md

@@ -56,6 +56,8 @@ Ada Language Server uses next modifiers of tokens:
 | modification   | write access to a name
 | documentation  | ghost code or aspect
 | defaultLibrary | predefined name
+| globalVariable | the variable exists during all time program execution
+| localVariable  | the variable is local for the scope
 
 ## Example
 
@@ -135,6 +137,8 @@ Open `settings.json` and append next:
                 "*.modification": {"bold": true},
                 "*.deprecated": {"strikethrough": true},
                 "*.readonly": "#4FC1FF",
+                "*.globalVariable": "#C92002",
+                "*.localVariable": "#02A322",
                 "property.readonly": "#3E52EB",
                 "typeParameter.readonly": {"foreground": "#3E52EB", "italic": true},
                 "*.documentation": "#6A9955",

doc/global_local_variables.md

@@ -1,13 +1,17 @@
-# Global/local variables
+# Global/Local Variables highlighting
 
 ## Short introduction
 
-This feature uses custom modifiers for SemanticTokenModifiers to mark
- global/local variable in the semanticTokens request.
-
+This feature uses custom modifiers for `SemanticTokenModifiers` to mark **global** and **local** variables in the `semanticTokens` request.
 
 ## Change description
 
 We extend the `SemanticTokenModifiers` by adding extra modifiers:
-  - "globalVariable" marks global variable
-  - "localVariable" marks local variable
+
+* `globalVariable`: Marks a **global variable**. This refers to a variable whose **lifetime is the same as the program itself** (program-level visibility and duration). These variables are typically declared in the declarative part of a library-level package:
+    * **Library-level packages**.
+    * **Nested packages**, **Protected Objects** or **Tasks** that are themselves declared at the library level. .
+    
+    The variable exists for the entire program execution and is not local to any locally declared subprogram or block.
+
+* `localVariable`: Marks a **local variable**. This refers to a variable whose name is declared within the **nearest enclosing declarative part** (e.g., within a subprogram body, a block statement). Their scope and lifetime are typically restricted to that specific program element.

testsuite/ada_lsp/highlight_variables/a.adb

@@ -1,84 +1,18 @@
 
 with Ada.Text_IO;
-with Ada.Strings.Unbounded;
 
 package body A is
 
    C : Boolean := True;
 
-   type SemanticTokenModifiers is
-     (declaration,
-      definition,
-      readonly,
-      static,
-      deprecated,
-      an_abstract,
-      async,
-      modification,
-      documentation,
-      defaultLibrary,
-      globalVariable,
-      localVariable);
-
-   type Modifiers_Array is array (SemanticTokenModifiers) of Boolean;
-
    -----------
    -- Print --
    -----------
 
    procedure Print is
       B : Boolean := True;
-
-      function Correct_Name (Value : String) return String;
-
-      function Correct_Name (Value : String) return String is
-      begin
-         return Value;
-      end Correct_Name;
-
-      function Get_Modifiers (Modifiers : Modifiers_Array) return String
-      is
-         use Ada.Strings.Unbounded;
-
-         M : Unbounded_String;
-      begin
-         for Index in SemanticTokenModifiers'Range loop
-            if Modifiers (Index) then
-               if Index = globalVariable
-                 or else Index = localVariable
-               then
-                  M := "-" & Correct_Name
-                    (SemanticTokenModifiers'Image (Index)) & M;
-               else
-                  Append (M, "-" & Correct_Name
-                          (SemanticTokenModifiers'Image (Index)));
-               end if;
-            end if;
-         end loop;
-
-         return To_String (M);
-      end Get_Modifiers;
-
-   begin
-      Ada.Text_IO.Put_Line ("A");
-      if B
-        and then C
-        and then D
-      then
-         null;
-      end if;
-
-      Ada.Text_IO.Put_Line
-        (Get_Modifiers ((deprecated => True, others => False)));
-   end Print;
-
-   -----------
-   -- Print --
-   -----------
-
-   procedure Print (Value : String) is
    begin
-      Ada.Text_IO.Put_Line (Value);
+      Ada.Text_IO.Put_Line (B'Img & C'Img);
    end Print;
 
 end A;

testsuite/ada_lsp/highlight_variables/a.ads

@@ -2,12 +2,4 @@ package A is
 
    procedure Print;
 
-   procedure Print (Value : String);
-
-   type Print_Access is access procedure (Value : String);
-
-private
-
-   D : Boolean := True;
-
 end A;

testsuite/ada_lsp/highlight_variables/main.adb

@@ -2,7 +2,6 @@
 with A;
 
 procedure Main is
-   use A;
 begin
    A.Print;
 end Main;