update the query

Author: erik-krogh

ql/ql/src/queries/style/ConsistentAlertMessage.ql

@@ -19,32 +19,30 @@ string getMessage(Select sel) {
     ).trim()
 }
 
-Select getSelectForQuery(string id, string lang, string msg, string kind) {
+int parts(Select sel) { result = strictcount(String e | e.getParent*() = sel.getExpr(_)) }
+
+Select getSelectForQuery(string id, string lang, string msg, string kind, int parts) {
   exists(File file, QLDoc doc | result.getLocation().getFile() = file |
     any(TopLevel top | top.getLocation().getFile() = file).getQLDoc() = doc and
     id = doc.getContents().regexpCapture("(?s).*@id (\\w+)/([\\w\\-]+)\\s.*", 2) and
     lang = doc.getContents().regexpCapture("(?s).*@id (\\w+)/([\\w\\-]+)\\s.*", 1) and
     kind = doc.getContents().regexpCapture("(?s).*@kind (\\w+)\\s.*", 1) and // enforcing the same kind.
-    msg = getMessage(result)
+    msg = getMessage(result) and
+    parts = parts(result)
   ) and
   // excluding experimetnal
   not result.getLocation().getFile().getRelativePath().matches("%/experimental/%")
 }
 
-from
-  string thisLang, string otherLang, string thisMsg, string otherMsg, Select thisSel,
-  Select otherSel, string id, string kind
+from Select sel, string id, string lang, string msg, string kind, int parts, string badLangs
 where
-  thisLang != otherLang and
-  thisMsg != otherMsg and
-  thisSel = getSelectForQuery(id, thisLang, thisMsg, kind) and
-  otherSel = getSelectForQuery(id, otherLang, otherMsg, kind) and
-  thisLang = "js"
-// TODO: summarize the langs in the msg.
-// TODO: Also select on the number of string constants in the select, to remove queries that contain more/less info.
-select thisSel, id + " $@", otherSel, otherLang // TODO: Tmp, makes bulk-fixing easier.
-/*
- *  "The " + id + " query in " + thisLang + " does not have the same alert message as in $@.",
- *  otherSel, otherLang
- */
-
+  sel = getSelectForQuery(id, lang, msg, kind, parts) and
+  badLangs =
+    strictconcat(string bad |
+      bad != lang and
+      exists(getSelectForQuery(id, bad, any(string otherMsg | otherMsg != msg), kind, parts))
+    |
+      bad, ", "
+    )
+select sel,
+  "The " + lang + "/" + id + " query does not have the same alert message as " + badLangs + "."