From ef3104aa1dc91dadf938ffd0c01944df347dec89 Mon Sep 17 00:00:00 2001
From: Fernando Jose <fernando.jose@woven.toyota>
Date: Thu, 13 Feb 2025 18:11:51 +0900
Subject: [PATCH] Fix #718.

Use % in string::matches to accept any sequence of characters after
the group comment ending ///@}.
---
 change_notes/2025-02-13-fix-issue-718.md               |  2 ++
 .../src/rules/A2-7-3/UndocumentedUserDefinedType.ql    |  2 +-
 cpp/autosar/test/rules/A2-7-3/test.cpp                 | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 change_notes/2025-02-13-fix-issue-718.md

diff --git a/change_notes/2025-02-13-fix-issue-718.md b/change_notes/2025-02-13-fix-issue-718.md
new file mode 100644
index 0000000000..39e499d583
--- /dev/null
+++ b/change_notes/2025-02-13-fix-issue-718.md
@@ -0,0 +1,2 @@
+- `A2-7-3` - `UndocumentedUserDefinedType.ql`
+  - Fixes #718. Include trailing characters after group comment endings with ///@{ ... ///@}.
diff --git a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
index b38cf7d02c..f2dd0dc8bc 100644
--- a/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
+++ b/cpp/autosar/src/rules/A2-7-3/UndocumentedUserDefinedType.ql
@@ -28,7 +28,7 @@ private predicate isInFunctionScope(Declaration d) {
 private string doxygenCommentGroupStrings(boolean opening) {
   opening = true and result = ["///@{", "/**@{*/"]
   or
-  opening = false and result = ["///@}", "/**@}*/"]
+  opening = false and result = ["///@}%", "/**@}*/"]
 }
 
 pragma[inline]
diff --git a/cpp/autosar/test/rules/A2-7-3/test.cpp b/cpp/autosar/test/rules/A2-7-3/test.cpp
index 01f7bad611..c062da4ee9 100644
--- a/cpp/autosar/test/rules/A2-7-3/test.cpp
+++ b/cpp/autosar/test/rules/A2-7-3/test.cpp
@@ -225,4 +225,14 @@ class ClassG2 { // COMPLIANT
 class ClassG3 { // COMPLIANT
 public:
   friend int foo3() { return 1; } // NON_COMPLIANT
+};
+
+/// @brief A Doxygen comment.
+class ClassH { // COMPLIANT
+public:
+  /// @brief Group with comment at the end.
+  ///@{
+  void m(); // COMPLIANT
+  void n(); // COMPLIANT
+  ///@} End of group
 };
\ No newline at end of file