restore comments: on demand -> single imports

This commit is contained in:
Anna.Kozlova
2017-11-24 11:34:19 +01:00
parent 9975704b78
commit 7926554bd8
@@ -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