Merge pull request #8936 from jketema/camel-case

QL: Improve camel case query

Author: erik-krogh

ql/ql/src/codeql_ql/style/AcronymsShouldBeCamelCaseQuery.qll

@@ -68,5 +68,6 @@ predicate shouldBePascalCased(string name, AstNode node, string kind) {
   // allowed upper-case acronyms.
   not name.regexpMatch(".*(PEP|AES|DES|EOF).*") and
   not (name.regexpMatch("T[A-Z]{3}[^A-Z].*") and node instanceof NewTypeBranch) and
+  not (name.regexpMatch("T[A-Z]{3}[^A-Z].*") and node instanceof NewType) and
   not name.toUpperCase() = name // We are OK with fully-uppercase names.
 }

ql/ql/src/queries/style/AcronymsShouldBeCamelCase.ql

@@ -14,4 +14,4 @@ import codeql_ql.style.AcronymsShouldBeCamelCaseQuery
 
 from string name, AstNode node
 where shouldBePascalCased(name, node, _)
-select node, "Acronyms should be PascalCase/camelCase"
+select node, "Acronyms in " + name + " should be PascalCase/camelCase"

ql/ql/test/queries/style/AcronymsShouldBeCamelCase/AcronymsShouldBeCamelCase.expected

@@ -0,0 +1,3 @@
+| Test.qll:2:1:2:27 | ClasslessPredicate isXML | Acronyms in isXML should be PascalCase/camelCase |
+| Test.qll:8:1:10:15 | NewType TXMLElements | Acronyms in TXMLElements should be PascalCase/camelCase |
+| Test.qll:10:3:10:15 | NewTypeBranch TXMLElement | Acronyms in TXMLElement should be PascalCase/camelCase |

ql/ql/test/queries/style/AcronymsShouldBeCamelCase/AcronymsShouldBeCamelCase.qlref

@@ -0,0 +1 @@
+queries/style/AcronymsShouldBeCamelCase.ql

ql/ql/test/queries/style/AcronymsShouldBeCamelCase/Test.qll

@@ -0,0 +1,13 @@
+// BAD
+predicate isXML() { any() }
+
+// GOOD [ AES is exceptional ]
+predicate isAES() { any() }
+
+// BAD
+newtype TXMLElements =
+  TXmlElement() or // GOOD
+  TXMLElement() // BAD
+
+// GOOD
+newtype TIRFunction = MkIRFunction()