From a358cb6733849d2f76071b9e174f8b0a95742e65 Mon Sep 17 00:00:00 2001
From: Lazaro Clapp <lazaro@uber.com>
Date: Mon, 8 Apr 2019 11:08:44 -0400
Subject: [PATCH] Fix merge conflict between PRs #300 and #295 (last two
 commits)

---
 nullaway/src/main/java/com/uber/nullaway/NullAway.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
index 1a087e3e1a..6bb3f4ab28 100644
--- a/nullaway/src/main/java/com/uber/nullaway/NullAway.java
+++ b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -507,7 +507,8 @@ public Description matchSwitch(SwitchTree tree, VisitorState state) {
     }
 
     if (mayBeNullExpr(state, switchExpression)) {
-      final String message = "switch expression " + switchExpression.toString() + " is @Nullable";
+      final String message =
+          "switch expression " + state.getSourceForNode(switchExpression) + " is @Nullable";
       ErrorMessage errorMessage =
           new ErrorMessage(MessageTypes.SWITCH_EXPRESSION_NULLABLE, message);