From 043c65b1d4934b5a4b290fa99d058f7013cc25bd Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 8 Oct 2014 18:54:49 +0400 Subject: [PATCH] Removed method which is not needed anymore --- .../plugin/quickfix/ImportInsertHelper.java | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index f302872e118..69aa05bb5ba 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -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);