Skip to content

Commit

Permalink
Fix merge conflict between the two latest commits (#302)
Browse files Browse the repository at this point in the history
PR #300 introduces a code pattern that is linted against after #295.
  • Loading branch information
lazaroclapp committed Apr 8, 2019
1 parent 26b3f55 commit 244a587
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion nullaway/src/main/java/com/uber/nullaway/NullAway.java
Expand Up @@ -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);

Expand Down

0 comments on commit 244a587

Please sign in to comment.