M14-6-1: Add improved alert message

Improve the alert message to include:
 - The name of the identifier
 - A link to the target of the use of the identifier
 - A link to the dependent base type member with the same name.

Author: lcartey

cpp/autosar/src/rules/M14-6-1/NameInDependentBase.qll

@@ -37,11 +37,10 @@ private FunctionCall helper_functioncall(
  * Gets a function call in `TemplateClass` `t` where the target function name exists in a dependent
  * base type and the call is to a function that is not declared in the dependent base type.
  */
-FunctionCall getConfusingFunctionCall(TemplateClass t) {
-  exists(
-    string name, TemplateClass dependentBaseType, MemberFunction dependentTypeFunction,
-    Function target
-  |
+FunctionCall getConfusingFunctionCall(
+  TemplateClass t, string name, Function target, MemberFunction dependentTypeFunction
+) {
+  exists(TemplateClass dependentBaseType |
     result = helper_functioncall(t, dependentBaseType, target, name) and
     // The dependentTypeFunction is declared on the dependent base type
     dependentBaseType.getAMember() = dependentTypeFunction and
@@ -70,11 +69,10 @@ private FunctionAccess helper_functionaccess(
  * Gets a function access in `TemplateClass` `t` where the target function name exists in a dependent
  * base type and the access is to a function declared outside the dependent base type.
  */
-FunctionAccess getConfusingFunctionAccess(TemplateClass t) {
-  exists(
-    string name, TemplateClass dependentBaseType, MemberFunction dependentTypeFunction,
-    Function target
-  |
+FunctionAccess getConfusingFunctionAccess(
+  TemplateClass t, string name, Function target, MemberFunction dependentTypeFunction
+) {
+  exists(TemplateClass dependentBaseType |
     result = helper_functionaccess(t, dependentBaseType, target, name) and
     dependentBaseType.getAMember() = dependentTypeFunction and
     name = dependentTypeFunction.getName()
@@ -101,11 +99,10 @@ private VariableAccess helper_memberaccess(
  * Gets a memmber access in `TemplateClass` `t` where the target member name exists in a dependent
  * base type and the access is to a variable declared outside the dependent base type.
  */
-VariableAccess getConfusingMemberVariableAccess(TemplateClass t) {
-  exists(
-    string name, TemplateClass dependentBaseType, MemberVariable dependentTypeMemberVariable,
-    Variable target
-  |
+VariableAccess getConfusingMemberVariableAccess(
+  TemplateClass t, string name, Variable target, MemberVariable dependentTypeMemberVariable
+) {
+  exists(TemplateClass dependentBaseType |
     result = helper_memberaccess(t, dependentBaseType, target, name) and
     dependentBaseType.getAMemberVariable() = dependentTypeMemberVariable and
     name = dependentTypeMemberVariable.getName()

cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.ql

@@ -18,20 +18,26 @@ import cpp
 import codingstandards.cpp.autosar
 import NameInDependentBase
 
-from TemplateClass c, NameQualifiableElement fn
+from
+  TemplateClass c, NameQualifiableElement fn, string targetName, Element actualTarget,
+  Element dependentTypeMemberWithSameName
 where
   not isExcluded(fn, TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisQuery()) and
   not isCustomExcluded(fn) and
   missingNameQualifier(fn) and
   (
-    fn = getConfusingFunctionAccess(c)
+    fn = getConfusingFunctionAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName)
     or
-    fn = getConfusingFunctionCall(c) and
+    fn = getConfusingFunctionCall(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
     not exists(Expr e | e = fn.(FunctionCall).getQualifier())
     or
     not fn.(VariableAccess).getTarget() instanceof Parameter and
-    fn = getConfusingMemberVariableAccess(c) and
+    fn =
+      getConfusingMemberVariableAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
     not exists(Expr e | e = fn.(VariableAccess).getQualifier())
   ) and
   not fn.isAffectedByMacro()
-select fn, "Use of identifier that also exists in a base class that is not fully qualified."
+select fn,
+  "Use of unqualified identifier " + targetName +
+    " targets $@ but a member with the name also exists $@.", actualTarget, targetName,
+  dependentTypeMemberWithSameName, "in the dependent base class"

cpp/autosar/src/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.ql

@@ -18,19 +18,25 @@ import cpp
 import codingstandards.cpp.autosar
 import NameInDependentBase
 
-from TemplateClass c, NameQualifiableElement fn
+from
+  TemplateClass c, NameQualifiableElement fn, string targetName, Element actualTarget,
+  Element dependentTypeMemberWithSameName
 where
   not isExcluded(fn, TemplatesPackage::nameNotReferredUsingAQualifiedIdOrThisAuditQuery()) and
   not isCustomExcluded(fn) and
   missingNameQualifier(fn) and
   (
-    fn = getConfusingFunctionAccess(c)
+    fn = getConfusingFunctionAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName)
     or
-    fn = getConfusingFunctionCall(c) and
+    fn = getConfusingFunctionCall(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
     not exists(Expr e | e = fn.(FunctionCall).getQualifier())
     or
     not fn.(VariableAccess).getTarget() instanceof Parameter and
-    fn = getConfusingMemberVariableAccess(c) and
+    fn =
+      getConfusingMemberVariableAccess(c, targetName, actualTarget, dependentTypeMemberWithSameName) and
     not exists(Expr e | e = fn.(VariableAccess).getQualifier())
   )
-select fn, "Use of identifier that also exists in a base class that is not fully qualified."
+select fn,
+  "Use of unqualified identifier " + targetName +
+    " targets $@ but a member with the name also exists $@.", actualTarget, targetName,
+  dependentTypeMemberWithSameName, "in the dependent base class"

cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThis.expected

@@ -1,3 +1,3 @@
-| test.cpp:16:5:16:5 | m | Use of identifier that also exists in a base class that is not fully qualified. |
-| test.cpp:17:5:17:5 | call to g | Use of identifier that also exists in a base class that is not fully qualified. |
-| test.cpp:19:20:19:20 | g | Use of identifier that also exists in a base class that is not fully qualified. |
+| test.cpp:16:5:16:5 | m | Use of unqualified identifier m targets $@ but a member with the name also exists $@. | test.cpp:4:5:4:5 | m | m | test.cpp:10:7:10:7 | m | in the dependent base class |
+| test.cpp:17:5:17:5 | call to g | Use of unqualified identifier g targets $@ but a member with the name also exists $@. | test.cpp:2:6:2:6 | g | g | test.cpp:9:8:9:8 | g | in the dependent base class |
+| test.cpp:19:20:19:20 | g | Use of unqualified identifier g targets $@ but a member with the name also exists $@. | test.cpp:2:6:2:6 | g | g | test.cpp:9:8:9:8 | g | in the dependent base class |

cpp/autosar/test/rules/M14-6-1/NameNotReferredUsingAQualifiedIdOrThisAudit.expected

@@ -1,3 +1,3 @@
-| test.cpp:16:5:16:5 | m | Use of identifier that also exists in a base class that is not fully qualified. |
-| test.cpp:17:5:17:5 | call to g | Use of identifier that also exists in a base class that is not fully qualified. |
-| test.cpp:19:20:19:20 | g | Use of identifier that also exists in a base class that is not fully qualified. |
+| test.cpp:16:5:16:5 | m | Use of unqualified identifier m targets $@ but a member with the name also exists $@. | test.cpp:4:5:4:5 | m | m | test.cpp:10:7:10:7 | m | in the dependent base class |
+| test.cpp:17:5:17:5 | call to g | Use of unqualified identifier g targets $@ but a member with the name also exists $@. | test.cpp:2:6:2:6 | g | g | test.cpp:9:8:9:8 | g | in the dependent base class |
+| test.cpp:19:20:19:20 | g | Use of unqualified identifier g targets $@ but a member with the name also exists $@. | test.cpp:2:6:2:6 | g | g | test.cpp:9:8:9:8 | g | in the dependent base class |