Java: Add Expr.isParenthesized, adjust VarAccess.toString, and fix tests.

Author: aschackmull

java/ql/src/Complexity/ComplexCondition.ql

@@ -13,7 +13,10 @@ import java
 
 predicate nontrivialLogicalOperator(BinaryExpr e) {
   e instanceof LogicExpr and
-  not e.getParent().(Expr).getKind() = e.getKind()
+  (
+    not e.getParent().(Expr).getKind() = e.getKind() or
+    e.isParenthesized()
+  )
 }
 
 Expr getSimpleParent(Expr e) {

java/ql/src/semmle/code/java/Expr.qll

@@ -95,6 +95,9 @@ class Expr extends ExprParent, @expr {
     or
     exists(LambdaExpr lam | lam.asMethod() = getEnclosingCallable() and lam.isInStaticContext())
   }
+
+  /** Holds if this expression is parenthesized. */
+  predicate isParenthesized() { isParenthesized(this, _) }
 }
 
 /**
@@ -1330,7 +1333,11 @@ class VarAccess extends Expr, @varaccess {
 
   /** Gets a printable representation of this expression. */
   override string toString() {
-    result = this.getQualifier().toString() + "." + this.getVariable().getName()
+    exists(Expr q | q = this.getQualifier() |
+      if q.isParenthesized()
+      then result = "(...)." + this.getVariable().getName()
+      else result = q.toString() + "." + this.getVariable().getName()
+    )
     or
     not this.hasQualifier() and result = this.getVariable().getName()
   }

java/ql/test/library-tests/constants/CompileTimeConstantExpr.expected

@@ -7,10 +7,8 @@
 | constants/Constants.java:15:15:15:37 | ... + ... |
 | constants/Constants.java:15:37:15:37 | 1 |
 | constants/Constants.java:16:23:16:41 | Initializers.SFIELD |
-| constants/Constants.java:18:15:18:18 | (...) |
 | constants/Constants.java:18:16:18:17 | 12 |
 | constants/Constants.java:19:19:19:28 | "a string" |
-| constants/Constants.java:20:17:20:23 | (...) |
 | constants/Constants.java:20:17:20:31 | ...?...:... |
 | constants/Constants.java:20:18:20:18 | 3 |
 | constants/Constants.java:20:18:20:22 | ... < ... |

java/ql/test/library-tests/constants/getIntValue.expected

@@ -31,7 +31,7 @@
 | constants/Values.java:67:27:67:33 | ... & ... | 42 |
 | constants/Values.java:68:26:68:32 | ... \| ... | 42 |
 | constants/Values.java:69:27:69:33 | ... ^ ... | 42 |
-| constants/Values.java:83:19:83:22 | (...) | 42 |
+| constants/Values.java:83:20:83:21 | 42 | 42 |
 | constants/Values.java:86:25:86:35 | final_field | 42 |
 | constants/Values.java:87:33:87:34 | 42 | 42 |
 | constants/Values.java:88:25:88:35 | final_local | 42 |

java/ql/test/query-tests/Nullness/NullExprDeref.expected

@@ -1 +1 @@
-| ExprDeref.java:7:12:7:34 | (...) | This expression is dereferenced and may be null. |
+| ExprDeref.java:7:13:7:33 | ...?...:... | This expression is dereferenced and may be null. |