EA-72085 - NPE: ChangeToAppendUtil.buildAppendExpression

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/util/ChangeToAppendUtil.java b/java/java-analysis-impl/src/com/intellij/codeInspection/util/ChangeToAppendUtil.java
index e1ee7a4885d6a64034270d1f43e728abc824eddd..9327bdfbded1c588b865f754febdf00598d83944 100644 (file)
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/util/ChangeToAppendUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/util/ChangeToAppendUtil.java
@@ -34,7 +34,8 @@ public class ChangeToAppendUtil {
   }
 
   @Nullable
-  public static StringBuilder buildAppendExpression(PsiExpression concatenation, boolean useStringValueOf, @NonNls StringBuilder out) {
+  public static StringBuilder buildAppendExpression(@Nullable PsiExpression concatenation, boolean useStringValueOf, @NonNls StringBuilder out) {
+    if (concatenation == null) return null;
     final PsiType type = concatenation.getType();
     if (concatenation instanceof PsiPolyadicExpression && type != null && type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
       final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)concatenation;

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeToAppend/beforeNoRExpr.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeToAppend/beforeNoRExpr.java
new file mode 100644 (file)
index 0000000..25a0df2
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeToAppend/beforeNoRExpr.java
@@ -0,0 +1,7 @@
+// "Change to 'builder.append()'" "false"
+class Test {
+  String s;
+  void bar(StringBuilder builder) {
+    buil<caret>der += ;
+  }
+}
\ No newline at end of file