Removed method which is not needed anymore
This commit is contained in:
@@ -18,9 +18,6 @@ package org.jetbrains.jet.plugin.quickfix;
|
||||
|
||||
import com.intellij.codeInsight.CodeInsightSettings;
|
||||
import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
|
||||
import com.intellij.openapi.editor.Document;
|
||||
import com.intellij.openapi.util.TextRange;
|
||||
import com.intellij.psi.*;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.lang.psi.*;
|
||||
import org.jetbrains.jet.lang.resolve.ImportPath;
|
||||
@@ -28,8 +25,6 @@ import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
|
||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||
import org.jetbrains.jet.lang.resolve.name.NamePackage;
|
||||
import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
|
||||
import org.jetbrains.jet.plugin.references.JetReference;
|
||||
import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
|
||||
import org.jetbrains.k2js.analyze.TopDownAnalyzerFacadeForJS;
|
||||
|
||||
import java.util.List;
|
||||
@@ -55,46 +50,6 @@ public class ImportInsertHelper {
|
||||
addImportDirectiveIfNeeded(importFqn, file, true);
|
||||
}
|
||||
|
||||
public static void addImportDirectiveOrChangeToFqName(
|
||||
@NotNull FqName importFqn,
|
||||
@NotNull JetFile file,
|
||||
int refOffset,
|
||||
@NotNull PsiElement targetElement) {
|
||||
PsiReference reference = file.findReferenceAt(refOffset);
|
||||
if (reference instanceof JetReference) {
|
||||
PsiElement target = reference.resolve();
|
||||
if (target != null) {
|
||||
boolean same = file.getManager().areElementsEquivalent(target, targetElement);
|
||||
|
||||
if (!same) {
|
||||
same = target instanceof PsiClass && importFqn.asString().equals(((PsiClass)target).getQualifiedName());
|
||||
}
|
||||
|
||||
if (!same) {
|
||||
if (target instanceof PsiMethod) {
|
||||
PsiMethod method = (PsiMethod) target;
|
||||
same = (method.isConstructor() && file.getManager().areElementsEquivalent(method.getContainingClass(), targetElement));
|
||||
}
|
||||
}
|
||||
|
||||
if (!same) {
|
||||
if (target instanceof JetObjectDeclarationName) {
|
||||
same = file.getManager().areElementsEquivalent(target.getParent(), targetElement);
|
||||
}
|
||||
}
|
||||
|
||||
if (!same) {
|
||||
Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(file);
|
||||
assert document != null;
|
||||
TextRange refRange = reference.getElement().getTextRange();
|
||||
document.replaceString(refRange.getStartOffset(), refRange.getEndOffset(), IdeDescriptorRenderers.SOURCE_CODE.renderFqName(importFqn));
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
addImportDirectiveIfNeeded(importFqn, file);
|
||||
}
|
||||
|
||||
public static void addImportDirectiveIfNeeded(@NotNull ImportPath importPath, @NotNull JetFile file, boolean optimize) {
|
||||
if (optimize) {
|
||||
optimizeImportsIfNeeded(file);
|
||||
|
||||
Reference in New Issue
Block a user