Merge branch 'topic/fix_uncommented_begin' into 'master'

Fix the 'Uncommented_BEGIN' rule

Closes #373

See merge request eng/libadalang/langkit-query-language!312

Author: HugoGGuerrier

lkql_checker/share/lkql/stdlib.lkql

@@ -446,7 +446,7 @@ fun sloc_image(node) =
 
 fun find_comment(token, name) =
     |" Return true if a comment token immediately following the previous
-    |" "begin" keyword is found and containing only the package name.
+    |" "begin" keyword is found and contains only the provided name.
 
     if token.kind == "comment" and
        token.previous().previous().kind == "begin"

lkql_checker/share/lkql/uncommented_begin.lkql

@@ -14,8 +14,8 @@ fun uncommented_begin(unit) = [
     select node@HandledStmts(parent: p@(PackageBody | SubpBody |
                                           EntryBody | ProtectedBody |
                                           TaskBody))
-    when p.f_decls is *(f_decls: l)
+    when p.f_decls.f_decls is l
          when l[1]
-          and not stdlib.find_comment(node.token_start().previous(exclude_trivia=true),
+          and not stdlib.find_comment(node.token_start().previous(),
                                       p.p_defining_name().text)
 ]

testsuite/tests/checks/uncommented_begin_all/test.out

@@ -1,8 +1,8 @@
 uncommented.adb:4:4: rule violation: mark BEGIN with -- Proc
-4 |    begin    --  FLAG
+4 |    begin                --  FLAG
   |    ^^^^^
 
-uncommented.adb:8:1: rule violation: mark BEGIN with -- Uncommented
-8 | begin       --  FLAG
-  | ^^^^^
+uncommented.adb:21:1: rule violation: mark BEGIN with -- Uncommented
+21 | begin                   --  FLAG
+   | ^^^^^
 

testsuite/tests/checks/uncommented_begin_all/uncommented.adb

@@ -1,10 +1,23 @@
 package body Uncommented is
    procedure Proc (I : out Integer) is
       J : Integer;
-   begin    --  FLAG
+   begin                --  FLAG
       I := Var;
    end Proc;
 
-begin       --  FLAG
+   procedure Proc_2 is
+      I : Integer;
+      S : String := "Hello";
+   begin  -- Proc_2
+      --  A comment
+      null;
+   end Name;
+
+   procedure Proc_3 is
+   begin                --  NOFLAG
+      null;
+   end Proc_3;
+
+begin                   --  FLAG
    Var := Inner.Inner_Var + 1;
 end;