Fix query formats

Author: MichaelRFairhurst

c/common/src/codingstandards/c/Generic.qll

@@ -10,7 +10,6 @@ string deparenthesize(string input) {
   result = input.substring(1, input.length() - 1)
 }
 
-
 class GenericMacro extends Macro {
   string ctrlExpr;
 
@@ -61,9 +60,7 @@ class ParsedGenericMacro extends Macro {
     )
   }
 
-  string getAParameter() {
-    result = this.(FunctionLikeMacro).getAParameter()
-  }
+  string getAParameter() { result = this.(FunctionLikeMacro).getAParameter() }
 
   int getAParsedGenericCommaSeparatorOffset() {
     exists(ParsedText text |
@@ -118,9 +115,7 @@ class ParsedGenericMacro extends Macro {
     )
   }
 
-  string getControllingExprString() {
-    result = getSelectionString(1)
-  }
+  string getControllingExprString() { result = getSelectionString(1) }
 
   bindingset[str, word]
   private int countWordInString(string word, string str) {
@@ -152,4 +147,4 @@ class ParsedGenericMacro extends Macro {
     not idx = 0 and
     result = expansionsInsideSelection(parameter, idx + 1)
   }
-}
+}

c/misra/src/rules/RULE-23-1/GenericSelectionNotExpandedFromAMacro.ql

@@ -18,8 +18,6 @@ from C11GenericExpr generic, Expr ctrlExpr
 where
   not isExcluded(generic, GenericsPackage::genericSelectionNotExpandedFromAMacroQuery()) and
   ctrlExpr = generic.getControllingExpr() and
-  not exists(MacroInvocation mi |
-    mi.getAGeneratedElement() = generic.getExpr()
-  )
+  not exists(MacroInvocation mi | mi.getAGeneratedElement() = generic.getExpr())
 select generic, "Generic expression with controlling expression $@ is not expanded froma macro",
-ctrlExpr, ctrlExpr.toString() 
+  ctrlExpr, ctrlExpr.toString()

c/misra/src/rules/RULE-23-2/GenericSelectionNotFromMacroWithSideEffects.ql

@@ -84,4 +84,4 @@ where
   not isExcluded(res.getPrimaryElement(),
     GenericsPackage::genericSelectionNotFromMacroWithSideEffectsQuery())
 select res.getPrimaryElement(), res.getMessage(), res.getOptionalPlaceholderLocatable(),
-  res.getOptionalPlaceholderMessage()
+  res.getOptionalPlaceholderMessage()

c/misra/src/rules/RULE-23-3/GenericWithoutNonDefaultAssociation.ql

@@ -31,5 +31,6 @@ where
   not exists(Type t |
     t = generic.getAnAssociationType() and
     not t instanceof VoidType
-  ) and primaryElement = MacroUnwrapper<InvalidGeneric>::unwrapElement(generic)
+  ) and
+  primaryElement = MacroUnwrapper<InvalidGeneric>::unwrapElement(generic)
 select primaryElement, "Generic selection contains no non-default association."

c/misra/src/rules/RULE-23-4/GenericAssociationWithUnselectableType.ql

@@ -20,10 +20,10 @@ import codingstandards.cpp.alertreporting.DeduplicateMacroResults
 
 /**
  * Check if a type contains an unmatchable anonymous struct or union.
- * 
+ *
  * Anonymous structs and unions are only equal to themselves. So any anonymous struct, or compound
  * type containing an anonymous struct, is unmatchable.
- * 
+ *
  * However, there is an exception if the anonymous struct is behind a typedef. All uses of that
  * typedef will resolve to the same anonymous struct, and so the typedef is matchable.
  */

c/misra/src/rules/RULE-23-6/GenericExpressionWithIncorrectEssentialType.ql

@@ -57,6 +57,6 @@ where
     )
   )
 select generic,
-  "Controlling expression in generic " + extraMessage +
-    "has standard type " + ctrlType.toString() + ", which doesn't match its essential type " +
-    ctrlEssentialType.toString() + ".", extraElement, extraString
+  "Controlling expression in generic " + extraMessage + "has standard type " + ctrlType.toString() +
+    ", which doesn't match its essential type " + ctrlEssentialType.toString() + ".", extraElement,
+  extraString

c/misra/src/rules/RULE-23-8/DefaultGenericSelectionNotFirstOrLast.ql

@@ -53,13 +53,15 @@ module GenericMisplacedDefaultReportConfig implements
   bindingset[description]
   string getMessageSameResultInAllExpansions(Macro m, string description) {
     result =
-      "Generic macro " + m.getName() + " has default as " + description + " association, which is not first or last."
+      "Generic macro " + m.getName() + " has default as " + description +
+        " association, which is not first or last."
   }
 
   /* Create a message to describe this macro, using '$@' to describe an example `ResultElement`. */
   string getMessageVariedResultInAllExpansions(Macro m) {
     result =
-      "Generic macro " + m.getName() + " has a default association which is not first or last, for example $@."
+      "Generic macro " + m.getName() +
+        " has a default association which is not first or last, for example $@."
   }
 
   /**
@@ -68,7 +70,8 @@ module GenericMisplacedDefaultReportConfig implements
    */
   string getMessageResultInIsolatedExpansion(GenericWithMisplacedDefault element) {
     result =
-      "Generic macro $@, in this expansion, has default as " + describe(element) + " association, which is not first or last."
+      "Generic macro $@, in this expansion, has default as " + describe(element) +
+        " association, which is not first or last."
   }
 
   /**

c/misra/src/rules/RULE-8-3/DeclarationsOfAFunctionSameNameAndType.ql

@@ -25,15 +25,19 @@ where
   //return type check
   (
     not FunctionDeclarationTypeEquivalence<TypeNamesMatchConfig>::equalReturnTypes(f1, f2) and
-    case = "return type" and pluralDo = "does"
+    case = "return type" and
+    pluralDo = "does"
     or
     //parameter type check
     not FunctionDeclarationTypeEquivalence<TypeNamesMatchConfig>::equalParameterTypes(f1, f2) and
-    case = "parameter types" and pluralDo = "do"
+    case = "parameter types" and
+    pluralDo = "do"
     or
     //parameter name check
     parameterNamesUnmatched(f1, f2) and
-    case = "parameter names" and pluralDo = "do"
+    case = "parameter names" and
+    pluralDo = "do"
   )
-select f1, "The " + case + " of re-declaration of $@ " + pluralDo + " not use the same type names as declaration $@", f1,
-  f1.getName(), f2, f2.getName()
+select f1,
+  "The " + case + " of re-declaration of $@ " + pluralDo +
+    " not use the same type names as declaration $@", f1, f1.getName(), f2, f2.getName()

c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql

@@ -52,5 +52,5 @@ where
     decl2.getType())
 select decl1,
   "The object $@ of type " + decl1.getType().toString() +
-    " does not use the same type names as re-declaration $@ of type " + decl2.getType().toString(), decl1,
-  decl1.getName(), decl2, decl2.getName()
+    " does not use the same type names as re-declaration $@ of type " + decl2.getType().toString(),
+  decl1, decl1.getName(), decl2, decl2.getName()