Merge branch 'topic/rules/fix_one_construct_per_line' into 'master'

Fix the "One_Construct_Per_Line" rule

Closes #556

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

Author: HugoGGuerrier

lkql_checker/share/lkql/one_construct_per_line.lkql

@@ -32,20 +32,30 @@ fun one_construct_per_line(node) =
     |"       I := J; J := Tmp;      --  FLAG
     |"    end Swap;
     # Flag any statement, declaration or representation clause
-    node is (Stmt | BasicDecl | AttributeDefClause |
-             EnumRepClause | RecordRepClause | AtClause)
-    # except for enum literal, param spec, discriminant spec
-    when (not node is (EnumLiteralDecl | ParamSpec | DiscriminantSpec |
-                       # or loop param or entry index.
-                       ForLoopVarDecl | EntryIndexSpec |
-                       # Also ignore anonymous or nested constructs
-                       # generating false positives.
-                       SingleTaskTypeDecl | AnonymousTypeDecl |
-                       LabelDecl | GenericSubpInternal |
-                       ConcreteFormalSubpDecl |
-                       ExtendedReturnStmtObjectDecl |
-                       NamedStmtDecl | AcceptStmtBody))
-     and (node.token_end().end_line ==
-          stdlib.next_non_blank_token_line(node.token_end())
-          or node.token_start().start_line ==
-             stdlib.previous_non_blank_token_line(node.token_start()))
+    node is (
+       Stmt
+       | BasicDecl
+       | AttributeDefClause
+       | EnumRepClause
+       | RecordRepClause
+       | AtClause
+    ) when node is not (
+        # Except for enum literal, param spec, discriminant spec
+        EnumLiteralDecl | ParamSpec | DiscriminantSpec
+        # Or loop param or entry index.
+        | ForLoopVarDecl | EntryIndexSpec
+        # Also ignore anonymous or nested constructs generating false positives.
+        | SingleTaskTypeDecl
+        | AnonymousTypeDecl
+        | LabelDecl
+        | GenericSubpInternal
+        | ConcreteFormalSubpDecl
+        | ExtendedReturnStmtObjectDecl
+        | NamedStmtDecl
+        | AcceptStmtBody
+        # Ignore generic package instantiations when they are in a generic formal
+        | GenericPackageInstantiation(parent: GenericFormal)
+    ) and (
+        node.token_end().end_line == stdlib.next_non_blank_token_line(node.token_end())
+        or node.token_start().start_line == stdlib.previous_non_blank_token_line(node.token_start())
+    )

testsuite/tests/checks/one_construct_per_line/line.ads

@@ -4,6 +4,17 @@ package Line is I : Integer;                      --  FLAG
    F2 : Float; C :                                --  FLAG (2)
    Character;
 
+   generic
+      type Data_Type is private;
+   package Pkg_A is
+   end Pkg_A;
+
+   generic
+      with package Data_Pkg is new Pkg_A (<>);  --  NOFLAG
+      with procedure Test (X : Integer) is <>;  --  NOFLAG
+   package Pkg_B is
+   end Pkg_B;
+
    type T (A : Integer; B : Integer) is null record;  --  NOFLAG
 
    procedure Proc (I : in out Integer); end Line; --  FLAG

testsuite/tests/checks/one_construct_per_line/test.out

@@ -10,9 +10,9 @@ line.ads:4:16: rule violation: more than one construct on the same line
 4 |    F2 : Float; C :                                --  FLAG (2)
   |                ^
 
-line.ads:9:14: rule violation: more than one construct on the same line
-9 |    procedure Proc (I : in out Integer); end Line; --  FLAG
-  |              ^^^^
+line.ads:20:14: rule violation: more than one construct on the same line
+20 |    procedure Proc (I : in out Integer); end Line; --  FLAG
+   |              ^^^^
 
 line.adb:20:50: rule violation: more than one construct on the same line
 20 |       accept Start (I : Integer; B : Boolean) do null;      --  FLAG