Identifier Hidden: missed expeted for shared, generalize variable count check

Author: knewbury01

c/common/test/rules/identifierhidden/IdentifierHidden.expected

@@ -1,5 +1,5 @@
-| test.c:4:7:4:9 | id1 | Variable is hiding variable $@. | test.c:1:5:1:7 | id1 | id1 |
-| test.c:7:13:7:15 | id1 | Variable is hiding variable $@. | test.c:1:5:1:7 | id1 | id1 |
-| test.c:10:12:10:14 | id1 | Variable is hiding variable $@. | test.c:1:5:1:7 | id1 | id1 |
-| test.c:11:14:11:16 | id1 | Variable is hiding variable $@. | test.c:10:12:10:14 | id1 | id1 |
-| test.c:24:24:24:26 | id2 | Variable is hiding variable $@. | test.c:22:5:22:7 | id2 | id2 |
+| test.c:4:7:4:9 | id1 | Declaration is hiding declaration $@. | test.c:1:5:1:7 | id1 | id1 |
+| test.c:7:13:7:15 | id1 | Declaration is hiding declaration $@. | test.c:1:5:1:7 | id1 | id1 |
+| test.c:10:12:10:14 | id1 | Declaration is hiding declaration $@. | test.c:1:5:1:7 | id1 | id1 |
+| test.c:11:14:11:16 | id1 | Declaration is hiding declaration $@. | test.c:10:12:10:14 | id1 | id1 |
+| test.c:24:24:24:26 | id2 | Declaration is hiding declaration $@. | test.c:22:5:22:7 | id2 | id2 |

cpp/common/src/codingstandards/cpp/Scope.qll

@@ -80,6 +80,8 @@ class Scope extends Element {
 
   int getNumberOfVariables() { result = count(getAVariable()) }
 
+  int getNumberOfDeclarations() { result = count(getADeclaration()) }
+
   Scope getAnAncestor() { result = this.getStrictParent+() }
 
   Scope getStrictParent() { result = getParentScope(this) }
@@ -133,9 +135,9 @@ private UserDeclaration getPotentialScopeOfDeclaration_candidate(UserDeclaration
   exists(Scope s |
     result = s.getADeclaration() and
     (
-      // Declaration in an ancestor scope, but only if there are less than 100 variables in this scope
+      // Declaration in an ancestor scope, but only if there are less than 100 declarations in this scope
       v = s.getAnAncestor().getADeclaration() and
-      s.getNumberOfVariables() < 100
+      s.getNumberOfDeclarations() < 100
       or
       // In the same scope, but not the same Declaration, and choose just one to report
       v = s.getADeclaration() and
@@ -152,7 +154,7 @@ private UserDeclaration getOuterScopesOfDeclaration_candidate(UserDeclaration v)
     (
       // Declaration in an ancestor scope, but only if there are less than 100 variables in this scope
       v = s.getAnAncestor().getADeclaration() and
-      s.getNumberOfVariables() < 100
+      s.getNumberOfDeclarations() < 100
     )
   )
 }