Merge pull request github#104 from github/rc/2.9

jsinglet · web-flow · commit 231140d1dacd · 2022-10-20T14:36:10.000-04:00
2.9 Mergeback
diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
@@ -1,4 +1,4 @@
 name: cert-c-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 suites: codeql-suites
 libraryPathDependencies: common-c-coding-standards
diff --git a/c/cert/test/qlpack.yml b/c/cert/test/qlpack.yml
@@ -1,4 +1,4 @@
 name: cert-c-coding-standards-tests
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: cert-c-coding-standards
 extractor: cpp
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
@@ -1,3 +1,3 @@
 name: common-c-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: common-cpp-coding-standards
diff --git a/c/common/test/qlpack.yml b/c/common/test/qlpack.yml
@@ -1,4 +1,4 @@
 name: common-c-coding-standards-tests
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: common-c-coding-standards
 extractor: cpp
diff --git a/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.expected b/c/common/test/rules/notdistinctidentifier/NotDistinctIdentifier.expected
@@ -1,4 +1,4 @@
-| test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | External identifer iltiqzxgfqsgigwfuyntzghvzltueeeB is nondistinct in characters at or over 31 limit, compared to iltiqzxgfqsgigwfuyntzghvzltueeeA |
-| test.c:5:5:5:35 | iltiqzxgfqsgigwfuyntzghvzltueea | test.c:4:5:4:36 | iltiqzxgfqsgigwfuyntzghvzltueeaZ | External identifer iltiqzxgfqsgigwfuyntzghvzltueea is nondistinct in characters at or over 31 limit, compared to iltiqzxgfqsgigwfuyntzghvzltueeaZ |
-| test.c:8:5:8:35 | iltiqzxgfqsgigwfuyntzghvzltueee | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | External identifer iltiqzxgfqsgigwfuyntzghvzltueee is nondistinct in characters at or over 31 limit, compared to iltiqzxgfqsgigwfuyntzghvzltueeeA |
-| test.c:8:5:8:35 | iltiqzxgfqsgigwfuyntzghvzltueee | test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | External identifer iltiqzxgfqsgigwfuyntzghvzltueee is nondistinct in characters at or over 31 limit, compared to iltiqzxgfqsgigwfuyntzghvzltueeeB |
+| test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | External identifer iltiqzxgfqsgigwfuyntzghvzltueeeB is nondistinct in characters at or over 31 limit, compared to $@ | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | iltiqzxgfqsgigwfuyntzghvzltueeeA |
+| test.c:5:5:5:35 | iltiqzxgfqsgigwfuyntzghvzltueea | External identifer iltiqzxgfqsgigwfuyntzghvzltueea is nondistinct in characters at or over 31 limit, compared to $@ | test.c:4:5:4:36 | iltiqzxgfqsgigwfuyntzghvzltueeaZ | iltiqzxgfqsgigwfuyntzghvzltueeaZ |
+| test.c:8:5:8:35 | iltiqzxgfqsgigwfuyntzghvzltueee | External identifer iltiqzxgfqsgigwfuyntzghvzltueee is nondistinct in characters at or over 31 limit, compared to $@ | test.c:1:5:1:36 | iltiqzxgfqsgigwfuyntzghvzltueeeA | iltiqzxgfqsgigwfuyntzghvzltueeeA |
+| test.c:8:5:8:35 | iltiqzxgfqsgigwfuyntzghvzltueee | External identifer iltiqzxgfqsgigwfuyntzghvzltueee is nondistinct in characters at or over 31 limit, compared to $@ | test.c:2:5:2:36 | iltiqzxgfqsgigwfuyntzghvzltueeeB | iltiqzxgfqsgigwfuyntzghvzltueeeB |
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
@@ -1,4 +1,4 @@
 name: misra-c-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 suites: codeql-suites
 libraryPathDependencies: common-c-coding-standards
diff --git a/c/misra/test/qlpack.yml b/c/misra/test/qlpack.yml
@@ -1,4 +1,4 @@
 name: misra-c-coding-standards-tests
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: misra-c-coding-standards
 extractor: cpp
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
@@ -1,4 +1,4 @@
 name: autosar-cpp-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 suites: codeql-suites
 libraryPathDependencies: common-cpp-coding-standards
diff --git a/cpp/autosar/test/qlpack.yml b/cpp/autosar/test/qlpack.yml
@@ -1,4 +1,4 @@
 name: autosar-cpp-coding-standards-tests
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: autosar-cpp-coding-standards
 extractor: cpp
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
@@ -1,4 +1,4 @@
 name: cert-cpp-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 suites: codeql-suites
 libraryPathDependencies: common-cpp-coding-standards
diff --git a/cpp/cert/test/qlpack.yml b/cpp/cert/test/qlpack.yml
@@ -1,4 +1,4 @@
 name: cert-cpp-coding-standards-tests
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: cert-cpp-coding-standards
 extractor: cpp
diff --git a/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll b/cpp/common/src/codingstandards/cpp/rules/notdistinctidentifier/NotDistinctIdentifier.qll
@@ -32,14 +32,17 @@ abstract class NotDistinctIdentifierSharedQuery extends Query { }
 
 Query getQuery() { result instanceof NotDistinctIdentifierSharedQuery }
 
-query predicate problems(ExternalIdentifiers d, ExternalIdentifiers d2, string message) {
-  not isExcluded(d, getQuery()) and
+query predicate problems(
+  ExternalIdentifiers d, string message, ExternalIdentifiers d2, string nameplaceholder
+) {
   not isExcluded(d, getQuery()) and
+  not isExcluded(d2, getQuery()) and
   not d = d2 and
   d.getLocation().getStartLine() >= d2.getLocation().getStartLine() and
   d.getSignificantName() = d2.getSignificantName() and
   not d.getName() = d2.getName() and
+  nameplaceholder = d2.getName() and
   message =
     "External identifer " + d.getName() +
-      " is nondistinct in characters at or over 31 limit, compared to " + d2.getName()
+      " is nondistinct in characters at or over 31 limit, compared to $@"
 }
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
@@ -1,3 +1,3 @@
 name: common-cpp-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: codeql-cpp
diff --git a/cpp/common/test/qlpack.yml b/cpp/common/test/qlpack.yml
@@ -1,4 +1,4 @@
 name: common-cpp-coding-standards-tests
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: common-cpp-coding-standards
 extractor: cpp
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
@@ -1,3 +1,3 @@
 name: misra-cpp-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: common-cpp-coding-standards
diff --git a/cpp/misra/test/qlpack.yml b/cpp/misra/test/qlpack.yml
@@ -1,4 +1,4 @@
 name: misra-cpp-coding-standards-tests
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: misra-cpp-coding-standards
 extractor: cpp
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
@@ -1,3 +1,3 @@
 name: report-cpp-coding-standards
-version: 2.9.0-dev
+version: 2.9.0
 libraryPathDependencies: codeql-cpp
