"Initialize variable" leads to an exception on invalid code IDEA-181272

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java

@@ -7,6 +7,7 @@ import com.intellij.codeInsight.lookup.ExpressionLookupItem;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.template.*;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
@@ -22,6 +23,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 public class AddVariableInitializerFix implements IntentionAction {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.AddReturnFix");
@@ -48,8 +50,7 @@ public class AddVariableInitializerFix implements IntentionAction {
     return myVariable.isValid() &&
            myVariable.getManager().isInProject(myVariable) &&
            !myVariable.hasInitializer() &&
-           !(myVariable instanceof PsiParameter)
-        ;
+           !(myVariable instanceof PsiParameter);
   }
 
   @NotNull
@@ -65,6 +66,8 @@ public class AddVariableInitializerFix implements IntentionAction {
     LOG.assertTrue(suggestedInitializers[0] instanceof ExpressionLookupItem);
     final PsiExpression initializer = (PsiExpression)suggestedInitializers[0].getObject();
     myVariable.setInitializer(initializer);
+    Document document = Objects.requireNonNull(PsiDocumentManager.getInstance(project).getDocument(file));
+    PsiDocumentManager.getInstance(initializer.getProject()).doPostponedOperationsAndUnblockDocument(document);
     runAssignmentTemplate(Collections.singletonList(myVariable.getInitializer()), suggestedInitializers, editor);
   }
 
@@ -75,7 +78,6 @@ public class AddVariableInitializerFix implements IntentionAction {
     LOG.assertTrue(!initializers.isEmpty());
     final PsiExpression initializer = ObjectUtils.notNull(ContainerUtil.getFirstItem(initializers));
     PsiElement context = initializers.size() == 1 ? initializer : PsiTreeUtil.findCommonParent(initializers);
-    PsiDocumentManager.getInstance(initializer.getProject()).doPostponedOperationsAndUnblockDocument(editor.getDocument());
     final TemplateBuilderImpl builder = (TemplateBuilderImpl)TemplateBuilderFactory.getInstance().createTemplateBuilder(context);
     for (PsiExpression e : initializers) {
       builder.replaceElement(e, new Expression() {

java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java

@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.FileModificationService;
@@ -23,6 +9,7 @@ import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.ide.util.MemberChooser;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
@@ -36,10 +23,7 @@ import com.intellij.util.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 public class InitializeFinalFieldInConstructorFix implements IntentionAction {
   private static final Logger LOG = Logger.getInstance(InitializeFinalFieldInConstructorFix.class);
@@ -105,6 +89,8 @@ public class InitializeFinalFieldInConstructorFix implements IntentionAction {
     for (PsiMethod constructor : constructors) {
       rExpressions.add(addFieldInitialization(constructor, suggestedInitializers, field, project));
     }
+    Document doc = Objects.requireNonNull(PsiDocumentManager.getInstance(project).getDocument(field.getContainingFile()));
+    PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(doc);
     AddVariableInitializerFix.runAssignmentTemplate(rExpressions, suggestedInitializers, editor);
   }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addVariableInitializer/afterInvalidCode.java

@@ -0,0 +1,5 @@
+// "Initialize variable 'X'" "true"
+interface  Foo {
+  char X = 0;
+  int a = X;
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addVariableInitializer/beforeInvalidCode.java

@@ -0,0 +1,5 @@
+// "Initialize variable 'X'" "true"
+interface  Foo {
+  char X.Y;
+  int a = <caret>X;
+}