Rebase and fix error message dispatch

uber · Mar 29, 2019 · fee2c25 · fee2c25
1 parent c76e6f5
commit fee2c25
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -32,6 +32,7 @@
 
 import com.google.auto.service.AutoService;
 import com.google.auto.value.AutoValue;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -503,8 +504,10 @@ public Description matchMethod(MethodTree tree, VisitorState state) {
                 + " in "
                 + methodSymbol.toString()
                 + " (this issue can cause other errors below, wherever the var args array is dereferenced)";
-        return createErrorDescription(
-            MessageTypes.NULLABLE_VARARGS_UNSUPPORTED, tree, message, state.getPath());
+        return errorBuilder.createErrorDescription(
+            new ErrorMessage(MessageTypes.NULLABLE_VARARGS_UNSUPPORTED, message),
+            state.getPath(),
+            buildDescription(tree));
       }
     }
     return Description.NO_MATCH;
@@ -1314,8 +1317,8 @@ private Description handleInvocation(
         actual = actualParams.get(argPos);
         mayActualBeNull = mayBeNullExpr(state, actual);
       }
-      Preconditions.checkNotNull(
-          actual); // This statement should be unreachable without assigning actual beforehand
+      // This statement should be unreachable without assigning actual beforehand:
+      Preconditions.checkNotNull(actual);
       // make sure we are passing a non-null value
       if (mayActualBeNull) {
         String message =