From 7926554bd83a2a944b528c50571844cecae3c574 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Fri, 24 Nov 2017 10:23:39 +0100
Subject: [PATCH] restore comments: on demand -> single imports

---
 .../imports/ReplaceOnDemandImportIntention.java   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java
index 6d3e65bb45b3..22418c9bb5d7 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/imports/ReplaceOnDemandImportIntention.java
@@ -18,6 +18,7 @@ package com.siyeh.ipp.imports;
 import com.intellij.psi.*;
 import com.intellij.psi.util.ClassUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.siyeh.ig.psiutils.CommentTracker;
 import com.siyeh.ipp.base.Intention;
 import com.siyeh.ipp.base.PsiElementPredicate;
 import org.jetbrains.annotations.NotNull;
@@ -36,13 +37,10 @@ public class ReplaceOnDemandImportIntention extends Intention {
 
   protected void processIntention(@NotNull PsiElement element)
     throws IncorrectOperationException {
-    final PsiImportStatementBase importStatementBase =
-      (PsiImportStatementBase)element;
+    final PsiImportStatementBase importStatementBase = (PsiImportStatementBase)element;
     if (importStatementBase instanceof PsiImportStatement) {
-      final PsiImportStatement importStatement =
-        (PsiImportStatement)importStatementBase;
-      final PsiJavaFile javaFile =
-        (PsiJavaFile)importStatement.getContainingFile();
+      final PsiImportStatement importStatement = (PsiImportStatement)importStatementBase;
+      final PsiJavaFile javaFile = (PsiJavaFile)importStatement.getContainingFile();
       final PsiClass[] classes = javaFile.getClasses();
       final String qualifiedName = importStatement.getQualifiedName();
       final ClassCollector visitor = new ClassCollector(qualifiedName);
@@ -55,11 +53,10 @@ public class ReplaceOnDemandImportIntention extends Intention {
       final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
       final PsiElement importList = importStatement.getParent();
       for (PsiClass importedClass : importedClasses) {
-        final PsiImportStatement newImportStatement =
-          factory.createImportStatement(importedClass);
+        final PsiImportStatement newImportStatement = factory.createImportStatement(importedClass);
         importList.add(newImportStatement);
       }
-      importStatement.delete();
+      new CommentTracker().deleteAndRestoreComments(importStatement);
     }
     else if (importStatementBase instanceof PsiImportStaticStatement) {
       // do something else