From a3f546c6f93798d8be1b2db1ed9409b2003548a2 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 27 Jan 2015 14:29:06 +0300 Subject: [PATCH] Moved classes to other packages --- .../kotlin/idea/references/JetSimpleNameReference.kt | 2 +- .../kotlin/idea/{quickfix => util}/ImportInsertHelper.kt | 2 +- .../kotlin/idea/{codeInsight => util}/ShortenReferences.kt | 4 ++-- idea/src/META-INF/plugin.xml | 4 ++-- .../idea/actions/JetAddFunctionToClassifierAction.java | 2 +- .../org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt | 2 +- .../idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt | 2 +- .../codeInsight/KotlinShortenReferencesRefactoringHelper.kt | 1 + .../idea/codeInsight/OverrideImplementMethodsHandler.java | 1 + .../codeInsight/surroundWith/MoveDeclarationsOutHelper.java | 2 +- .../expression/KotlinRuntimeTypeCastSurrounder.kt | 2 +- .../jetbrains/kotlin/idea/completion/CompletionSorting.kt | 2 +- .../idea/completion/handlers/KotlinCallableInsertHandler.kt | 4 ++-- .../idea/completion/handlers/KotlinClassInsertHandler.kt | 2 +- idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt | 2 +- .../jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt | 2 +- .../idea/intentions/ConvertAssertToIfWithThrowIntention.kt | 2 +- .../idea/intentions/ConvertFunctionToPropertyIntention.kt | 3 +-- .../idea/intentions/ConvertIfWithThrowToAssertIntention.kt | 2 +- .../kotlin/idea/intentions/InsertExplicitTypeArguments.kt | 2 +- .../idea/intentions/MakeTypeExplicitInLambdaIntention.kt | 2 +- .../idea/intentions/ReconstructTypeInCastOrIsAction.java | 2 +- .../kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java | 2 +- idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt | 2 +- .../idea/intentions/declarations/DeclarationUtils.java | 2 +- .../idea/liveTemplates/KotlinShortenFQNamesProcessor.kt | 2 +- .../jetbrains/kotlin/idea/quickfix/CastExpressionFix.java | 2 +- .../kotlin/idea/quickfix/ChangeAccessorTypeFix.java | 2 +- .../idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java | 2 +- .../kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java | 2 +- .../idea/quickfix/ChangeMemberFunctionSignatureFix.java | 2 +- .../kotlin/idea/quickfix/ChangeParameterTypeFix.java | 2 +- .../org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java | 2 +- .../kotlin/idea/quickfix/ChangeVariableTypeFix.java | 2 +- .../createFromUsage/callableBuilder/CallableBuilder.kt | 2 +- .../kotlin/idea/refactoring/extractFunction/extractorUtil.kt | 2 +- .../idea/refactoring/inline/KotlinInlineValHandler.java | 2 +- .../introduceVariable/KotlinIntroduceVariableHandler.java | 2 +- .../org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt | 2 +- .../kotlin/idea/{quickfix => util}/ImportInsertHelperImpl.kt | 5 +++-- idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt | 2 +- .../org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt | 2 +- .../evaluate/AbstractEditorForEvaluateExpressionTest.kt | 2 +- .../kotlin/idea/imports/OptimizeImportsOnFlyTest.java | 2 +- .../kotlin/idea/quickfix/ImportClassHelperTest.java | 1 + .../jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt | 2 +- 46 files changed, 51 insertions(+), 48 deletions(-) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/{quickfix => util}/ImportInsertHelper.kt (98%) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/{codeInsight => util}/ShortenReferences.kt (99%) rename idea/src/org/jetbrains/kotlin/idea/{quickfix => util}/ImportInsertHelperImpl.kt (99%) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt index d2ad8587f38..aabac146cd6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt @@ -22,7 +22,7 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.refactoring.fqName.changeQualifiedName import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.kotlin.psi.psiUtil.getOutermostNonInterleavingQualifiedElement diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelper.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt index bd83ead729d..c0e83f06af0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelper.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.quickfix +package org.jetbrains.kotlin.idea.util import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/ShortenReferences.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt index c3b253341e2..eac38df488e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.codeInsight +package org.jetbrains.kotlin.idea.util import com.intellij.psi.PsiElement; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper; +import org.jetbrains.kotlin.idea.util.ImportInsertHelper; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.util.TextRange diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 15c60da75b8..1c5ff96787d 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -142,8 +142,8 @@ - + diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java index 5bccf74904a..9677222e128 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.Modality; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetClassBody; diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt index 7312eeb7d75..6a8233283b4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt @@ -30,7 +30,7 @@ import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiElement import com.intellij.util.PlatformIcons import org.jetbrains.kotlin.idea.JetBundle -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetSimpleNameExpression diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 57c1b0fe345..5648a912f79 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.codeInsight.editorActions.ReferenceTransferableData import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.name.FqName import com.intellij.openapi.project.Project import com.intellij.openapi.util.Ref diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinShortenReferencesRefactoringHelper.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinShortenReferencesRefactoringHelper.kt index b5bba119f62..5fba82c9215 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinShortenReferencesRefactoringHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinShortenReferencesRefactoringHelper.kt @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.idea.codeInsight.shorten.prepareElementsToShorten import org.jetbrains.kotlin.idea.codeInsight.shorten.withElementsToShorten +import org.jetbrains.kotlin.idea.util.ShortenReferences public class KotlinShortenReferencesRefactoringHelper: RefactoringHelper { override fun prepareOperation(usages: Array?): Any? { diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java index 11cf1f6c93b..e8647aca092 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.quickfix.QuickfixPackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java index 15f04d88766..b61678f9775 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt index 0c6564136f4..cb79d3a2ac9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinRuntimeTypeEvaluator import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.resolve.DescriptorUtils diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt index 9739becd04b..ad06e2f4208 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt @@ -37,7 +37,7 @@ import com.intellij.psi.PsiClass import java.util.HashSet import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt index a29855baa22..cf9cae1b196 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt @@ -29,7 +29,7 @@ import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import com.intellij.openapi.editor.Document import org.jetbrains.kotlin.types.JetType import com.intellij.openapi.util.TextRange @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt index 27d04a9b759..40f5a6852c7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.InsertionContext import com.intellij.codeInsight.lookup.LookupElement import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.completion.DeclarationDescriptorLookupObject import org.jetbrains.kotlin.descriptors.ClassDescriptor import com.intellij.psi.PsiClass diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt index 2ffaf781c20..fb8d23b97f8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt @@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.completion.InsertionContext import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import java.util.HashSet import com.intellij.codeInsight.lookup.LookupElementDecorator import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt index 5ead5152afe..2afc2c3792a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.* import org.jetbrains.kotlin.idea.references.JetReference import java.util.HashSet import java.util.ArrayList -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class KotlinImportOptimizer() : ImportOptimizer { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt index ac823c359af..3a452867d26 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPrefixExpression -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.psi.JetCallableReferenceExpression import org.jetbrains.kotlin.resolve.DescriptorUtils import kotlin.properties.Delegates diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt index 77f452b079f..839f246182a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt @@ -37,7 +37,6 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch import org.jetbrains.kotlin.psi.JetCallElement import java.util.ArrayList import com.intellij.openapi.util.text.StringUtil -import com.intellij.refactoring.util.RefactoringUIUtil import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import com.intellij.psi.PsiMethod @@ -55,12 +54,12 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.idea.util.supertypes import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.idea.refactoring.reportDeclarationConflict import org.jetbrains.kotlin.idea.refactoring.getContainingScope import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil +import org.jetbrains.kotlin.idea.util.ShortenReferences public class ConvertFunctionToPropertyIntention : JetSelfTargetingIntention( "convert.function.to.property.intention", javaClass() diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt index f7c42f56298..8911ad6207c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPrefixExpression -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.idea.intentions.branchedTransformations.extractExpressionIfSingle diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt index 910891b1166..ce4b233137e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.types.ErrorUtils -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetTypeArgumentList import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt index d975d523e03..dec62aa89f5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java index 3d8880d17fa..9d7909854af 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java @@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java index 0af61475d42..44f45e71064 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt index 566adeb230c..decc9089585 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.JetNodeTypes import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java index 65152c95c75..ed32b8f8ce5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt index cf7e594be7f..5de1ecf3d14 100644 --- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.RangeMarker import com.intellij.openapi.editor.Editor import com.intellij.codeInsight.CodeInsightBundle import com.intellij.psi.PsiDocumentManager -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import com.intellij.psi.util.PsiUtilBase import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java index 970524d9247..b6b26cef25f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java index 2a4aa9541aa..26fce42cd4d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java @@ -24,7 +24,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java index d7142b94068..dda97723adc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java index c2db4984bc9..637a83f539e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java index 7c185af2578..19dd09f1365 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java index 1b9c795c56b..a4211c12e77 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java @@ -23,7 +23,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.JetBundle; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java index abc2e27ca53..c1b769f75c4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java index 5466f587911..b6c65a82e4e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index de827bb9489..fbc998edaf9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester import kotlin.properties.Delegates import java.util.LinkedHashSet diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt index 87dd6dae532..c11d42d1dd7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.idea.refactoring.isMultiLine import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValueBoxer.AsTuple import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnifierParameter -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Match import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.WeaklyMatched diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java index b9fcb333101..5992ba9297e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java @@ -54,7 +54,7 @@ import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetLanguage; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 6f41c091949..59baf528a6e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyAction; import org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention; import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt index c71edd8598a..31803e597f8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetImportDirective import java.util.ArrayList import com.intellij.refactoring.util.NonCodeUsageInfo -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.kotlin.idea.references.JetSimpleNameReference.ShorteningMode diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.kt rename to idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index 9d88e1f51ea..d83f15f4bc3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.quickfix +package org.jetbrains.kotlin.util import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.actions.OptimizeImportsProcessor @@ -49,9 +49,10 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper.ImportDescriptorResult import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor import com.intellij.openapi.project.Project +import org.jetbrains.kotlin.idea.util.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper.ImportDescriptorResult public class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper() { /** diff --git a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt index 7f84a5d85fa..7b0a4e745e2 100644 --- a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase() { override fun getTestDataPath() = JetTestUtils.getHomeDirectory() diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt b/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt index 224ea020411..05403276bdd 100644 --- a/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt +++ b/idea/tests/org/jetbrains/kotlin/addImport/AbstractAddImportTest.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.AbstractImportsTest import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver.LookupMode diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index 6454882bf5b..d8a51ee4ee1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement import com.intellij.openapi.util.io.FileUtil import java.io.File import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.name.FqName diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java index 6daac93ada3..8edff0a48d6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.imports; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper; +import org.jetbrains.kotlin.idea.util.ImportInsertHelper; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java index 3cdca761ee3..60b31cb551c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.util.ImportInsertHelper; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt index 07442fd4549..fca7ca695e3 100644 --- a/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.shortenRefs import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences +import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.AbstractImportsTest public abstract class AbstractShortenRefsTest : AbstractImportsTest() {