copy flag to reformat when de-qualify

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

@@ -316,7 +316,6 @@ public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {
         PsiStatement elseBranch = ifStatement.getElseBranch();
         if (elseBranch == null) {
           anchorAfter = ifStatement;
-          CodeEditUtil.markToReformatBefore(PsiTreeUtil.getDeepestFirst(toInsert).getNode(), true);
         }
         else if (!(elseBranch instanceof PsiBlockStatement)) {
           emptyBlockStatement.getCodeBlock().add(elseBranch);

java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java

@@ -242,7 +242,15 @@ public class ReferenceAdjuster {
   private static void dequalifyImpl(@NotNull CompositeElement reference) {
     final ASTNode qualifier = reference.findChildByRole(ChildRole.QUALIFIER);
     if (qualifier != null) {
+      ASTNode firstChildNode = qualifier.getFirstChildNode();
+      boolean markToReformatBefore = firstChildNode instanceof TreeElement && CodeEditUtil.isMarkedToReformatBefore((TreeElement)firstChildNode);
       reference.deleteChildInternal(qualifier);
+      if (markToReformatBefore) {
+        firstChildNode = reference.getFirstChildNode();
+        if (firstChildNode != null) {
+          CodeEditUtil.markToReformatBefore(firstChildNode, true);
+        }
+      }
     }
   }
 

java/java-tests/testData/refactoring/introduceVariable/genericWithTwoParameters/after/Client.java

@@ -2,6 +2,6 @@ import util.Pair;
 
 class Client {
     void method() {
-        Pair<String,Pair<Integer,Boolean>> p = PairProvider.getPair();
+        Pair<String, Pair<Integer,Boolean>> p = PairProvider.getPair();
     }
 }