Merge remote branch 'origin/master' into edge

Author: automatic-merge

source/ada/lsp-ada_completions-aspects.adb

@@ -18,6 +18,7 @@
 with VSS.Strings;
 
 with LSP.Predefined_Completion;
+with LSP.Ada_Completions.Filters;
 
 package body LSP.Ada_Completions.Aspects is
 
@@ -34,28 +35,29 @@ package body LSP.Ada_Completions.Aspects is
       Names  : in out Ada_Completions.Completion_Maps.Map;
       Result : in out LSP.Messages.CompletionList)
    is
-      pragma Unreferenced (Filter);
       pragma Unreferenced (Names);
 
       Parent : constant Libadalang.Analysis.Ada_Node :=
         (if Node.Is_Null then Node else Node.Parent);
    begin
-      if not Parent.Is_Null and then
-        Parent.Kind in Libadalang.Common.Ada_Aspect_Assoc_Range
-      then
-         declare
-            Prefix : constant VSS.Strings.Virtual_String :=
-              VSS.Strings.To_Virtual_String (Node.Text);
-
-         begin
+      if Filter.Is_Aspect then
+         if not Parent.Is_Null and then
+           Parent.Kind in Libadalang.Common.Ada_Aspect_Assoc_Range
+         then
+            declare
+               Prefix : constant VSS.Strings.Virtual_String :=
+                 VSS.Strings.To_Virtual_String (Node.Text);
+
+            begin
+               LSP.Predefined_Completion.Get_Aspects
+                 (Prefix => Prefix,
+                  Result => Result.items);
+            end;
+         elsif Node.Kind in Libadalang.Common.Ada_Aspect_Spec_Range then
             LSP.Predefined_Completion.Get_Aspects
-              (Prefix => Prefix,
+              (Prefix => VSS.Strings.Empty_Virtual_String,
                Result => Result.items);
-         end;
-      elsif Node.Kind in Libadalang.Common.Ada_Aspect_Spec_Range then
-         LSP.Predefined_Completion.Get_Aspects
-           (Prefix => VSS.Strings.Empty_Virtual_String,
-            Result => Result.items);
+         end if;
       end if;
    end Propose_Completion;
 

source/ada/lsp-ada_completions-filters.adb

@@ -129,6 +129,51 @@ package body LSP.Ada_Completions.Filters is
       return Self.Is_Attribute.Value;
    end Is_Attribute_Ref;
 
+   ---------------
+   -- Is_Aspect --
+   ---------------
+
+   function Is_Aspect (Self : in out Filter'Class) return Boolean is
+   begin
+      if not Self.Is_Aspect.Is_Set then
+         declare
+            use Libadalang.Common;
+
+            Token_Kind : constant Libadalang.Common.Token_Kind :=
+              Kind (Libadalang.Common.Previous
+                    (Self.Token, Exclude_Trivia => True));
+            Parent : Libadalang.Analysis.Ada_Node :=
+              (if Self.Node.Is_Null then Self.Node else Self.Node.Parent);
+         begin
+            --  Get the outermost dotted name of which node is a prefix, so
+            --  that when completing in a situation such as the following:
+            --
+            --      end Ada.Tex|
+            --                 ^ Cursor here
+            --
+            --  we get the DottedName node rather than just the "Tex" BaseId.
+            --  We want the DottedName rather than the Id so as to get the
+            --  proper completions (all elements in the "Ada" namespace).
+
+            while not Parent.Is_Null
+              and then Parent.Kind = Ada_Dotted_Name
+            loop
+               Parent := Parent.Parent;
+            end loop;
+
+            Self.Is_Aspect :=
+              (True,
+               Token_Kind = Ada_With and then
+                 (Self.Node.Kind in Ada_Aspect_Spec_Range
+                  or else
+                    (not Parent.Is_Null
+                     and then Parent.Kind in Ada_Aspect_Assoc_Range)));
+         end;
+      end if;
+
+      return Self.Is_Aspect.Value;
+   end Is_Aspect;
+
    ------------------
    -- Is_Semicolon --
    ------------------

source/ada/lsp-ada_completions-filters.ads

@@ -39,6 +39,9 @@ package LSP.Ada_Completions.Filters is
    function Is_Attribute_Ref (Self : in out Filter'Class) return Boolean;
    --  Check if we complete "'<attribute>" text
 
+   function Is_Aspect (Self : in out Filter'Class) return Boolean;
+   --  Check if we complete an Ada aspect (e.g: "with")
+
    function Is_Semicolon (Self : in out Filter'Class) return Boolean;
    --  Check if we complete right after ";"
 
@@ -53,6 +56,7 @@ private
       Is_End_Label       : LSP.Types.Optional_Boolean;
       Is_Numeric_Literal : LSP.Types.Optional_Boolean;
       Is_Attribute       : LSP.Types.Optional_Boolean;
+      Is_Aspect          : LSP.Types.Optional_Boolean;
       Is_Semicolon       : LSP.Types.Optional_Boolean;
       Is_Comma           : LSP.Types.Optional_Boolean;
    end record;

source/ada/lsp-ada_completions-names.adb

@@ -112,9 +112,10 @@ package body LSP.Ada_Completions.Names is
          return;
       end if;
 
-      --  Don't complete numeric literals, attributes nor end labels
+      --  Don't complete numeric literals, attributes nor end labels or aspects
       if Filter.Is_Numeric_Literal
         or else Filter.Is_Attribute_Ref
+        or else Filter.Is_Aspect
         or else Filter.Is_End_Label
       then
          return;

source/ada/lsp-ada_handlers-invisibles.adb

@@ -89,8 +89,13 @@ package body LSP.Ada_Handlers.Invisibles is
       if Libadalang.Common.Kind (Dot_Token) = Ada_Dot then
          --  Don't provide completion after a dot
          return;
-      elsif Filter.Is_Numeric_Literal or Filter.Is_End_Label then
-         --  Don't provide completion in a numeric literal nor end label
+      elsif Filter.Is_Numeric_Literal
+        or else Filter.Is_Attribute_Ref
+        or else Filter.Is_Aspect
+        or else Filter.Is_End_Label
+      then
+         --  Don't complete numeric literals, attributes nor end labels
+         --  or aspects
          return;
       end if;
 

testsuite/ada_lsp/completion.aspects.filtering/default.gpr

@@ -0,0 +1,2 @@
+project Default is
+end Default;

testsuite/ada_lsp/completion.aspects.filtering/p.adb

@@ -0,0 +1,7 @@
+procedure P is
+   subtype Even_Integer is Integer
+      with 
+
+begin
+   null;
+end P;