Merge branch 'topic/fix_no_closing_names' into 'master'

Fix the "No_Closing_Names" rule Closes #411 See merge request eng/libadalang/langkit-query-language!351
AdaCore · Jan 7, 2025 · 437764f · 437764f
2 parents d5e2ff0 + bf35160
commit 437764f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 2 deletions.
diff --git a/lkql_checker/share/lkql/no_closing_names.lkql b/lkql_checker/share/lkql/no_closing_names.lkql
@@ -56,5 +56,5 @@ fun no_closing_names(node, n : int = 0) =
      and node.token_end().end_line - node.token_start().start_line >= n
      and match node
          | (TaskTypeDecl | ProtectedTypeDecl | SingleProtectedDecl) =>
-            node.f_definition.f_end_name == null
+            node.f_definition is (ProtectedDef | TaskDef)(f_end_name: null)
          | * => node.f_end_name == null
diff --git a/testsuite/tests/checks/no_closing_names/prj.gpr b/testsuite/tests/checks/no_closing_names/prj.gpr
@@ -1,2 +1,2 @@
 project Prj is
-end Prj;
+end Prj;
diff --git a/testsuite/tests/checks/no_closing_names_n0/names.adb b/testsuite/tests/checks/no_closing_names_n0/names.adb
@@ -0,0 +1,8 @@
+procedure Names is  --  FLAG
+   task T3;         --  NOFLAG
+
+   task body T3 is  --  NOFLAG
+   begin
+      null;
+   end T3;
+end;
diff --git a/testsuite/tests/checks/no_closing_names_n0/prj.gpr b/testsuite/tests/checks/no_closing_names_n0/prj.gpr
@@ -0,0 +1,2 @@
+project Prj is
+end Prj;
diff --git a/testsuite/tests/checks/no_closing_names_n0/test.out b/testsuite/tests/checks/no_closing_names_n0/test.out
@@ -0,0 +1,4 @@
+names.adb:1:11: rule violation: no closing name
+1 | procedure Names is  --  FLAG
+  |           ^^^^^
+
diff --git a/testsuite/tests/checks/no_closing_names_n0/test.yaml b/testsuite/tests/checks/no_closing_names_n0/test.yaml
@@ -0,0 +1,5 @@
+driver: checker
+rule_name: no_closing_names
+project: prj.gpr
+rule_arguments:
+   no_closing_names.n: 0