QL for QL: fix checking spelling of 'analyze' in multi-line comments

nickrolfe · nickrolfe · commit 2d246a403460 · 2022-05-11T17:43:39.000+01:00
`.` does not match a newline in `regexpMatch`, so we were missing some
comments.
diff --git a/ql/ql/src/codeql_ql/style/docs/NonUSSpellingQuery.qll b/ql/ql/src/codeql_ql/style/docs/NonUSSpellingQuery.qll
@@ -18,7 +18,7 @@ predicate contains_non_us_spelling(string s, string wrong, string right) {
     wrong != "analyse"
     or
     // analyses (as a noun) is fine
-    s.regexpMatch(".*analyse[^s].*") and
+    s.regexpReplaceAll("[\\r\\n]", " ").regexpMatch(".*analyse[^s].*") and
     wrong = "analyse"
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ predicate contains_non_us_spelling(string s, string wrong, string right) {`
`18`	`18`	`wrong != "analyse"`
`19`	`19`	`or`
`20`	`20`	`// analyses (as a noun) is fine`
`21`		`- s.regexpMatch(".analyse[^s].") and`
	`21`	`+ s.regexpReplaceAll("[\\r\\n]", " ").regexpMatch(".analyse[^s].") and`
`22`	`22`	`wrong = "analyse"`
`23`	`23`	`)`
`24`	`24`	`}`