diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index b0181eb638c..eaa3985c911 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -336,7 +336,7 @@ language="kotlin" /> diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java index 521e38ac70d..58259f2f872 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiWhiteSpace; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinBundle; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil; import org.jetbrains.kotlin.psi.KtBlockExpression; import org.jetbrains.kotlin.psi.KtElement; import org.jetbrains.kotlin.psi.KtExpression; @@ -44,7 +44,7 @@ public abstract class KotlinUnwrapRemoveBase extends AbstractUnwrapper Boolean - ): JetParameterInfo { + ): KotlinParameterInfo { val name = getNewArgumentName(argument, validator) val expression = argument.getArgumentExpression() val type = expression?.let { it.analyze().getType(it) } ?: functionDescriptor.builtIns.nullableAnyType - return JetParameterInfo(functionDescriptor, -1, name, type, null, null, JetValVar.None, null) + return KotlinParameterInfo(functionDescriptor, -1, name, type, null, null, KotlinValVar.None, null) .apply { currentTypeText = IdeDescriptorRenderers.SOURCE_CODE.renderType(type) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt index 5f0b15ca19e..637adf42eba 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.kt @@ -42,14 +42,14 @@ class ChangeFunctionLiteralSignatureFix private constructor( runChangeSignature( project, functionDescriptor, - object : JetChangeSignatureConfiguration { - override fun configure(originalDescriptor: JetMethodDescriptor): JetMethodDescriptor { + object : KotlinChangeSignatureConfiguration { + override fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor { return originalDescriptor.modify { descriptor -> val validator = CollectingNameValidator() descriptor.clearNonReceiverParameters() for (type in parameterTypes) { val name = KotlinNameSuggester.suggestNamesByType(type, validator, "param").get(0) - descriptor.addParameter(JetParameterInfo(functionDescriptor, -1, name, type, null, null, JetValVar.None, null)) + descriptor.addParameter(KotlinParameterInfo(functionDescriptor, -1, name, type, null, null, KotlinValVar.None, null)) } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt index d12a5400d5a..66211fe8229 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.kt @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.mapArgumentsToParameters import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureConfiguration -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeSignatureConfiguration +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor import org.jetbrains.kotlin.idea.refactoring.changeSignature.modify import org.jetbrains.kotlin.idea.refactoring.changeSignature.runChangeSignature import org.jetbrains.kotlin.psi.KtCallElement @@ -140,8 +140,8 @@ abstract class ChangeFunctionSignatureFix( runChangeSignature( context.project, functionDescriptor, - object : JetChangeSignatureConfiguration { - override fun configure(originalDescriptor: JetMethodDescriptor): JetMethodDescriptor { + object : KotlinChangeSignatureConfiguration { + override fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor { return originalDescriptor.modify { descriptor -> val index = if (descriptor.receiver != null) parameterDescriptor.index + 1 else parameterDescriptor.index descriptor.removeParameter(index) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt index c1c31101e09..ba0d8222f6d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt @@ -39,7 +39,7 @@ public class MissingConstructorKeywordFix(element: KtPrimaryConstructor) : Kotli diagnostic.createIntentionForFirstParentOfType(::MissingConstructorKeywordFix) public fun createWholeProjectFixFactory(): KotlinSingleIntentionActionFactory = createIntentionFactory { - JetWholeProjectForEachElementOfTypeFix.createByPredicate( + WholeProjectForEachElementOfTypeFix.createByPredicate( predicate = { it.getModifierList() != null && !it.hasConstructorKeyword() }, taskProcessor = { it.addConstructorKeyword() }, name = "Add missing 'constructor' keyword in whole project" diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt index ba22e3cd557..a93180497d8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt @@ -50,7 +50,7 @@ public class ReplaceObsoleteLabelSyntaxFix(element: KtAnnotationEntry) : KotlinQ if (!(diagnostic.getPsiElement().getNonStrictParentOfType()?.looksLikeObsoleteLabelWithReferencesInCode() ?: false)) return@factory null - JetWholeProjectForEachElementOfTypeFix.createForMultiTaskOnElement( + WholeProjectForEachElementOfTypeFix.createForMultiTaskOnElement( tasksFactory = { collectTasks(it) }, tasksProcessor ={ it.forEach { ann -> replaceWithLabel(ann) } }, name = "Update obsolete label syntax in whole project" diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/WholeProjectModalAction.kt similarity index 90% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/WholeProjectModalAction.kt index 9fa75703b77..ecb65ad9276 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/WholeProjectModalAction.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction -import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.editor.Editor import com.intellij.openapi.progress.ProcessCanceledException @@ -25,7 +24,6 @@ import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.progress.Task import com.intellij.openapi.project.Project -import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider @@ -34,14 +32,13 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.KtVisitor import org.jetbrains.kotlin.psi.KtVisitorVoid import org.jetbrains.kotlin.psi.psiUtil.flatMapDescendantsOfTypeVisitor import org.jetbrains.kotlin.utils.singletonOrEmptyList -import java.util.HashMap +import java.util.* -public abstract class JetWholeProjectModalAction(val title: String) : IntentionAction { - private val LOG = Logger.getInstance(javaClass>()); +public abstract class WholeProjectModalAction(val title: String) : IntentionAction { + private val LOG = Logger.getInstance(javaClass>()); override final fun startInWriteAction() = false @@ -101,8 +98,8 @@ public abstract class JetWholeProjectModalAction(val title: String) protected abstract fun applyChangesForFile(project: Project, file: KtFile, data: TData) } -public abstract class JetWholeProjectModalByCollectionAction(modalTitle: String) -: JetWholeProjectModalAction>(modalTitle) { +public abstract class WholeProjectModalByCollectionAction(modalTitle: String) +: WholeProjectModalAction>(modalTitle) { override fun collectDataForFile(project: Project, file: KtFile): Collection? { val accumulator = arrayListOf() collectTasksForFile(project, file, accumulator) @@ -112,12 +109,12 @@ public abstract class JetWholeProjectModalByCollectionAction(modalT abstract fun collectTasksForFile(project: Project, file: KtFile, accumulator: MutableCollection) } -internal class JetWholeProjectForEachElementOfTypeFix private constructor( +internal class WholeProjectForEachElementOfTypeFix private constructor( private val collectingVisitorFactory: (MutableCollection) -> KtVisitorVoid, private val tasksProcessor: (Collection) -> Unit, private val name: String, private val familyName: String = name -) : JetWholeProjectModalByCollectionAction("Applying '$name'") { +) : WholeProjectModalByCollectionAction("Applying '$name'") { override fun getFamilyName() = familyName override fun getText() = name @@ -152,7 +149,7 @@ internal class JetWholeProjectForEachElementOfTypeFix private const noinline tasksFactory: (TElement) -> Collection, noinline tasksProcessor: (Collection) -> Unit, name: String - ) = JetWholeProjectForEachElementOfTypeFix( + ) = WholeProjectForEachElementOfTypeFix( collectingVisitorFactory = { accumulator -> flatMapDescendantsOfTypeVisitor(accumulator, tasksFactory) }, tasksProcessor = tasksProcessor, name = name, 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 4cb2122d97f..22f5af9b15e 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 @@ -162,7 +162,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { private fun computeTypeCandidates( typeInfo: TypeInfo, - substitutions: List, + substitutions: List, scope: HierarchicalScope): List { if (!typeInfo.substitutionsAllowed) return computeTypeCandidates(typeInfo) return typeCandidates.getOrPut(typeInfo) { @@ -226,7 +226,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { val typeParameterNameMap: Map val receiverTypeCandidate: TypeCandidate? val mandatoryTypeParametersAsCandidates: List - val substitutions: List + val substitutions: List var finished: Boolean = false init { @@ -312,7 +312,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { fakeFunction = null mandatoryTypeParametersAsCandidates = Collections.emptyList() } - substitutions = substitutionMap.map { JetTypeSubstitution(it.key, it.value) } + substitutions = substitutionMap.map { KotlinTypeSubstitution(it.key, it.value) } callableInfo.parameterInfos.forEach { computeTypeCandidates(it.typeInfo, substitutions, scope) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt index e0547be8e0a..85bb6effe00 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -232,9 +232,9 @@ private fun KtNamedDeclaration.guessType(context: BindingContext): ArrayKotlinType by another KotlinType. */ -internal class JetTypeSubstitution(public val forType: KotlinType, public val byType: KotlinType) +internal class KotlinTypeSubstitution(public val forType: KotlinType, public val byType: KotlinType) -internal fun KotlinType.substitute(substitution: JetTypeSubstitution, variance: Variance): KotlinType { +internal fun KotlinType.substitute(substitution: KotlinTypeSubstitution, variance: Variance): KotlinType { val nullable = isMarkedNullable() val currentType = makeNotNullable() diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt index 4e4583f362a..930edb6388e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil import org.jetbrains.kotlin.idea.core.refactoring.canRefactor import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.guessTypes -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall @@ -58,7 +58,7 @@ public object CreateParameterByNamedArgumentActionFactory: CreateParameterFromUs } ?: anyType if (paramType.hasTypeParametersToAdd(functionDescriptor, context)) return null - val parameterInfo = JetParameterInfo( + val parameterInfo = KotlinParameterInfo( callableDescriptor = functionDescriptor, name = name, type = paramType, diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt index e3b65512bf6..f1103f48ae3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getTypeParameters import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.guessTypes -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* @@ -68,7 +68,7 @@ object CreateParameterByRefActionFactory : CreateParameterFromUsageFactory() as? KtClass } @@ -120,10 +120,10 @@ object CreateParameterByRefActionFactory : CreateParameterFromUsageFactory( val context: BindingContext, - val parameterInfo: JetParameterInfo, + val parameterInfo: KotlinParameterInfo, val originalExpression: E ) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt index 6a426b592ee..e91bc176a0b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt @@ -36,20 +36,20 @@ import org.jetbrains.kotlin.resolve.source.getPsi public open class CreateParameterFromUsageFix( val functionDescriptor: FunctionDescriptor, - val parameterInfo: JetParameterInfo, + val parameterInfo: KotlinParameterInfo, val defaultValueContext: E ) : CreateFromUsageFixBase(defaultValueContext) { override fun getText(): String { return with(parameterInfo) { - if (valOrVar != JetValVar.None) "Create property '$name' as constructor parameter" else "Create parameter '$name'" + if (valOrVar != KotlinValVar.None) "Create property '$name' as constructor parameter" else "Create parameter '$name'" } } override fun startInWriteAction() = false override fun invoke(project: Project, editor: Editor?, file: KtFile) { - val config = object : JetChangeSignatureConfiguration { - override fun configure(originalDescriptor: JetMethodDescriptor): JetMethodDescriptor { + val config = object : KotlinChangeSignatureConfiguration { + override fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor { return originalDescriptor.modify { it.addParameter(parameterInfo) } } @@ -90,11 +90,11 @@ public open class CreateParameterFromUsageFix( val paramType = info.returnTypeInfo.getPossibleTypes(builder).firstOrNull() ?: return null if (paramType.hasTypeParametersToAdd(constructorDescriptor, builder.currentFileContext)) return null - val paramInfo = JetParameterInfo( + val paramInfo = KotlinParameterInfo( callableDescriptor = constructorDescriptor, name = info.name, type = paramType, - valOrVar = if (info.writable) JetValVar.Var else JetValVar.Val + valOrVar = if (info.writable) KotlinValVar.Var else KotlinValVar.Val ) return CreateParameterFromUsageFix(constructorDescriptor, paramInfo, element) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringBundle.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.java similarity index 92% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringBundle.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.java index aed0f9d109d..8b012e4038b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringBundle.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.java @@ -25,13 +25,13 @@ import java.lang.ref.Reference; import java.lang.ref.SoftReference; import java.util.ResourceBundle; -public class JetRefactoringBundle { +public class KotlinRefactoringBundle { private static Reference ourBundle; @NonNls - private static final String BUNDLE = "org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle"; + private static final String BUNDLE = "org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle"; - private JetRefactoringBundle() { + private KotlinRefactoringBundle() { } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringBundle.properties b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.properties similarity index 100% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringBundle.properties rename to idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringBundle.properties diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt index fccac0ede81..d8a954d5109 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringSupportProvider.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.util.Condition import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.refactoring.RefactoringActionHandler -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureHandler +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeSignatureHandler import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler import org.jetbrains.kotlin.idea.refactoring.introduce.introduceParameter.KotlinIntroduceLambdaParameterHandler import org.jetbrains.kotlin.idea.refactoring.introduce.introduceParameter.KotlinIntroduceParameterHandler @@ -72,7 +72,7 @@ public class KotlinRefactoringSupportProvider : RefactoringSupportProvider() { return false } - override fun getChangeSignatureHandler() = JetChangeSignatureHandler() + override fun getChangeSignatureHandler() = KotlinChangeSignatureHandler() override fun getPullUpHandler() = KotlinPullUpHandler() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java index 2b876b51aea..7524bd816d5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java @@ -65,9 +65,8 @@ import java.awt.*; import java.util.*; import java.util.List; -public class JetRefactoringUtil { - - private JetRefactoringUtil() { +public class KotlinRefactoringUtil { + private KotlinRefactoringUtil() { } @NotNull @@ -422,7 +421,8 @@ public class JetRefactoringUtil { @NotNull final SelectExpressionCallback callback) throws IntroduceRefactoringException { List expressions = getSmartSelectSuggestions(file, offset); if (expressions.size() == 0) { - if (failOnEmptySuggestion) throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression")); + if (failOnEmptySuggestion) throw new IntroduceRefactoringException( + KotlinRefactoringBundle.message("cannot.refactor.not.expression")); return; } @@ -466,7 +466,7 @@ public class JetRefactoringUtil { }); JBPopupFactory.getInstance().createListPopupBuilder(list). - setTitle(JetRefactoringBundle.message("expressions.title")).setMovable(false).setResizable(false). + setTitle(KotlinRefactoringBundle.message("expressions.title")).setMovable(false).setResizable(false). setRequestFocus(true).setItemChoosenCallback(new Runnable() { @Override public void run() { @@ -494,7 +494,7 @@ public class JetRefactoringUtil { //todo: if it's infix expression => add (), then commit document then return new created expression if (failOnNoExpression) { - throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression")); + throw new IntroduceRefactoringException(KotlinRefactoringBundle.message("cannot.refactor.not.expression")); } return null; } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt similarity index 90% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt index 2841513ded0..c1bdbb7aa33 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeInfo.kt @@ -38,8 +38,8 @@ import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.caches.resolve.getJavaMethodDescriptor import org.jetbrains.kotlin.idea.core.refactoring.j2k import org.jetbrains.kotlin.idea.project.ProjectStructureUtil -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor.Kind -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableDefinitionUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor.Kind +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallerUsage import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.lexer.KtTokens @@ -54,14 +54,14 @@ import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.kotlin.utils.removeLast import java.util.* -public open class JetChangeInfo( - val methodDescriptor: JetMethodDescriptor, +public open class KotlinChangeInfo( + val methodDescriptor: KotlinMethodDescriptor, private var name: String = methodDescriptor.getName(), val newReturnType: KotlinType? = methodDescriptor.baseDescriptor.getReturnType(), var newReturnTypeText: String = methodDescriptor.renderOriginalReturnType(), var newVisibility: Visibility = methodDescriptor.getVisibility(), - parameterInfos: List = methodDescriptor.getParameters(), - receiver: JetParameterInfo? = methodDescriptor.receiver, + parameterInfos: List = methodDescriptor.getParameters(), + receiver: KotlinParameterInfo? = methodDescriptor.receiver, val context: PsiElement, primaryPropagationTargets: Collection = emptyList() ) : ChangeInfo, UserDataHolder by UserDataHolderBase() { @@ -75,8 +75,8 @@ public open class JetChangeInfo( } } - var receiverParameterInfo: JetParameterInfo? = receiver - set(value: JetParameterInfo?) { + var receiverParameterInfo: KotlinParameterInfo? = receiver + set(value: KotlinParameterInfo?) { if (value != null && value !in newParameters) { newParameters.add(value) } @@ -120,7 +120,7 @@ public open class JetChangeInfo( public fun getNewParametersCount(): Int = newParameters.size() - override fun getNewParameters(): Array = newParameters.toTypedArray() + override fun getNewParameters(): Array = newParameters.toTypedArray() fun getToBeRemoved(): BooleanArray { return BooleanArray(originalParameters.size).apply { @@ -134,17 +134,17 @@ public open class JetChangeInfo( fun getNonReceiverParametersCount(): Int = newParameters.size() - (if (receiverParameterInfo != null) 1 else 0) - fun getNonReceiverParameters(): List { + fun getNonReceiverParameters(): List { methodDescriptor.baseDeclaration.let { if (it is KtProperty || it is KtParameter) return emptyList() } return receiverParameterInfo?.let { receiver -> newParameters.filter { it != receiver } } ?: newParameters } - public fun setNewParameter(index: Int, parameterInfo: JetParameterInfo) { + public fun setNewParameter(index: Int, parameterInfo: KotlinParameterInfo) { newParameters.set(index, parameterInfo) } @JvmOverloads - public fun addParameter(parameterInfo: JetParameterInfo, atIndex: Int = -1) { + public fun addParameter(parameterInfo: KotlinParameterInfo, atIndex: Int = -1) { if (atIndex >= 0) { newParameters.add(atIndex, parameterInfo) } @@ -165,7 +165,7 @@ public open class JetChangeInfo( receiverParameterInfo = null } - public fun hasParameter(parameterInfo: JetParameterInfo): Boolean = + public fun hasParameter(parameterInfo: KotlinParameterInfo): Boolean = parameterInfo in newParameters override fun isGenerateDelegate(): Boolean = false @@ -226,7 +226,7 @@ public open class JetChangeInfo( this.primaryPropagationTargets = primaryPropagationTargets } - public fun getNewSignature(inheritedCallable: JetCallableDefinitionUsage): String { + public fun getNewSignature(inheritedCallable: KotlinCallableDefinitionUsage): String { val buffer = StringBuilder() val defaultVisibility = if (kind.isConstructor) Visibilities.PUBLIC else Visibilities.DEFAULT_VISIBILITY @@ -267,12 +267,12 @@ public open class JetChangeInfo( && getMethod() == DescriptorToSourceUtils.descriptorToDeclaration(inheritedCallableDescriptor) } - public fun getNewParametersSignature(inheritedCallable: JetCallableDefinitionUsage<*>): String { + public fun getNewParametersSignature(inheritedCallable: KotlinCallableDefinitionUsage<*>): String { return "(" + getNewParametersSignatureWithoutParentheses(inheritedCallable) + ")" } public fun getNewParametersSignatureWithoutParentheses( - inheritedCallable: JetCallableDefinitionUsage<*> + inheritedCallable: KotlinCallableDefinitionUsage<*> ): String { val signatureParameters = getNonReceiverParameters() @@ -286,14 +286,14 @@ public open class JetChangeInfo( .joinToString(separator = ", ") } - public fun renderReceiverType(inheritedCallable: JetCallableDefinitionUsage<*>): String? { + public fun renderReceiverType(inheritedCallable: KotlinCallableDefinitionUsage<*>): String? { val receiverTypeText = receiverParameterInfo?.currentTypeText ?: return null val typeSubstitutor = inheritedCallable.typeSubstitutor ?: return receiverTypeText val currentBaseFunction = inheritedCallable.baseFunction.currentCallableDescriptor ?: return receiverTypeText return currentBaseFunction.extensionReceiverParameter!!.type.renderTypeWithSubstitution(typeSubstitutor, receiverTypeText, false) } - public fun renderReturnType(inheritedCallable: JetCallableDefinitionUsage<*>): String { + public fun renderReturnType(inheritedCallable: KotlinCallableDefinitionUsage<*>): String { val typeSubstitutor = inheritedCallable.typeSubstitutor ?: return newReturnTypeText val currentBaseFunction = inheritedCallable.baseFunction.currentCallableDescriptor ?: return newReturnTypeText return currentBaseFunction.getReturnType()!!.renderTypeWithSubstitution(typeSubstitutor, newReturnTypeText, false) @@ -396,7 +396,7 @@ public open class JetChangeInfo( fun getJavaParameterInfos( originalPsiMethod: PsiMethod, currentPsiMethod: PsiMethod, - newParameterList: List + newParameterList: List ): MutableList { val defaultValuesToSkip = newParameterList.size - currentPsiMethod.parameterList.parametersCount val defaultValuesToRetain = newParameterList.count { it.defaultValueForParameter != null } - defaultValuesToSkip @@ -495,17 +495,17 @@ public open class JetChangeInfo( } } -public val JetChangeInfo.originalBaseFunctionDescriptor: CallableDescriptor +public val KotlinChangeInfo.originalBaseFunctionDescriptor: CallableDescriptor get() = methodDescriptor.baseDescriptor -public val JetChangeInfo.kind: Kind get() = methodDescriptor.kind +public val KotlinChangeInfo.kind: Kind get() = methodDescriptor.kind -public val JetChangeInfo.oldName: String? +public val KotlinChangeInfo.oldName: String? get() = (methodDescriptor.getMethod() as? KtFunction)?.getName() -public fun JetChangeInfo.getAffectedCallables(): Collection = methodDescriptor.affectedCallables + propagationTargetUsageInfos +public fun KotlinChangeInfo.getAffectedCallables(): Collection = methodDescriptor.affectedCallables + propagationTargetUsageInfos -public fun ChangeInfo.toJetChangeInfo(originalChangeSignatureDescriptor: JetMethodDescriptor): JetChangeInfo { +public fun ChangeInfo.toJetChangeInfo(originalChangeSignatureDescriptor: KotlinMethodDescriptor): KotlinChangeInfo { val method = getMethod() as PsiMethod val functionDescriptor = method.getJavaMethodDescriptor()!! @@ -531,11 +531,11 @@ public fun ChangeInfo.toJetChangeInfo(originalChangeSignatureDescriptor: JetMeth else -> null } - with(JetParameterInfo(callableDescriptor = functionDescriptor, - originalIndex = oldIndex, - name = info.getName(), - type = if (oldIndex >= 0) originalParameterDescriptors[oldIndex].getType() else currentType, - defaultValueForCall = defaultValueExpr)) { + with(KotlinParameterInfo(callableDescriptor = functionDescriptor, + originalIndex = oldIndex, + name = info.getName(), + type = if (oldIndex >= 0) originalParameterDescriptors[oldIndex].getType() else currentType, + defaultValueForCall = defaultValueExpr)) { currentTypeText = IdeDescriptorRenderers.SOURCE_CODE_FOR_TYPE_ARGUMENTS.renderType(currentType) this } @@ -544,12 +544,12 @@ public fun ChangeInfo.toJetChangeInfo(originalChangeSignatureDescriptor: JetMeth val returnType = functionDescriptor.getReturnType() val returnTypeText = if (returnType != null) IdeDescriptorRenderers.SOURCE_CODE.renderType(returnType) else "" - return JetChangeInfo(originalChangeSignatureDescriptor, - getNewName(), - returnType, - returnTypeText, - functionDescriptor.getVisibility(), - newParameters, - null, - method) + return KotlinChangeInfo(originalChangeSignatureDescriptor, + getNewName(), + returnType, + returnTypeText, + functionDescriptor.getVisibility(), + newParameters, + null, + method) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt similarity index 79% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt index e86370d6346..f9aac5444c4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignature.kt @@ -41,54 +41,54 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.refactoring.createJavaMethod import org.jetbrains.kotlin.idea.core.refactoring.toPsiFile import org.jetbrains.kotlin.idea.refactoring.CallableRefactoring -import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.JetChangeSignatureDialog +import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinChangeSignatureDialog import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.OverrideResolver -public interface JetChangeSignatureConfiguration { - fun configure(originalDescriptor: JetMethodDescriptor): JetMethodDescriptor = originalDescriptor +public interface KotlinChangeSignatureConfiguration { + fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor = originalDescriptor fun performSilently(affectedFunctions: Collection): Boolean = false fun forcePerformForSelectedFunctionOnly(): Boolean = false - object Empty: JetChangeSignatureConfiguration + object Empty: KotlinChangeSignatureConfiguration } -fun JetMethodDescriptor.modify(action: (JetMutableMethodDescriptor) -> Unit): JetMethodDescriptor { - val newDescriptor = JetMutableMethodDescriptor(this) +fun KotlinMethodDescriptor.modify(action: (KotlinMutableMethodDescriptor) -> Unit): KotlinMethodDescriptor { + val newDescriptor = KotlinMutableMethodDescriptor(this) action(newDescriptor) return newDescriptor } public fun runChangeSignature(project: Project, callableDescriptor: CallableDescriptor, - configuration: JetChangeSignatureConfiguration, + configuration: KotlinChangeSignatureConfiguration, defaultValueContext: PsiElement, commandName: String? = null): Boolean { - return JetChangeSignature(project, callableDescriptor, configuration, defaultValueContext, commandName).run() + return KotlinChangeSignature(project, callableDescriptor, configuration, defaultValueContext, commandName).run() } -public class JetChangeSignature(project: Project, - callableDescriptor: CallableDescriptor, - val configuration: JetChangeSignatureConfiguration, - val defaultValueContext: PsiElement, - commandName: String?): CallableRefactoring(project, +public class KotlinChangeSignature(project: Project, + callableDescriptor: CallableDescriptor, + val configuration: KotlinChangeSignatureConfiguration, + val defaultValueContext: PsiElement, + commandName: String?): CallableRefactoring(project, callableDescriptor, commandName ?: ChangeSignatureHandler.REFACTORING_NAME) { - private val LOG = Logger.getInstance(javaClass()) + private val LOG = Logger.getInstance(javaClass()) override fun forcePerformForSelectedFunctionOnly() = configuration.forcePerformForSelectedFunctionOnly() - private fun runSilentRefactoring(descriptor: JetMethodDescriptor) { + private fun runSilentRefactoring(descriptor: KotlinMethodDescriptor) { val baseDeclaration = descriptor.baseDeclaration val processor = when (baseDeclaration) { is KtFunction, is KtClass -> { - JetChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature(project, commandName, descriptor, defaultValueContext) + KotlinChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature(project, commandName, descriptor, defaultValueContext) } is KtProperty, is KtParameter -> { - JetChangePropertySignatureDialog.createProcessorForSilentRefactoring(project, commandName, descriptor) + KotlinChangePropertySignatureDialog.createProcessorForSilentRefactoring(project, commandName, descriptor) } is PsiMethod -> { if (baseDeclaration.getLanguage() != JavaLanguage.INSTANCE) { @@ -103,14 +103,14 @@ public class JetChangeSignature(project: Project, processor.run() } - private fun runInteractiveRefactoring(descriptor: JetMethodDescriptor) { + private fun runInteractiveRefactoring(descriptor: KotlinMethodDescriptor) { val baseDeclaration = descriptor.baseDeclaration val dialog = when (baseDeclaration) { - is KtFunction, is KtClass -> JetChangeSignatureDialog(project, descriptor, defaultValueContext, commandName) - is KtProperty, is KtParameter -> JetChangePropertySignatureDialog(project, descriptor, commandName) + is KtFunction, is KtClass -> KotlinChangeSignatureDialog(project, descriptor, defaultValueContext, commandName) + is KtProperty, is KtParameter -> KotlinChangePropertySignatureDialog(project, descriptor, commandName) is PsiMethod -> { // No changes are made from Kotlin side: just run foreign refactoring - if (descriptor is JetChangeSignatureData) { + if (descriptor is KotlinChangeSignatureData) { ChangeSignatureUtil.invokeChangeSignatureOn(baseDeclaration, project) return } @@ -135,12 +135,12 @@ public class JetChangeSignature(project: Project, dialog.show() } - private fun getPreviewInfoForJavaMethod(descriptor: JetMethodDescriptor): Pair { + private fun getPreviewInfoForJavaMethod(descriptor: KotlinMethodDescriptor): Pair { val originalMethod = descriptor.baseDeclaration as PsiMethod val contextFile = defaultValueContext.getContainingFile() as KtFile // Generate new Java method signature from the Kotlin point of view - val ktChangeInfo = JetChangeInfo(methodDescriptor = descriptor, context = defaultValueContext) + val ktChangeInfo = KotlinChangeInfo(methodDescriptor = descriptor, context = defaultValueContext) val ktSignature = ktChangeInfo.getNewSignature(descriptor.originalPrimaryCallable) val dummyFileText = with(StringBuilder()) { contextFile.getPackageDirective()?.let { append(it.getText()).append("\n") } @@ -189,7 +189,7 @@ public class JetChangeSignature(project: Project, } } - fun adjustDescriptor(descriptorsForSignatureChange: Collection): JetMethodDescriptor? { + fun adjustDescriptor(descriptorsForSignatureChange: Collection): KotlinMethodDescriptor? { val baseDescriptor = preferContainedInClass(descriptorsForSignatureChange) val functionDeclaration = DescriptorToSourceUtilsIde.getAnyDeclaration(project, baseDescriptor) if (functionDeclaration == null) { @@ -201,7 +201,7 @@ public class JetChangeSignature(project: Project, return null } - val originalDescriptor = JetChangeSignatureData(baseDescriptor, functionDeclaration, descriptorsForSignatureChange) + val originalDescriptor = KotlinChangeSignatureData(baseDescriptor, functionDeclaration, descriptorsForSignatureChange) return configuration.configure(originalDescriptor) } @@ -221,21 +221,21 @@ public class JetChangeSignature(project: Project, public fun createChangeInfo( project: Project, callableDescriptor: CallableDescriptor, - configuration: JetChangeSignatureConfiguration, + configuration: KotlinChangeSignatureConfiguration, defaultValueContext: PsiElement -): JetChangeInfo? { - val jetChangeSignature = JetChangeSignature(project, callableDescriptor, configuration, defaultValueContext, null) +): KotlinChangeInfo? { + val jetChangeSignature = KotlinChangeSignature(project, callableDescriptor, configuration, defaultValueContext, null) val declarations = if (callableDescriptor is CallableMemberDescriptor) { OverrideResolver.getDeepestSuperDeclarations(callableDescriptor) } else listOf(callableDescriptor) val adjustedDescriptor = jetChangeSignature.adjustDescriptor(declarations) ?: return null - val processor = JetChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature( + val processor = KotlinChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature( project, ChangeSignatureHandler.REFACTORING_NAME, adjustedDescriptor, defaultValueContext - ) as JetChangeSignatureProcessor + ) as KotlinChangeSignatureProcessor return processor.getChangeInfo() } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt similarity index 88% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt index af04d5655ef..898d1175201 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureData.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.CollectingNameValidator import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.util.getResolutionScope -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableDefinitionUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtCallableDeclaration @@ -44,13 +44,13 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.scopes.utils.findVariable import java.util.* -public class JetChangeSignatureData( +public class KotlinChangeSignatureData( override val baseDescriptor: CallableDescriptor, override val baseDeclaration: PsiElement, private val descriptorsForSignatureChange: Collection -) : JetMethodDescriptor { - private val parameters: List - override val receiver: JetParameterInfo? +) : KotlinMethodDescriptor { + private val parameters: List + override val receiver: KotlinParameterInfo? init { receiver = createReceiverInfoIfNeeded() @@ -63,7 +63,7 @@ public class JetChangeSignatureData( parameters = baseDescriptor.getValueParameters() .mapTo(receiver?.let{ arrayListOf(it) } ?: arrayListOf()) { parameterDescriptor -> val jetParameter = valueParameters?.get(parameterDescriptor.index) - JetParameterInfo( + KotlinParameterInfo( callableDescriptor = baseDescriptor, originalIndex = parameterDescriptor.index, name = parameterDescriptor.getName().asString(), @@ -75,7 +75,7 @@ public class JetChangeSignatureData( } } - private fun createReceiverInfoIfNeeded(): JetParameterInfo? { + private fun createReceiverInfoIfNeeded(): KotlinParameterInfo? { val callable = baseDeclaration as? KtCallableDeclaration ?: return null val bodyScope = (callable as? KtFunction)?.bodyExpression?.let { it.getResolutionScope(it.analyze(), it.getResolutionFacade()) } val paramNames = baseDescriptor.valueParameters.map { it.name.asString() } @@ -86,21 +86,21 @@ public class JetChangeSignatureData( } ?: CollectingNameValidator(paramNames) val receiverType = baseDescriptor.getExtensionReceiverParameter()?.getType() ?: return null val receiverName = KotlinNameSuggester.suggestNamesByType(receiverType, validator, "receiver").first() - return JetParameterInfo(callableDescriptor = baseDescriptor, name = receiverName, type = receiverType) + return KotlinParameterInfo(callableDescriptor = baseDescriptor, name = receiverName, type = receiverType) } - override val original: JetMethodDescriptor + override val original: KotlinMethodDescriptor get() = this - override val primaryCallables: Collection> by lazy { + override val primaryCallables: Collection> by lazy { descriptorsForSignatureChange.map { val declaration = DescriptorToSourceUtilsIde.getAnyDeclaration(baseDeclaration.getProject(), it) assert(declaration != null) { "No declaration found for " + baseDescriptor } - JetCallableDefinitionUsage(declaration!!, it, null, null) + KotlinCallableDefinitionUsage(declaration!!, it, null, null) } } - override val originalPrimaryCallable: JetCallableDefinitionUsage by lazy { + override val originalPrimaryCallable: KotlinCallableDefinitionUsage by lazy { primaryCallables.first { it.declaration == baseDeclaration } } @@ -115,7 +115,7 @@ public class JetChangeSignatureData( if (overridingMethod is KtLightMethod) { val overridingDeclaration = overridingMethod.namedUnwrappedElement as KtNamedDeclaration val overridingDescriptor = overridingDeclaration.resolveToDescriptor() as CallableDescriptor - JetCallableDefinitionUsage(overridingDeclaration, overridingDescriptor, primaryFunction, null) + KotlinCallableDefinitionUsage(overridingDeclaration, overridingDescriptor, primaryFunction, null) } else OverriderUsageInfo(overridingMethod, baseMethod, true, true, true) }.filterNotNullTo(HashSet()) @@ -123,7 +123,7 @@ public class JetChangeSignatureData( } } - override fun getParameters(): List { + override fun getParameters(): List { return parameters } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt similarity index 93% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt index ee908d50619..a49794bbb44 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZE import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode -public class JetChangeSignatureHandler : ChangeSignatureHandler { +public class KotlinChangeSignatureHandler : ChangeSignatureHandler { override fun findTargetMember(file: PsiFile, editor: Editor) = file.findElementAt(editor.getCaretModel().getOffset())?.let { findTargetMember(it) } @@ -72,7 +72,7 @@ public class JetChangeSignatureHandler : ChangeSignatureHandler { } override fun getTargetNotFoundMessage() = - JetRefactoringBundle.message("error.wrong.caret.position.function.or.constructor.name") + KotlinRefactoringBundle.message("error.wrong.caret.position.function.or.constructor.name") companion object { public fun findTargetForRefactoring(element: PsiElement): PsiElement? { @@ -149,7 +149,7 @@ public class JetChangeSignatureHandler : ChangeSignatureHandler { return } - runChangeSignature(project, callableDescriptor, JetChangeSignatureConfiguration.Empty, context, null) + runChangeSignature(project, callableDescriptor, KotlinChangeSignatureConfiguration.Empty, context, null) } private fun getDescriptor(bindingContext: BindingContext, element: PsiElement): DeclarationDescriptor? { @@ -168,13 +168,13 @@ public class JetChangeSignatureHandler : ChangeSignatureHandler { return when (descriptor) { is FunctionDescriptor -> { if (descriptor.getValueParameters().any { it.varargElementType != null }) { - val message = JetRefactoringBundle.message("error.cant.refactor.vararg.functions") + val message = KotlinRefactoringBundle.message("error.cant.refactor.vararg.functions") CommonRefactoringUtil.showErrorHint(project, editor, message, ChangeSignatureHandler.REFACTORING_NAME, HelpID.CHANGE_SIGNATURE) return null } if (descriptor.getKind() === SYNTHESIZED) { - val message = JetRefactoringBundle.message("cannot.refactor.synthesized.function", descriptor.getName()) + val message = KotlinRefactoringBundle.message("cannot.refactor.synthesized.function", descriptor.getName()) CommonRefactoringUtil.showErrorHint(project, editor, message, ChangeSignatureHandler.REFACTORING_NAME, HelpID.CHANGE_SIGNATURE) return null } @@ -185,7 +185,7 @@ public class JetChangeSignatureHandler : ChangeSignatureHandler { is PropertyDescriptor, is ValueParameterDescriptor -> descriptor as CallableDescriptor else -> { - val message = RefactoringBundle.getCannotRefactorMessage(JetRefactoringBundle.message("error.wrong.caret.position.function.or.constructor.name")) + val message = RefactoringBundle.getCannotRefactorMessage(KotlinRefactoringBundle.message("error.wrong.caret.position.function.or.constructor.name")) CommonRefactoringUtil.showErrorHint(project, editor, message, ChangeSignatureHandler.REFACTORING_NAME, HelpID.CHANGE_SIGNATURE) null } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt similarity index 87% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt index b3800d96f41..e295a73e48f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureProcessor.kt @@ -30,19 +30,19 @@ import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo import com.intellij.usageView.UsageInfo import com.intellij.usageView.UsageViewDescriptor import com.intellij.util.containers.MultiMap -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetUsageInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinUsageInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinWrapperForJavaUsageInfos import java.util.* -public class JetChangeSignatureProcessor(project: Project, - changeInfo: JetChangeInfo, - private val commandName: String) : ChangeSignatureProcessorBase(project, changeInfo) { +public class KotlinChangeSignatureProcessor(project: Project, + changeInfo: KotlinChangeInfo, + private val commandName: String) : ChangeSignatureProcessorBase(project, changeInfo) { override fun createUsageViewDescriptor(usages: Array): UsageViewDescriptor { val subject = if (getChangeInfo().kind.isConstructor) "constructor" else "function" - return JetUsagesViewDescriptor(myChangeInfo.getMethod(), RefactoringBundle.message("0.to.change.signature", subject)) + return KotlinUsagesViewDescriptor(myChangeInfo.getMethod(), RefactoringBundle.message("0.to.change.signature", subject)) } - override fun getChangeInfo() = super.getChangeInfo() as JetChangeInfo + override fun getChangeInfo() = super.getChangeInfo() as KotlinChangeInfo override fun findUsages(): Array { val allUsages = ArrayList() @@ -52,7 +52,7 @@ public class JetChangeSignatureProcessor(project: Project, KotlinWrapperForJavaUsageInfos(it, javaProcessor.findUsages(it), getChangeInfo().getMethod()) } } - super.findUsages().filterTo(allUsages) { it is JetUsageInfo<*> || it is UnresolvableCollisionUsageInfo } + super.findUsages().filterTo(allUsages) { it is KotlinUsageInfo<*> || it is UnresolvableCollisionUsageInfo } return allUsages.toTypedArray() } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt similarity index 90% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt index f77a85549fa..23dd0b6f6b9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt @@ -80,23 +80,23 @@ import org.jetbrains.kotlin.resolve.source.getPsi import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* -class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { +class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { // This is special 'PsiElement' whose purpose is to wrap JetMethodDescriptor so that it can be kept in the usage list private class OriginalJavaMethodDescriptorWrapper(element: PsiElement) : UsageInfo(element) { - internal var originalJavaMethodDescriptor: JetMethodDescriptor? = null + internal var originalJavaMethodDescriptor: KotlinMethodDescriptor? = null } - private class DummyJetChangeInfo( + private class DummyKotlinChangeInfo( method: PsiElement, - methodDescriptor: JetMethodDescriptor - ) : JetChangeInfo(methodDescriptor = methodDescriptor, - name = "", - newReturnType = null, - newReturnTypeText = "", - newVisibility = Visibilities.DEFAULT_VISIBILITY, - parameterInfos = emptyList(), - receiver = null, - context = method) + methodDescriptor: KotlinMethodDescriptor + ) : KotlinChangeInfo(methodDescriptor = methodDescriptor, + name = "", + newReturnType = null, + newReturnTypeText = "", + newVisibility = Visibilities.DEFAULT_VISIBILITY, + parameterInfos = emptyList(), + receiver = null, + context = method) // It's here to prevent O(usage_count^2) performance private var initializedOriginalDescriptor: Boolean = false @@ -108,7 +108,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { result.add(OriginalJavaMethodDescriptorWrapper(info.method)) - if (info is JetChangeInfo) { + if (info is KotlinChangeInfo) { findAllMethodUsages(info, result) } else { @@ -123,10 +123,10 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { return result.toTypedArray() } - private fun findAllMethodUsages(changeInfo: JetChangeInfo, result: MutableSet) { + private fun findAllMethodUsages(changeInfo: KotlinChangeInfo, result: MutableSet) { loop@ for (functionUsageInfo in changeInfo.getAffectedCallables()) { when (functionUsageInfo) { - is JetCallableDefinitionUsage<*> -> findOneMethodUsages(functionUsageInfo, changeInfo, result) + is KotlinCallableDefinitionUsage<*> -> findOneMethodUsages(functionUsageInfo, changeInfo, result) is KotlinCallerUsage -> findCallerUsages(functionUsageInfo, changeInfo, result) else -> { result.add(functionUsageInfo) @@ -143,7 +143,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { KotlinCallerCallUsage(callElement) } else { - JetFunctionCallUsage(callElement, changeInfo.methodDescriptor.originalPrimaryCallable) + KotlinFunctionCallUsage(callElement, changeInfo.methodDescriptor.originalPrimaryCallable) } result.add(usage) } @@ -152,7 +152,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } } - private fun findCallerUsages(callerUsage: KotlinCallerUsage, changeInfo: JetChangeInfo, result: MutableSet) { + private fun findCallerUsages(callerUsage: KotlinCallerUsage, changeInfo: KotlinChangeInfo, result: MutableSet) { result.add(callerUsage) val element = callerUsage.element ?: return @@ -191,7 +191,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } if (receiver is ThisReceiver) { - result.add(JetImplicitThisUsage(callElement, receiver.declarationDescriptor)) + result.add(KotlinImplicitThisUsage(callElement, receiver.declarationDescriptor)) } else if (!receiver.exists()) { result.add( @@ -222,8 +222,8 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } private fun findOneMethodUsages( - functionUsageInfo: JetCallableDefinitionUsage<*>, - changeInfo: JetChangeInfo, + functionUsageInfo: KotlinCallableDefinitionUsage<*>, + changeInfo: KotlinChangeInfo, result: MutableSet ) { val isInherited = functionUsageInfo.isInherited @@ -244,17 +244,17 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { when { parent is KtCallExpression -> - result.add(JetFunctionCallUsage(parent, functionUsageInfo)) + result.add(KotlinFunctionCallUsage(parent, functionUsageInfo)) parent is KtUserType && parent.parent is KtTypeReference -> { parent = parent.parent.parent if (parent is KtConstructorCalleeExpression && parent.parent is KtDelegatorToSuperCall) - result.add(JetFunctionCallUsage(parent.parent as KtDelegatorToSuperCall, functionUsageInfo)) + result.add(KotlinFunctionCallUsage(parent.parent as KtDelegatorToSuperCall, functionUsageInfo)) } element is KtSimpleNameExpression && (functionPsi is KtProperty || functionPsi is KtParameter) -> - result.add(JetPropertyCallUsage(element)) + result.add(KotlinPropertyCallUsage(element)) } } } @@ -280,7 +280,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { // Usages in named arguments of the calls usage will be changed when the function call is changed if ((element is KtSimpleNameExpression || element is KDocName) && element.parent !is KtValueArgumentName) { - result.add(JetParameterUsage(element as KtElement, parameterInfo, functionUsageInfo)) + result.add(KotlinParameterUsage(element as KtElement, parameterInfo, functionUsageInfo)) } } } @@ -294,21 +294,21 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { if (functionPsi is KtClass && functionPsi.isEnum()) { for (declaration in functionPsi.declarations) { if (declaration is KtEnumEntry && declaration.getDelegationSpecifiers().isEmpty()) { - result.add(JetEnumEntryWithoutSuperCallUsage(declaration)) + result.add(KotlinEnumEntryWithoutSuperCallUsage(declaration)) } } } functionPsi.processDelegationCallConstructorUsages(functionPsi.useScope) { when (it) { - is KtConstructorDelegationCall -> result.add(JetConstructorDelegationCallUsage(it, changeInfo)) - is KtDelegatorToSuperCall -> result.add(JetFunctionCallUsage(it, functionUsageInfo)) + is KtConstructorDelegationCall -> result.add(KotlinConstructorDelegationCallUsage(it, changeInfo)) + is KtDelegatorToSuperCall -> result.add(KotlinFunctionCallUsage(it, functionUsageInfo)) } true } } - private fun processInternalReferences(functionUsageInfo: JetCallableDefinitionUsage<*>, visitor: KtTreeVisitor) { + private fun processInternalReferences(functionUsageInfo: KotlinCallableDefinitionUsage<*>, visitor: KtTreeVisitor) { val ktFunction = functionUsageInfo.declaration as KtFunction val body = ktFunction.bodyExpression @@ -321,9 +321,9 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } private fun findOriginalReceiversUsages( - functionUsageInfo: JetCallableDefinitionUsage<*>, + functionUsageInfo: KotlinCallableDefinitionUsage<*>, result: MutableSet, - changeInfo: JetChangeInfo + changeInfo: KotlinChangeInfo ) { val originalReceiverInfo = changeInfo.methodDescriptor.receiver val callableDescriptor = functionUsageInfo.originalCallableDescriptor @@ -338,12 +338,12 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { if (receiverDescriptor === callableDescriptor.extensionReceiverParameter) { assert(originalReceiverInfo != null) { "No original receiver info provided: " + functionUsageInfo.declaration.text } - result.add(JetParameterUsage(expression, originalReceiverInfo!!, functionUsageInfo)) + result.add(KotlinParameterUsage(expression, originalReceiverInfo!!, functionUsageInfo)) } else { val targetDescriptor = receiverDescriptor.type.constructor.declarationDescriptor assert(targetDescriptor != null) { "Receiver type has no descriptor: " + functionUsageInfo.declaration.text } - result.add(JetNonQualifiedOuterThisUsage(expression.parent as KtThisExpression, targetDescriptor!!)) + result.add(KotlinNonQualifiedOuterThisUsage(expression.parent as KtThisExpression, targetDescriptor!!)) } } @@ -353,10 +353,10 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { val targetDescriptor = receiverValue.declarationDescriptor if (compareDescriptors(callElement.project, targetDescriptor, callableDescriptor)) { assert(originalReceiverInfo != null) { "No original receiver info provided: " + functionUsageInfo.declaration.text } - result.add(JetImplicitThisToParameterUsage(callElement, originalReceiverInfo!!, functionUsageInfo)) + result.add(KotlinImplicitThisToParameterUsage(callElement, originalReceiverInfo!!, functionUsageInfo)) } else { - result.add(JetImplicitThisUsage(callElement, targetDescriptor)) + result.add(KotlinImplicitThisUsage(callElement, targetDescriptor)) } } @@ -454,7 +454,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { result: MutableSet, function: KtNamedFunction, functionDescriptor: FunctionDescriptor) { - val functionInfoForParameters = JetCallableDefinitionUsage(function, functionDescriptor, null, null) + val functionInfoForParameters = KotlinCallableDefinitionUsage(function, functionDescriptor, null, null) val oldParameters = function.valueParameters val parameters = changeInfo.newParameters for ((paramIndex, parameterInfo) in parameters.withIndex()) { @@ -472,12 +472,12 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { result.add( object : JavaMethodDeferredKotlinUsage(element as KtElement) { - override fun resolve(javaMethodChangeInfo: JetChangeInfo): JavaMethodKotlinUsageWithDelegate { + override fun resolve(javaMethodChangeInfo: KotlinChangeInfo): JavaMethodKotlinUsageWithDelegate { return object : JavaMethodKotlinUsageWithDelegate(element as KtElement, javaMethodChangeInfo) { - override val delegateUsage: JetUsageInfo - get() = JetParameterUsage(element as KtElement, - this.javaMethodChangeInfo.newParameters[paramIndex], - functionInfoForParameters) + override val delegateUsage: KotlinUsageInfo + get() = KotlinParameterUsage(element as KtElement, + this.javaMethodChangeInfo.newParameters[paramIndex], + functionInfoForParameters) } } } @@ -497,7 +497,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { refUsages.set(adjustedUsages.toTypedArray()) } - if (info !is JetChangeInfo) return result + if (info !is KotlinChangeInfo) return result val parameterNames = HashSet() val function = info.method @@ -546,7 +546,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } if (parametersScope != null) { - if (kind === JetMethodDescriptor.Kind.PRIMARY_CONSTRUCTOR && valOrVar !== JetValVar.None) { + if (kind === KotlinMethodDescriptor.Kind.PRIMARY_CONSTRUCTOR && valOrVar !== KotlinValVar.None) { for (property in parametersScope.getVariablesFromImplicitReceivers(Name.identifier(parameterName))) { val propertyDeclaration = DescriptorToSourceUtils.descriptorToDeclaration(property) ?: continue if (propertyDeclaration.parent !is KtParameterList) { @@ -584,7 +584,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { private fun findParameterDuplicationInCaller( result: MultiMap, - changeInfo: JetChangeInfo, + changeInfo: KotlinChangeInfo, caller: KtNamedDeclaration, callerDescriptor: DeclarationDescriptor) { val valueParameters = caller.getValueParameters() @@ -603,11 +603,11 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { private fun findThisLabelConflicts( refUsages: Ref>, result: MultiMap, - changeInfo: JetChangeInfo, + changeInfo: KotlinChangeInfo, callable: KtCallableDeclaration) { val psiFactory = KtPsiFactory(callable.project) for (usageInfo in refUsages.get()) { - if (usageInfo !is JetParameterUsage) continue + if (usageInfo !is KotlinParameterUsage) continue val newExprText = usageInfo.getReplacementText(changeInfo) if (!newExprText.startsWith("this")) continue @@ -643,12 +643,12 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { private fun findInternalExplicitReceiverConflicts( usages: Array, result: MultiMap, - originalReceiverInfo: JetParameterInfo? + originalReceiverInfo: KotlinParameterInfo? ) { if (originalReceiverInfo != null) return for (usageInfo in usages) { - if (!(usageInfo is JetFunctionCallUsage || usageInfo is JetPropertyCallUsage)) continue + if (!(usageInfo is KotlinFunctionCallUsage || usageInfo is KotlinPropertyCallUsage)) continue val callElement = usageInfo.element as? KtElement ?: continue @@ -663,7 +663,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { private fun findReceiverIntroducingConflicts( result: MultiMap, callable: PsiElement, - newReceiverInfo: JetParameterInfo?) { + newReceiverInfo: KotlinParameterInfo?) { if (newReceiverInfo != null && (callable is KtNamedFunction) && callable.bodyExpression != null) { val noReceiverRefToContext = KotlinFileReferencesResolver.resolve(callable, true, true).filter { val resolvedCall = it.key.getResolvedCall(it.value) @@ -701,7 +701,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { private fun createReplacementUsage( originalUsageInfo: UsageInfo, - javaMethodChangeInfo: JetChangeInfo, + javaMethodChangeInfo: KotlinChangeInfo, allUsages: Array ): UsageInfo? { if (originalUsageInfo is JavaMethodDeferredKotlinUsage<*>) return originalUsageInfo.resolve(javaMethodChangeInfo) @@ -782,7 +782,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { val isJavaMethodUsage = isJavaMethodUsage(usageInfo) if (usageInfo is KotlinWrapperForJavaUsageInfos) { - val javaChangeInfos = (changeInfo as JetChangeInfo).getOrCreateJavaChangeInfos() + val javaChangeInfos = (changeInfo as KotlinChangeInfo).getOrCreateJavaChangeInfos() assert(javaChangeInfos != null) { "JavaChangeInfo not found: " + method.text } javaChangeInfos!!.firstOrNull { @@ -795,7 +795,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { for (usage in javaUsageInfos) { if (isOverriderOrCaller(usage) && beforeMethodChange) continue for (processor in processors) { - if (processor is JetChangeSignatureUsageProcessor) continue + if (processor is KotlinChangeSignatureUsageProcessor) continue if (isOverriderOrCaller(usage)) { processor.processUsage(javaChangeInfo, usage, true, javaUsageInfos) } @@ -819,11 +819,11 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { val methodDescriptor = method.getJavaMethodDescriptor() assert(methodDescriptor != null) - descriptorWrapper.originalJavaMethodDescriptor = JetChangeSignatureData(methodDescriptor!!, method, listOf(methodDescriptor)) + descriptorWrapper.originalJavaMethodDescriptor = KotlinChangeSignatureData(methodDescriptor!!, method, listOf(methodDescriptor)) // This change info is used as a placeholder before primary method update // It gets replaced with real change info afterwards - val dummyChangeInfo = DummyJetChangeInfo(changeInfo.method, descriptorWrapper.originalJavaMethodDescriptor!!) + val dummyChangeInfo = DummyKotlinChangeInfo(changeInfo.method, descriptorWrapper.originalJavaMethodDescriptor!!) for (i in usages.indices) { val oldUsageInfo = usages[i] if (!isJavaMethodUsage(oldUsageInfo)) continue @@ -843,7 +843,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { if (usageInfo is JavaMethodKotlinUsageWithDelegate<*>) { // Do not call getOriginalJavaMethodDescriptorWrapper() on each usage to avoid O(usage_count^2) performance - if (usageInfo.javaMethodChangeInfo is DummyJetChangeInfo) { + if (usageInfo.javaMethodChangeInfo is DummyKotlinChangeInfo) { val descriptorWrapper = usages.firstIsInstanceOrNull() val methodDescriptor = (descriptorWrapper?.originalJavaMethodDescriptor) ?: return true @@ -868,11 +868,11 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { } @Suppress("UNCHECKED_CAST") - return (usageInfo as? JetUsageInfo)?.processUsage(changeInfo as JetChangeInfo, element, usages) ?: false + return (usageInfo as? KotlinUsageInfo)?.processUsage(changeInfo as KotlinChangeInfo, element, usages) ?: false } override fun processPrimaryMethod(changeInfo: ChangeInfo): Boolean { - if (changeInfo !is JetChangeInfo) return false + if (changeInfo !is KotlinChangeInfo) return false for (primaryFunction in changeInfo.methodDescriptor.primaryCallables) { primaryFunction.processUsage(changeInfo, primaryFunction.declaration, UsageInfo.EMPTY_ARRAY) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMethodDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMethodDescriptor.kt similarity index 79% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMethodDescriptor.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMethodDescriptor.kt index 1e8ac4d35b4..1c2925acdef 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMethodDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMethodDescriptor.kt @@ -22,10 +22,10 @@ import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableDefinitionUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -public interface JetMethodDescriptor : MethodDescriptor { +public interface KotlinMethodDescriptor : MethodDescriptor { enum class Kind(val isConstructor: Boolean) { FUNCTION(false), PRIMARY_CONSTRUCTOR(true), @@ -41,20 +41,20 @@ public interface JetMethodDescriptor : MethodDescriptor - val primaryCallables: Collection> + val originalPrimaryCallable: KotlinCallableDefinitionUsage + val primaryCallables: Collection> val affectedCallables: Collection - val receiver: JetParameterInfo? + val receiver: KotlinParameterInfo? } -fun JetMethodDescriptor.renderOriginalReturnType(): String = +fun KotlinMethodDescriptor.renderOriginalReturnType(): String = baseDescriptor.getReturnType()?.let { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } ?: "" -fun JetMethodDescriptor.renderOriginalReceiverType(): String? = +fun KotlinMethodDescriptor.renderOriginalReceiverType(): String? = baseDescriptor.getExtensionReceiverParameter()?.getType()?.let { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMutableMethodDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt similarity index 79% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMutableMethodDescriptor.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt index c3690ef80e5..93fb0427d1e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMutableMethodDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt @@ -18,18 +18,18 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature import org.jetbrains.kotlin.descriptors.Visibility -public class JetMutableMethodDescriptor(override val original: JetMethodDescriptor): JetMethodDescriptor by original { - private val parameters: MutableList = original.getParameters() +public class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescriptor): KotlinMethodDescriptor by original { + private val parameters: MutableList = original.getParameters() - override var receiver: JetParameterInfo? = original.receiver - set(value: JetParameterInfo?) { + override var receiver: KotlinParameterInfo? = original.receiver + set(value: KotlinParameterInfo?) { if (value != null && value !in parameters) { parameters.add(value) } field = value } - public fun addParameter(parameter: JetParameterInfo) { + public fun addParameter(parameter: KotlinParameterInfo) { parameters.add(parameter) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt similarity index 95% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt index 42dcb20ccf9..bce222156fa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinParameterInfo.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.compareDescriptors import org.jetbrains.kotlin.idea.core.refactoring.quoteIfNeeded -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableDefinitionUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers @@ -36,14 +36,14 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.types.KotlinType import java.util.* -public class JetParameterInfo @JvmOverloads constructor ( +public class KotlinParameterInfo @JvmOverloads constructor ( val callableDescriptor: CallableDescriptor, val originalIndex: Int = -1, private var name: String, type: KotlinType? = null, var defaultValueForParameter: KtExpression? = null, var defaultValueForCall: KtExpression? = null, - var valOrVar: JetValVar = JetValVar.None, + var valOrVar: KotlinValVar = KotlinValVar.None, val modifierList: KtModifierList? = null ): ParameterInfo { val originalType: KotlinType? = type @@ -150,14 +150,14 @@ public class JetParameterInfo @JvmOverloads constructor ( throw UnsupportedOperationException() } - public fun renderType(parameterIndex: Int, inheritedCallable: JetCallableDefinitionUsage<*>): String { + public fun renderType(parameterIndex: Int, inheritedCallable: KotlinCallableDefinitionUsage<*>): String { val typeSubstitutor = inheritedCallable.typeSubstitutor ?: return currentTypeText val currentBaseFunction = inheritedCallable.baseFunction.currentCallableDescriptor ?: return currentTypeText val parameterType = currentBaseFunction.getValueParameters().get(parameterIndex).getType() return parameterType.renderTypeWithSubstitution(typeSubstitutor, currentTypeText, true) } - public fun getInheritedName(inheritedCallable: JetCallableDefinitionUsage<*>): String { + public fun getInheritedName(inheritedCallable: KotlinCallableDefinitionUsage<*>): String { if (!inheritedCallable.isInherited) return name val baseFunction = inheritedCallable.baseFunction @@ -178,7 +178,7 @@ public class JetParameterInfo @JvmOverloads constructor ( } } - public fun requiresExplicitType(inheritedCallable: JetCallableDefinitionUsage<*>): Boolean { + public fun requiresExplicitType(inheritedCallable: KotlinCallableDefinitionUsage<*>): Boolean { val inheritedFunctionDescriptor = inheritedCallable.originalCallableDescriptor if (inheritedFunctionDescriptor !is AnonymousFunctionDescriptor) return true @@ -189,14 +189,14 @@ public class JetParameterInfo @JvmOverloads constructor ( return parameter.getTypeReference() != null } - public fun getDeclarationSignature(parameterIndex: Int, inheritedCallable: JetCallableDefinitionUsage<*>): String { + public fun getDeclarationSignature(parameterIndex: Int, inheritedCallable: KotlinCallableDefinitionUsage<*>): String { val buffer = StringBuilder() if (modifierList != null) { buffer.append(modifierList.getText()).append(' ') } - if (valOrVar != JetValVar.None) { + if (valOrVar != KotlinValVar.None) { buffer.append(valOrVar).append(' ') } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetUsagesViewDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinUsagesViewDescriptor.kt similarity index 91% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetUsagesViewDescriptor.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinUsagesViewDescriptor.kt index ec6986e77ad..8bc07726f59 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetUsagesViewDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinUsagesViewDescriptor.kt @@ -21,7 +21,7 @@ import com.intellij.refactoring.RefactoringBundle import com.intellij.usageView.UsageViewBundle import com.intellij.usageView.UsageViewDescriptor -public class JetUsagesViewDescriptor(private val element: PsiElement, private val elementsHeader: String) : UsageViewDescriptor { +public class KotlinUsagesViewDescriptor(private val element: PsiElement, private val elementsHeader: String) : UsageViewDescriptor { override fun getElements(): Array = arrayOf(element) override fun getProcessedElementsHeader(): String = elementsHeader diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetValVar.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinValVar.kt similarity index 81% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetValVar.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinValVar.kt index 1b35cd7e898..3ae82b6c553 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetValVar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinValVar.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtPsiFactory -public enum class JetValVar(val keywordName: String) { +public enum class KotlinValVar(val keywordName: String) { None("none") { override fun createKeyword(factory: KtPsiFactory) = null }, @@ -36,11 +36,11 @@ public enum class JetValVar(val keywordName: String) { abstract fun createKeyword(factory: KtPsiFactory): PsiElement? } -fun PsiElement?.toValVar(): JetValVar { +fun PsiElement?.toValVar(): KotlinValVar { return when { - this == null -> JetValVar.None - getNode().getElementType() == KtTokens.VAL_KEYWORD -> JetValVar.Val - getNode().getElementType() == KtTokens.VAR_KEYWORD -> JetValVar.Var + this == null -> KotlinValVar.None + getNode().getElementType() == KtTokens.VAL_KEYWORD -> KotlinValVar.Val + getNode().getElementType() == KtTokens.VAR_KEYWORD -> KotlinValVar.Var else -> throw IllegalArgumentException("Unknown val/var token: " + getText()) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt index e8128db45ea..38d5db97c94 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/changeSignatureUtils.kt @@ -22,7 +22,7 @@ import com.intellij.refactoring.changeSignature.OverriderUsageInfo import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.DeferredJavaMethodKotlinCallerUsage import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JavaMethodKotlinUsageWithDelegate -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableDefinitionUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallerUsage import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.* @@ -65,8 +65,8 @@ public fun KtElement.isInsideOfCallerBody(allUsages: Array): Bool } fun getCallableSubstitutor( - baseFunction: JetCallableDefinitionUsage<*>, - derivedCallable: JetCallableDefinitionUsage<*> + baseFunction: KotlinCallableDefinitionUsage<*>, + derivedCallable: KotlinCallableDefinitionUsage<*> ): TypeSubstitutor? { val currentBaseFunction = baseFunction.currentCallableDescriptor ?: return null val currentDerivedFunction = derivedCallable.currentCallableDescriptor ?: return null diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallableParameterTableModel.java similarity index 69% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallableParameterTableModel.java index 50c57afda87..4e920e79dd2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinCallableParameterTableModel.java @@ -23,32 +23,32 @@ import com.intellij.refactoring.changeSignature.ParameterTableModelBase; import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import com.intellij.util.ui.ColumnInfo; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar; import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtPsiFactory; import org.jetbrains.kotlin.psi.KtPsiFactoryKt; -public abstract class JetCallableParameterTableModel extends ParameterTableModelBase> { +public abstract class KotlinCallableParameterTableModel extends ParameterTableModelBase> { private final Project project; - private final JetMethodDescriptor methodDescriptor; + private final KotlinMethodDescriptor methodDescriptor; - protected JetCallableParameterTableModel(JetMethodDescriptor methodDescriptor, PsiElement context, ColumnInfo... columnInfos) { + protected KotlinCallableParameterTableModel(KotlinMethodDescriptor methodDescriptor, PsiElement context, ColumnInfo... columnInfos) { super(context, context, columnInfos); this.methodDescriptor = methodDescriptor; project = context.getProject(); } @Nullable - public JetParameterInfo getReceiver() { + public KotlinParameterInfo getReceiver() { return null; } @Override - protected ParameterTableModelItemBase createRowItem(@Nullable JetParameterInfo parameterInfo) { + protected ParameterTableModelItemBase createRowItem(@Nullable KotlinParameterInfo parameterInfo) { if (parameterInfo == null) { - parameterInfo = new JetParameterInfo(methodDescriptor.getBaseDescriptor(), -1, "", null, null, null, JetValVar.None, null); + parameterInfo = new KotlinParameterInfo(methodDescriptor.getBaseDescriptor(), -1, "", null, null, null, KotlinValVar.None, null); } KtPsiFactory psiFactory = KtPsiFactoryKt.KtPsiFactory(project); PsiCodeFragment paramTypeCodeFragment = psiFactory.createTypeCodeFragment(parameterInfo.getTypeText(), myTypeContext); @@ -57,7 +57,7 @@ public abstract class JetCallableParameterTableModel extends ParameterTableModel defaultValueForCall != null ? defaultValueForCall.getText() : "", myDefaultValueContext ); - return new ParameterTableModelItemBase(parameterInfo, paramTypeCodeFragment, defaultValueCodeFragment) { + return new ParameterTableModelItemBase(parameterInfo, paramTypeCodeFragment, defaultValueCodeFragment) { @Override public boolean isEllipsisType() { return false; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangePropertySignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt similarity index 83% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangePropertySignatureDialog.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt index c8be5b0e3a6..a847649e881 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangePropertySignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangePropertySignatureDialog.kt @@ -41,9 +41,9 @@ import javax.swing.JComponent import javax.swing.JLabel import kotlin.properties.Delegates -public class JetChangePropertySignatureDialog( +public class KotlinChangePropertySignatureDialog( project: Project, - private val methodDescriptor: JetMethodDescriptor, + private val methodDescriptor: KotlinMethodDescriptor, private val commandName: String? ): RefactoringDialog(project, true) { private val visibilityCombo = JComboBox( @@ -98,7 +98,7 @@ public class JetChangePropertySignatureDialog( receiverTypeCheckBox.addActionListener { updateReceiverUI() } receiverTypeCheckBox.setSelected(methodDescriptor.receiver != null) addComponent(receiverTypeCheckBox) - this@JetChangePropertySignatureDialog.receiverTypeCheckBox = receiverTypeCheckBox + this@KotlinChangePropertySignatureDialog.receiverTypeCheckBox = receiverTypeCheckBox val receiverTypeCodeFragment = psiFactory.createTypeCodeFragment(methodDescriptor.renderOriginalReceiverType() ?: "", methodDescriptor.baseDeclaration) @@ -144,34 +144,34 @@ public class JetChangePropertySignatureDialog( val originalDescriptor = methodDescriptor.original val receiver = if (receiverTypeCheckBox?.isSelected() ?: false) { - originalDescriptor.receiver ?: JetParameterInfo(callableDescriptor = originalDescriptor.baseDescriptor, - name = "receiver", - defaultValueForCall = getDefaultReceiverValue()) + originalDescriptor.receiver ?: KotlinParameterInfo(callableDescriptor = originalDescriptor.baseDescriptor, + name = "receiver", + defaultValueForCall = getDefaultReceiverValue()) } else null receiver?.currentTypeText = receiverTypeField.getText() - val changeInfo = JetChangeInfo(originalDescriptor, - nameField.getText(), - null, - returnTypeField.getText(), - visibilityCombo.getSelectedItem() as Visibility, - emptyList(), - receiver, - originalDescriptor.getMethod()) + val changeInfo = KotlinChangeInfo(originalDescriptor, + nameField.getText(), + null, + returnTypeField.getText(), + visibilityCombo.getSelectedItem() as Visibility, + emptyList(), + receiver, + originalDescriptor.getMethod()) - invokeRefactoring(JetChangeSignatureProcessor(myProject, changeInfo, commandName ?: getTitle())) + invokeRefactoring(KotlinChangeSignatureProcessor(myProject, changeInfo, commandName ?: getTitle())) } companion object { fun createProcessorForSilentRefactoring( project: Project, commandName: String, - descriptor: JetMethodDescriptor + descriptor: KotlinMethodDescriptor ): BaseRefactoringProcessor { val originalDescriptor = descriptor.original - val changeInfo = JetChangeInfo(methodDescriptor = originalDescriptor, context = originalDescriptor.getMethod()) + val changeInfo = KotlinChangeInfo(methodDescriptor = originalDescriptor, context = originalDescriptor.getMethod()) changeInfo.setNewName(descriptor.getName()) changeInfo.receiverParameterInfo = descriptor.receiver - return JetChangeSignatureProcessor(project, changeInfo, commandName) + return KotlinChangeSignatureProcessor(project, changeInfo, commandName) } } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt similarity index 80% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt index b409f861b7b..5b914060a7f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetChangeSignatureDialog.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureDialog.kt @@ -45,9 +45,9 @@ import com.intellij.util.ui.table.JBTableRowEditor import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.idea.KotlinFileType -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.changeSignature.* -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor.Kind +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor.Kind import org.jetbrains.kotlin.psi.KtExpressionCodeFragment import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtTypeCodeFragment @@ -60,35 +60,35 @@ import java.awt.event.ItemListener import java.util.* import javax.swing.* -public class JetChangeSignatureDialog( +public class KotlinChangeSignatureDialog( project: Project, - methodDescriptor: JetMethodDescriptor, + methodDescriptor: KotlinMethodDescriptor, context: PsiElement, private val commandName: String? ) : ChangeSignatureDialogBase< - JetParameterInfo, + KotlinParameterInfo, PsiElement, Visibility, - JetMethodDescriptor, - ParameterTableModelItemBase, - JetCallableParameterTableModel>(project, methodDescriptor, false, context) { + KotlinMethodDescriptor, + ParameterTableModelItemBase, + KotlinCallableParameterTableModel>(project, methodDescriptor, false, context) { override fun getFileType() = KotlinFileType.INSTANCE - override fun createParametersInfoModel(descriptor: JetMethodDescriptor) = createParametersInfoModel(descriptor, myDefaultValueContext) + override fun createParametersInfoModel(descriptor: KotlinMethodDescriptor) = createParametersInfoModel(descriptor, myDefaultValueContext) override fun createReturnTypeCodeFragment() = createReturnTypeCodeFragment(myProject, myMethod) - private val parametersTableModel: JetCallableParameterTableModel get() = super.myParametersTableModel + private val parametersTableModel: KotlinCallableParameterTableModel get() = super.myParametersTableModel - override fun getRowPresentation(item: ParameterTableModelItemBase, selected: Boolean, focused: Boolean): JComponent? { + override fun getRowPresentation(item: ParameterTableModelItemBase, selected: Boolean, focused: Boolean): JComponent? { val panel = JPanel(BorderLayout()) val valOrVar: String if (myMethod.kind === Kind.PRIMARY_CONSTRUCTOR) { valOrVar = when (item.parameter.valOrVar) { - JetValVar.None -> " " - JetValVar.Val -> "val " - JetValVar.Var -> "var " + KotlinValVar.None -> " " + KotlinValVar.Val -> "val " + KotlinValVar.Var -> "var " } } else { @@ -127,12 +127,12 @@ public class JetChangeSignatureDialog( return panel } - private fun getPresentationName(item: ParameterTableModelItemBase): String { + private fun getPresentationName(item: ParameterTableModelItemBase): String { val parameter = item.parameter return if (parameter == parametersTableModel.getReceiver()) "" else parameter.getName() } - private fun getColumnTextMaxLength(nameFunction: Function1, String?>) = + private fun getColumnTextMaxLength(nameFunction: Function1, String?>) = parametersTableModel.getItems().map { nameFunction(it)?.length() ?: 0 }.max() ?: 0 private fun getParamNamesMaxLength() = getColumnTextMaxLength { getPresentationName(it) } @@ -143,7 +143,7 @@ public class JetChangeSignatureDialog( override fun isListTableViewSupported() = true - override fun isEmptyRow(row: ParameterTableModelItemBase): Boolean { + override fun isEmptyRow(row: ParameterTableModelItemBase): Boolean { if (!row.parameter.getName().isNullOrEmpty()) return false if (!row.parameter.getTypeText().isNullOrEmpty()) return false return true @@ -156,7 +156,7 @@ public class JetChangeSignatureDialog( override fun mayPropagateParameters() = getParameters().any { it.isNewParameter && it != parametersTableModel.getReceiver() } - override fun getTableEditor(table: JTable, item: ParameterTableModelItemBase): JBTableRowEditor? { + override fun getTableEditor(table: JTable, item: ParameterTableModelItemBase): JBTableRowEditor? { return object : JBTableRowEditor() { private val components = ArrayList() private val nameEditor = EditorTextField(item.parameter.getName(), getProject(), getFileType()) @@ -178,23 +178,23 @@ public class JetChangeSignatureDialog( val component: JComponent val columnFinal = column - if (JetCallableParameterTableModel.isTypeColumn(columnInfo)) { + if (KotlinCallableParameterTableModel.isTypeColumn(columnInfo)) { val document = PsiDocumentManager.getInstance(getProject()).getDocument(item.typeCodeFragment) editor = EditorTextField(document, getProject(), getFileType()) component = editor } - else if (JetCallableParameterTableModel.isNameColumn(columnInfo)) { + else if (KotlinCallableParameterTableModel.isNameColumn(columnInfo)) { editor = nameEditor component = editor updateNameEditor() } - else if (JetCallableParameterTableModel.isDefaultValueColumn(columnInfo) && isDefaultColumnEnabled()) { + else if (KotlinCallableParameterTableModel.isDefaultValueColumn(columnInfo) && isDefaultColumnEnabled()) { val document = PsiDocumentManager.getInstance(getProject()).getDocument(item.defaultValueCodeFragment) editor = EditorTextField(document, getProject(), getFileType()) component = editor } - else if (JetPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo)) { - val comboBox = JComboBox(JetValVar.values()) + else if (KotlinPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo)) { + val comboBox = JComboBox(KotlinValVar.values()) comboBox.setSelectedItem(item.parameter.valOrVar) comboBox.addItemListener(object : ItemListener { override fun itemStateChanged(e: ItemEvent) { @@ -205,12 +205,12 @@ public class JetChangeSignatureDialog( component = comboBox editor = null } - else if (JetFunctionParameterTableModel.isReceiverColumn(columnInfo)) { + else if (KotlinFunctionParameterTableModel.isReceiverColumn(columnInfo)) { val checkBox = JCheckBox() checkBox.setSelected(parametersTableModel.getReceiver() == item.parameter) checkBox.addItemListener { val newReceiver = if (it.getStateChange() == ItemEvent.SELECTED) item.parameter else null - (parametersTableModel as JetFunctionParameterTableModel).setReceiver(newReceiver) + (parametersTableModel as KotlinFunctionParameterTableModel).setReceiver(newReceiver) updateSignature() updateNameEditor() } @@ -247,13 +247,13 @@ public class JetChangeSignatureDialog( override fun getValueAt(column: Int): Any? { val columnInfo = parametersTableModel.getColumnInfos()[column] - if (JetPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo)) + if (KotlinPrimaryConstructorParameterTableModel.isValVarColumn(columnInfo)) return (components.get(column) as @Suppress("NO_TYPE_ARGUMENTS_ON_RHS") JComboBox).getSelectedItem() - else if (JetCallableParameterTableModel.isTypeColumn(columnInfo)) + else if (KotlinCallableParameterTableModel.isTypeColumn(columnInfo)) return item.typeCodeFragment - else if (JetCallableParameterTableModel.isNameColumn(columnInfo)) + else if (KotlinCallableParameterTableModel.isNameColumn(columnInfo)) return (components.get(column) as EditorTextField).getText() - else if (JetCallableParameterTableModel.isDefaultValueColumn(columnInfo)) + else if (KotlinCallableParameterTableModel.isDefaultValueColumn(columnInfo)) return item.defaultValueCodeFragment else return null @@ -332,11 +332,11 @@ public class JetChangeSignatureDialog( if (myNamePanel.isVisible() && myMethod.canChangeName() && !JavaPsiFacade.getInstance(myProject).getNameHelper().isIdentifier(getMethodName())) { - throw ConfigurationException(JetRefactoringBundle.message("function.name.is.invalid")) + throw ConfigurationException(KotlinRefactoringBundle.message("function.name.is.invalid")) } if (myMethod.canChangeReturnType() === MethodDescriptor.ReadWriteOption.ReadWrite && !hasTypeReference(myReturnTypeCodeFragment)) { - throw ConfigurationException(JetRefactoringBundle.message("return.type.is.invalid")) + throw ConfigurationException(KotlinRefactoringBundle.message("return.type.is.invalid")) } val parameterInfos = parametersTableModel.getItems() @@ -346,11 +346,11 @@ public class JetChangeSignatureDialog( if (item.parameter != parametersTableModel.getReceiver() && !JavaPsiFacade.getInstance(myProject).getNameHelper().isIdentifier(parameterName)) { - throw ConfigurationException(JetRefactoringBundle.message("parameter.name.is.invalid", parameterName)) + throw ConfigurationException(KotlinRefactoringBundle.message("parameter.name.is.invalid", parameterName)) } if (!hasTypeReference(item.typeCodeFragment)) { - throw ConfigurationException(JetRefactoringBundle.message("parameter.type.is.invalid", item.typeCodeFragment.getText())) + throw ConfigurationException(KotlinRefactoringBundle.message("parameter.type.is.invalid", item.typeCodeFragment.getText())) } } } @@ -363,10 +363,10 @@ public class JetChangeSignatureDialog( getMethodName(), myDefaultValueContext) changeInfo.primaryPropagationTargets = myMethodsToPropagateParameters ?: emptyList(); - return JetChangeSignatureProcessor(myProject, changeInfo, commandName ?: getTitle()) + return KotlinChangeSignatureProcessor(myProject, changeInfo, commandName ?: getTitle()) } - public fun getMethodDescriptor(): JetMethodDescriptor = myMethod + public fun getMethodDescriptor(): KotlinMethodDescriptor = myMethod override fun getSelectedIdx(): Int { return myMethod.getParameters().withIndex().firstOrNull { it.value.isNewParameter }?.index @@ -374,20 +374,20 @@ public class JetChangeSignatureDialog( } companion object { - private fun createParametersInfoModel(descriptor: JetMethodDescriptor, defaultValueContext: PsiElement): JetCallableParameterTableModel { + private fun createParametersInfoModel(descriptor: KotlinMethodDescriptor, defaultValueContext: PsiElement): KotlinCallableParameterTableModel { return when (descriptor.kind) { - JetMethodDescriptor.Kind.FUNCTION -> JetFunctionParameterTableModel(descriptor, defaultValueContext) - JetMethodDescriptor.Kind.PRIMARY_CONSTRUCTOR -> JetPrimaryConstructorParameterTableModel(descriptor, defaultValueContext) - JetMethodDescriptor.Kind.SECONDARY_CONSTRUCTOR -> JetSecondaryConstructorParameterTableModel(descriptor, defaultValueContext) + KotlinMethodDescriptor.Kind.FUNCTION -> KotlinFunctionParameterTableModel(descriptor, defaultValueContext) + KotlinMethodDescriptor.Kind.PRIMARY_CONSTRUCTOR -> KotlinPrimaryConstructorParameterTableModel(descriptor, defaultValueContext) + KotlinMethodDescriptor.Kind.SECONDARY_CONSTRUCTOR -> KotlinSecondaryConstructorParameterTableModel(descriptor, defaultValueContext) } } - private fun createReturnTypeCodeFragment(project: Project, method: JetMethodDescriptor) = + private fun createReturnTypeCodeFragment(project: Project, method: KotlinMethodDescriptor) = KtPsiFactory(project).createTypeCodeFragment(method.renderOriginalReturnType(), method.baseDeclaration) public fun createRefactoringProcessorForSilentChangeSignature(project: Project, commandName: String, - method: JetMethodDescriptor, + method: KotlinMethodDescriptor, defaultValueContext: PsiElement): BaseRefactoringProcessor { val parameterTableModel = createParametersInfoModel(method, defaultValueContext) parameterTableModel.setParameterInfos(method.getParameters()) @@ -397,15 +397,15 @@ public class JetChangeSignatureDialog( method.getVisibility(), method.getName(), defaultValueContext) - return JetChangeSignatureProcessor(project, changeInfo, commandName) + return KotlinChangeSignatureProcessor(project, changeInfo, commandName) } - private fun evaluateChangeInfo(parametersModel: JetCallableParameterTableModel, + private fun evaluateChangeInfo(parametersModel: KotlinCallableParameterTableModel, returnTypeCodeFragment: PsiCodeFragment?, - methodDescriptor: JetMethodDescriptor, + methodDescriptor: KotlinMethodDescriptor, visibility: Visibility?, methodName: String, - defaultValueContext: PsiElement): JetChangeInfo { + defaultValueContext: PsiElement): KotlinChangeInfo { val parameters = parametersModel.getItems().map { parameter -> val parameterInfo = parameter.parameter @@ -422,14 +422,14 @@ public class JetChangeSignatureDialog( val returnTypeText = if (returnTypeCodeFragment != null) returnTypeCodeFragment.getText().trim() else "" //TODO return the actual type val returnType = if (hasTypeReference(returnTypeCodeFragment)) methodDescriptor.baseDescriptor.builtIns.anyType else null - return JetChangeInfo(methodDescriptor.original, - methodName, - returnType, - returnTypeText, + return KotlinChangeInfo(methodDescriptor.original, + methodName, + returnType, + returnTypeText, visibility ?: Visibilities.DEFAULT_VISIBILITY, - parameters, - parametersModel.getReceiver(), - defaultValueContext) + parameters, + parametersModel.getReceiver(), + defaultValueContext) } private fun hasTypeReference(codeFragment: PsiCodeFragment?): Boolean diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetFunctionParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinFunctionParameterTableModel.java similarity index 76% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetFunctionParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinFunctionParameterTableModel.java index ff715a5276c..58a8bfd7c6c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetFunctionParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinFunctionParameterTableModel.java @@ -24,20 +24,20 @@ import com.intellij.ui.BooleanTableCellRenderer; import com.intellij.util.ui.ColumnInfo; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinFileType; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -public class JetFunctionParameterTableModel extends JetCallableParameterTableModel { - public JetFunctionParameterTableModel(JetMethodDescriptor methodDescriptor, PsiElement context) { +public class KotlinFunctionParameterTableModel extends KotlinCallableParameterTableModel { + public KotlinFunctionParameterTableModel(KotlinMethodDescriptor methodDescriptor, PsiElement context) { super(methodDescriptor, context, new NameColumn(context.getProject()), new TypeColumn(context.getProject(), KotlinFileType.INSTANCE), - new DefaultValueColumn>(context.getProject(), - KotlinFileType.INSTANCE), + new DefaultValueColumn>(context.getProject(), + KotlinFileType.INSTANCE), new ReceiverColumn(context.getProject(), methodDescriptor)); } @@ -51,11 +51,11 @@ public class JetFunctionParameterTableModel extends JetCallableParameterTableMod @Override @Nullable - public JetParameterInfo getReceiver() { + public KotlinParameterInfo getReceiver() { return ((ReceiverColumn)getColumnInfos()[getColumnCount() - 1]).receiver; } - public void setReceiver(@Nullable JetParameterInfo receiver) { + public void setReceiver(@Nullable KotlinParameterInfo receiver) { ((ReceiverColumn)getColumnInfos()[getColumnCount() - 1]).receiver = receiver; } @@ -63,13 +63,13 @@ public class JetFunctionParameterTableModel extends JetCallableParameterTableMod return column instanceof ReceiverColumn; } - protected static class ReceiverColumn> - extends ColumnInfoBase { + protected static class ReceiverColumn> + extends ColumnInfoBase { private final Project project; @Nullable - private JetParameterInfo receiver; + private KotlinParameterInfo receiver; - public ReceiverColumn(Project project, @Nullable JetMethodDescriptor methodDescriptor) { + public ReceiverColumn(Project project, @Nullable KotlinMethodDescriptor methodDescriptor) { super("Receiver:"); this.project = project; this.receiver = methodDescriptor != null ? methodDescriptor.getReceiver() : null; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinPrimaryConstructorParameterTableModel.java similarity index 62% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinPrimaryConstructorParameterTableModel.java index 2b79c4dbff1..a2207849d3b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetPrimaryConstructorParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinPrimaryConstructorParameterTableModel.java @@ -22,56 +22,56 @@ import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import com.intellij.util.ui.ColumnInfo; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.jetbrains.kotlin.idea.KotlinFileType; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar; import javax.swing.*; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -public class JetPrimaryConstructorParameterTableModel extends JetCallableParameterTableModel { - public JetPrimaryConstructorParameterTableModel(JetMethodDescriptor methodDescriptor, PsiElement context) { +public class KotlinPrimaryConstructorParameterTableModel extends KotlinCallableParameterTableModel { + public KotlinPrimaryConstructorParameterTableModel(KotlinMethodDescriptor methodDescriptor, PsiElement context) { super(methodDescriptor, context, new ValVarColumn(), new NameColumn(context.getProject()), new TypeColumn(context.getProject(), KotlinFileType.INSTANCE), - new DefaultValueColumn>(context.getProject(), KotlinFileType.INSTANCE)); + new DefaultValueColumn>(context.getProject(), KotlinFileType.INSTANCE)); } public static boolean isValVarColumn(ColumnInfo column) { return column instanceof ValVarColumn; } - protected static class ValVarColumn extends ColumnInfoBase, JetValVar> { + protected static class ValVarColumn extends ColumnInfoBase, KotlinValVar> { public ValVarColumn() { - super(JetRefactoringBundle.message("column.name.val.var")); + super(KotlinRefactoringBundle.message("column.name.val.var")); } @Override - public boolean isCellEditable(ParameterTableModelItemBase item) { + public boolean isCellEditable(ParameterTableModelItemBase item) { return !item.isEllipsisType() && item.parameter.isNewParameter(); } @Override - public JetValVar valueOf(ParameterTableModelItemBase item) { + public KotlinValVar valueOf(ParameterTableModelItemBase item) { return item.parameter.getValOrVar(); } @Override - public void setValue(ParameterTableModelItemBase item, JetValVar value) { + public void setValue(ParameterTableModelItemBase item, KotlinValVar value) { item.parameter.setValOrVar(value); } @Override - public TableCellRenderer doCreateRenderer(ParameterTableModelItemBase item) { - return new ComboBoxTableRenderer(JetValVar.values()); + public TableCellRenderer doCreateRenderer(ParameterTableModelItemBase item) { + return new ComboBoxTableRenderer(KotlinValVar.values()); } @Override - public TableCellEditor doCreateEditor(ParameterTableModelItemBase item) { + public TableCellEditor doCreateEditor(ParameterTableModelItemBase item) { return new ComboBoxCellEditor(new JComboBox()); } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetSecondaryConstructorParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinSecondaryConstructorParameterTableModel.java similarity index 65% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetSecondaryConstructorParameterTableModel.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinSecondaryConstructorParameterTableModel.java index 3c8571f54fc..c8c48b07068 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetSecondaryConstructorParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinSecondaryConstructorParameterTableModel.java @@ -19,15 +19,15 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui; import com.intellij.psi.PsiElement; import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import org.jetbrains.kotlin.idea.KotlinFileType; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo; -public class JetSecondaryConstructorParameterTableModel extends JetCallableParameterTableModel { - public JetSecondaryConstructorParameterTableModel(JetMethodDescriptor methodDescriptor, PsiElement context) { +public class KotlinSecondaryConstructorParameterTableModel extends KotlinCallableParameterTableModel { + public KotlinSecondaryConstructorParameterTableModel(KotlinMethodDescriptor methodDescriptor, PsiElement context) { super(methodDescriptor, context, new NameColumn(context.getProject()), new TypeColumn(context.getProject(), KotlinFileType.INSTANCE), - new DefaultValueColumn>(context.getProject(), KotlinFileType.INSTANCE)); + new DefaultValueColumn>(context.getProject(), KotlinFileType.INSTANCE)); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodDeferredKotlinUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodDeferredKotlinUsage.kt index 5ae4a990070..d4c506d992c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodDeferredKotlinUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodDeferredKotlinUsage.kt @@ -19,14 +19,14 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo import org.jetbrains.kotlin.psi.KtConstructorDelegationCall import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.types.KotlinType public abstract class JavaMethodDeferredKotlinUsage(element: T) : UsageInfo(element) { - abstract fun resolve(javaMethodChangeInfo: JetChangeInfo): JavaMethodKotlinUsageWithDelegate + abstract fun resolve(javaMethodChangeInfo: KotlinChangeInfo): JavaMethodKotlinUsageWithDelegate } public class DeferredJavaMethodOverrideOrSAMUsage( @@ -34,9 +34,9 @@ public class DeferredJavaMethodOverrideOrSAMUsage( val functionDescriptor: FunctionDescriptor, val samCallType: KotlinType? ) : JavaMethodDeferredKotlinUsage(function) { - override fun resolve(javaMethodChangeInfo: JetChangeInfo): JavaMethodKotlinUsageWithDelegate { + override fun resolve(javaMethodChangeInfo: KotlinChangeInfo): JavaMethodKotlinUsageWithDelegate { return object : JavaMethodKotlinUsageWithDelegate(function, javaMethodChangeInfo) { - override val delegateUsage = JetCallableDefinitionUsage(function, functionDescriptor, javaMethodChangeInfo.methodDescriptor.originalPrimaryCallable, samCallType) + override val delegateUsage = KotlinCallableDefinitionUsage(function, functionDescriptor, javaMethodChangeInfo.methodDescriptor.originalPrimaryCallable, samCallType) } } } @@ -44,7 +44,7 @@ public class DeferredJavaMethodOverrideOrSAMUsage( public class DeferredJavaMethodKotlinCallerUsage( val declaration: KtNamedDeclaration ) : JavaMethodDeferredKotlinUsage(declaration) { - override fun resolve(javaMethodChangeInfo: JetChangeInfo): JavaMethodKotlinUsageWithDelegate { + override fun resolve(javaMethodChangeInfo: KotlinChangeInfo): JavaMethodKotlinUsageWithDelegate { return object : JavaMethodKotlinUsageWithDelegate(declaration, javaMethodChangeInfo) { override val delegateUsage = KotlinCallerUsage(declaration) } @@ -54,9 +54,9 @@ public class DeferredJavaMethodKotlinCallerUsage( public class JavaConstructorDeferredUsageInDelegationCall( val delegationCall: KtConstructorDelegationCall ) : JavaMethodDeferredKotlinUsage(delegationCall) { - override fun resolve(javaMethodChangeInfo: JetChangeInfo): JavaMethodKotlinUsageWithDelegate { + override fun resolve(javaMethodChangeInfo: KotlinChangeInfo): JavaMethodKotlinUsageWithDelegate { return object : JavaMethodKotlinUsageWithDelegate(delegationCall, javaMethodChangeInfo) { - override val delegateUsage = JetConstructorDelegationCallUsage(delegationCall, javaMethodChangeInfo) + override val delegateUsage = KotlinConstructorDelegationCallUsage(delegationCall, javaMethodChangeInfo) } } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt index 496f64dd2ca..df3bb23907c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt @@ -18,27 +18,27 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo import org.jetbrains.kotlin.psi.KtCallElement import org.jetbrains.kotlin.psi.KtConstructorDelegationCall public abstract class JavaMethodKotlinUsageWithDelegate( val psiElement: T, - var javaMethodChangeInfo: JetChangeInfo): UsageInfo(psiElement) { - abstract val delegateUsage: JetUsageInfo + var javaMethodChangeInfo: KotlinChangeInfo): UsageInfo(psiElement) { + abstract val delegateUsage: KotlinUsageInfo fun processUsage(allUsages: Array): Boolean = delegateUsage.processUsage(javaMethodChangeInfo, psiElement, allUsages) } public class JavaMethodKotlinCallUsage( callElement: KtCallElement, - javaMethodChangeInfo: JetChangeInfo, + javaMethodChangeInfo: KotlinChangeInfo, propagationCall: Boolean ): JavaMethodKotlinUsageWithDelegate(callElement, javaMethodChangeInfo) { @Suppress("UNCHECKED_CAST") override val delegateUsage = when { propagationCall -> KotlinCallerCallUsage(psiElement) - psiElement is KtConstructorDelegationCall -> JetConstructorDelegationCallUsage(psiElement, javaMethodChangeInfo) - else -> JetFunctionCallUsage(psiElement, javaMethodChangeInfo.methodDescriptor.originalPrimaryCallable) - } as JetUsageInfo + psiElement is KtConstructorDelegationCall -> KotlinConstructorDelegationCallUsage(psiElement, javaMethodChangeInfo) + else -> KotlinFunctionCallUsage(psiElement, javaMethodChangeInfo.methodDescriptor.originalPrimaryCallable) + } as KotlinUsageInfo } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt similarity index 92% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt index df73a182ea9..9a26280d64f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallableDefinitionUsage.kt @@ -30,9 +30,9 @@ import org.jetbrains.kotlin.idea.core.refactoring.createPrimaryConstructorIfAbse import org.jetbrains.kotlin.idea.core.refactoring.replaceListPsiAndKeepDelimiters import org.jetbrains.kotlin.idea.core.setVisibility import org.jetbrains.kotlin.idea.core.toKeywordToken -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar import org.jetbrains.kotlin.idea.refactoring.changeSignature.getCallableSubstitutor import org.jetbrains.kotlin.idea.util.ShortenReferences import org.jetbrains.kotlin.idea.util.ShortenReferences.Options @@ -48,13 +48,13 @@ import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.substitutions.getTypeSubstitutor import org.jetbrains.kotlin.utils.sure -class JetCallableDefinitionUsage( +class KotlinCallableDefinitionUsage( function: T, val originalCallableDescriptor: CallableDescriptor, - baseFunction: JetCallableDefinitionUsage?, + baseFunction: KotlinCallableDefinitionUsage?, private val samCallType: KotlinType? -) : JetUsageInfo(function) { - val baseFunction: JetCallableDefinitionUsage<*> = baseFunction ?: this +) : KotlinUsageInfo(function) { + val baseFunction: KotlinCallableDefinitionUsage<*> = baseFunction ?: this val hasExpectedType: Boolean = checkIfHasExpectedType(originalCallableDescriptor, isInherited) @@ -98,7 +98,7 @@ class JetCallableDefinitionUsage( val isInherited: Boolean get() = baseFunction !== this - override fun processUsage(changeInfo: JetChangeInfo, element: T, allUsages: Array): Boolean { + override fun processUsage(changeInfo: KotlinChangeInfo, element: T, allUsages: Array): Boolean { if (element !is KtNamedDeclaration) return true val psiFactory = KtPsiFactory(element.project) @@ -142,7 +142,7 @@ class JetCallableDefinitionUsage( return true } - protected fun changeReturnTypeIfNeeded(changeInfo: JetChangeInfo, element: PsiElement) { + protected fun changeReturnTypeIfNeeded(changeInfo: KotlinChangeInfo, element: PsiElement) { if (element !is KtCallableDeclaration) return if (element is KtConstructor<*>) return @@ -166,7 +166,7 @@ class JetCallableDefinitionUsage( } private fun processParameterListWithStructuralChanges( - changeInfo: JetChangeInfo, + changeInfo: KotlinChangeInfo, element: PsiElement, originalParameterList: KtParameterList?, psiFactory: KtPsiFactory) { @@ -224,7 +224,7 @@ class JetCallableDefinitionUsage( newParameterList.addToShorteningWaitSet(Options.DEFAULT) } - private fun changeVisibility(changeInfo: JetChangeInfo, element: PsiElement) { + private fun changeVisibility(changeInfo: KotlinChangeInfo, element: PsiElement) { val newVisibilityToken = changeInfo.newVisibility.toKeywordToken() when (element) { is KtCallableDeclaration -> element.setVisibility(newVisibilityToken) @@ -233,7 +233,7 @@ class JetCallableDefinitionUsage( } } - private fun changeParameter(parameterIndex: Int, parameter: KtParameter, parameterInfo: JetParameterInfo) { + private fun changeParameter(parameterIndex: Int, parameter: KtParameter, parameterInfo: KotlinParameterInfo) { val valOrVarKeyword = parameter.valOrVarKeyword val valOrVar = parameterInfo.valOrVar @@ -247,7 +247,7 @@ class JetCallableDefinitionUsage( valOrVarKeyword.delete() } } - else if (valOrVar != JetValVar.None && newKeyword != null) { + else if (valOrVar != KotlinValVar.None && newKeyword != null) { val firstChild = parameter.firstChild parameter.addBefore(newKeyword, firstChild) parameter.addBefore(psiFactory.createWhiteSpace(), firstChild) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt index 5b550dbf61a..47c27477d1b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinCallerUsages.kt @@ -19,16 +19,16 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.kotlin.idea.core.refactoring.createPrimaryConstructorParameterListIfAbsent -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.getAffectedCallables import org.jetbrains.kotlin.idea.refactoring.changeSignature.isInsideOfCallerBody import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* -public class KotlinCallerUsage(element: KtNamedDeclaration): JetUsageInfo(element) { - override fun processUsage(changeInfo: JetChangeInfo, element: KtNamedDeclaration, allUsages: Array): Boolean { +public class KotlinCallerUsage(element: KtNamedDeclaration): KotlinUsageInfo(element) { + override fun processUsage(changeInfo: KotlinChangeInfo, element: KtNamedDeclaration, allUsages: Array): Boolean { // Do not process function twice - if (changeInfo.getAffectedCallables().any { it is JetCallableDefinitionUsage<*> && it.getElement() == element }) return true + if (changeInfo.getAffectedCallables().any { it is KotlinCallableDefinitionUsage<*> && it.getElement() == element }) return true val parameterList = when (element) { is KtFunction -> element.getValueParameterList() @@ -50,8 +50,8 @@ public class KotlinCallerUsage(element: KtNamedDeclaration): JetUsageInfo(element) { - override fun processUsage(changeInfo: JetChangeInfo, element: KtCallElement, allUsages: Array): Boolean { +public class KotlinCallerCallUsage(element: KtCallElement): KotlinUsageInfo(element) { + override fun processUsage(changeInfo: KotlinChangeInfo, element: KtCallElement, allUsages: Array): Boolean { val argumentList = element.getValueArgumentList() ?: return true val psiFactory = KtPsiFactory(getProject()) val isNamedCall = argumentList.getArguments().any { it.getArgumentName() != null } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetConstructorDelegationCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinConstructorDelegationCallUsage.kt similarity index 78% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetConstructorDelegationCallUsage.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinConstructorDelegationCallUsage.kt index 734cdb790d2..2fc8205d1e9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetConstructorDelegationCallUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinConstructorDelegationCallUsage.kt @@ -17,18 +17,18 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo import org.jetbrains.kotlin.psi.KtConstructorDelegationCall import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtSecondaryConstructor -public class JetConstructorDelegationCallUsage( +public class KotlinConstructorDelegationCallUsage( call: KtConstructorDelegationCall, - changeInfo: JetChangeInfo -) : JetUsageInfo(call) { - val delegate = JetFunctionCallUsage(call, changeInfo.methodDescriptor.originalPrimaryCallable) + changeInfo: KotlinChangeInfo +) : KotlinUsageInfo(call) { + val delegate = KotlinFunctionCallUsage(call, changeInfo.methodDescriptor.originalPrimaryCallable) - override fun processUsage(changeInfo: JetChangeInfo, element: KtConstructorDelegationCall, allUsages: Array): Boolean { + override fun processUsage(changeInfo: KotlinChangeInfo, element: KtConstructorDelegationCall, allUsages: Array): Boolean { val isThisCall = element.isCallToThis() var elementToWorkWith = element diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinEnumEntryWithoutSuperCallUsage.kt similarity index 65% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinEnumEntryWithoutSuperCallUsage.kt index 6c2135e1cba..f91f6afa085 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinEnumEntryWithoutSuperCallUsage.kt @@ -17,14 +17,11 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo -import org.jetbrains.kotlin.psi.KtDelegatorToSuperCall -import org.jetbrains.kotlin.psi.KtEnumEntry -import org.jetbrains.kotlin.psi.KtInitializerList -import org.jetbrains.kotlin.psi.KtPsiFactory +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo +import org.jetbrains.kotlin.psi.* -public class JetEnumEntryWithoutSuperCallUsage(enumEntry: KtEnumEntry) : JetUsageInfo(enumEntry) { - override fun processUsage(changeInfo: JetChangeInfo, element: KtEnumEntry, allUsages: Array): Boolean { +public class KotlinEnumEntryWithoutSuperCallUsage(enumEntry: KtEnumEntry) : KotlinUsageInfo(enumEntry) { + override fun processUsage(changeInfo: KotlinChangeInfo, element: KtEnumEntry, allUsages: Array): Boolean { if (changeInfo.newParameters.size() > 0) { val psiFactory = KtPsiFactory(element) @@ -33,7 +30,7 @@ public class JetEnumEntryWithoutSuperCallUsage(enumEntry: KtEnumEntry) : JetUsag element.nameIdentifier ) as KtInitializerList).initializers[0] as KtDelegatorToSuperCall - return JetFunctionCallUsage(delegatorToSuperCall, changeInfo.methodDescriptor.originalPrimaryCallable) + return KotlinFunctionCallUsage(delegatorToSuperCall, changeInfo.methodDescriptor.originalPrimaryCallable) .processUsage(changeInfo, delegatorToSuperCall, allUsages) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt similarity index 95% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt index 43b1aa94a19..01a33ec164a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.kotlin.idea.core.moveFunctionLiteralOutsideParentheses import org.jetbrains.kotlin.idea.core.refactoring.replaceListPsiAndKeepDelimiters -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.isInsideOfCallerBody import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.createNameCounterpartMap import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler @@ -53,14 +53,14 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.utils.sure import java.util.* -class JetFunctionCallUsage( +class KotlinFunctionCallUsage( element: KtCallElement, - private val callee: JetCallableDefinitionUsage<*> -) : JetUsageInfo(element) { + private val callee: KotlinCallableDefinitionUsage<*> +) : KotlinUsageInfo(element) { private val context = element.analyze(BodyResolveMode.FULL) private val resolvedCall = element.getResolvedCall(context) - override fun processUsage(changeInfo: JetChangeInfo, element: KtCallElement, allUsages: Array): Boolean { + override fun processUsage(changeInfo: KotlinChangeInfo, element: KtCallElement, allUsages: Array): Boolean { if (shouldSkipUsage(element)) return true changeNameIfNeeded(changeInfo, element) @@ -106,7 +106,7 @@ class JetFunctionCallUsage( return resolvedCall?.resultingDescriptor is JavaMethodDescriptor } - protected fun changeNameIfNeeded(changeInfo: JetChangeInfo, element: KtCallElement) { + protected fun changeNameIfNeeded(changeInfo: KotlinChangeInfo, element: KtCallElement) { if (!changeInfo.isNameChanged) return val callee = element.calleeExpression @@ -238,7 +238,7 @@ class JetFunctionCallUsage( } class ArgumentInfo( - val parameter: JetParameterInfo, + val parameter: KotlinParameterInfo, val parameterIndex: Int, val resolvedArgument: ResolvedValueArgument?, val receiverValue: ReceiverValue? @@ -252,7 +252,7 @@ class JetFunctionCallUsage( var name: String? = null private set - fun makeNamed(callee: JetCallableDefinitionUsage<*>) { + fun makeNamed(callee: KotlinCallableDefinitionUsage<*>) { name = parameter.getInheritedName(callee) } @@ -290,7 +290,7 @@ class JetFunctionCallUsage( } } - private fun updateArgumentsAndReceiver(changeInfo: JetChangeInfo, element: KtCallElement, allUsages: Array) { + private fun updateArgumentsAndReceiver(changeInfo: KotlinChangeInfo, element: KtCallElement, allUsages: Array) { if (isPropertyJavaUsage) return updateJavaPropertyCall(changeInfo, element) val fullCallElement = element.getQualifiedExpressionForSelector() ?: element @@ -439,7 +439,7 @@ class JetFunctionCallUsage( } } - private fun changeArgumentNames(changeInfo: JetChangeInfo, element: KtCallElement) { + private fun changeArgumentNames(changeInfo: KotlinChangeInfo, element: KtCallElement) { for (argument in element.valueArguments) { val argumentName = argument.getArgumentName() val argumentNameExpression = argumentName?.referenceExpression ?: continue @@ -450,7 +450,7 @@ class JetFunctionCallUsage( } } - private fun changeArgumentName(argumentNameExpression: KtSimpleNameExpression?, parameterInfo: JetParameterInfo) { + private fun changeArgumentName(argumentNameExpression: KtSimpleNameExpression?, parameterInfo: KotlinParameterInfo) { val identifier = argumentNameExpression?.getIdentifier() ?: return val newName = parameterInfo.getInheritedName(callee) identifier.replace(KtPsiFactory(project).createIdentifier(newName)) @@ -471,7 +471,7 @@ class JetFunctionCallUsage( private val SHORTEN_ARGUMENTS_OPTIONS = ShortenReferences.Options(true, true) - private fun updateJavaPropertyCall(changeInfo: JetChangeInfo, element: KtCallElement) { + private fun updateJavaPropertyCall(changeInfo: KotlinChangeInfo, element: KtCallElement) { val newReceiverInfo = changeInfo.receiverParameterInfo val originalReceiverInfo = changeInfo.methodDescriptor.receiver if (newReceiverInfo == originalReceiverInfo) return diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetImplicitThisToParameterUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinImplicitThisToParameterUsage.kt similarity index 75% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetImplicitThisToParameterUsage.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinImplicitThisToParameterUsage.kt index 313f0182416..613010da1e4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetImplicitThisToParameterUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinImplicitThisToParameterUsage.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtQualifiedExpression import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -26,14 +26,14 @@ import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.kotlin.idea.util.ShortenReferences.Options -public abstract class JetImplicitReceiverUsage(callElement: KtElement): JetUsageInfo(callElement) { +public abstract class KotlinImplicitReceiverUsage(callElement: KtElement): KotlinUsageInfo(callElement) { protected abstract fun getNewReceiverText(): String protected open fun processReplacedElement(element: KtElement) { } - override fun processUsage(changeInfo: JetChangeInfo, element: KtElement, allUsages: Array): Boolean { + override fun processUsage(changeInfo: KotlinChangeInfo, element: KtElement, allUsages: Array): Boolean { val newQualifiedCall = KtPsiFactory(element.getProject()).createExpression( "${getNewReceiverText()}.${element.getText()}" ) as KtQualifiedExpression @@ -42,11 +42,11 @@ public abstract class JetImplicitReceiverUsage(callElement: KtElement): JetUsage } } -public class JetImplicitThisToParameterUsage( +public class KotlinImplicitThisToParameterUsage( callElement: KtElement, - val parameterInfo: JetParameterInfo, - val containingCallable: JetCallableDefinitionUsage<*> -): JetImplicitReceiverUsage(callElement) { + val parameterInfo: KotlinParameterInfo, + val containingCallable: KotlinCallableDefinitionUsage<*> +): KotlinImplicitReceiverUsage(callElement) { override fun getNewReceiverText(): String = parameterInfo.getInheritedName(containingCallable) override fun processReplacedElement(element: KtElement) { @@ -54,10 +54,10 @@ public class JetImplicitThisToParameterUsage( } } -public class JetImplicitThisUsage( +public class KotlinImplicitThisUsage( callElement: KtElement, val targetDescriptor: DeclarationDescriptor -): JetImplicitReceiverUsage(callElement) { +): KotlinImplicitReceiverUsage(callElement) { override fun getNewReceiverText(): String { val name = targetDescriptor.getName() return if (name.isSpecial()) "this" else "this@${name.asString()}" diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetParameterUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinParameterUsage.kt similarity index 72% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetParameterUsage.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinParameterUsage.kt index afa88b22b78..6cf635f521c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetParameterUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinParameterUsage.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.KtPsiFactory -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.kotlin.idea.core.KotlinNameSuggester @@ -30,14 +30,14 @@ import org.jetbrains.kotlin.psi.KtThisExpression import org.jetbrains.kotlin.idea.util.ShortenReferences.Options // Explicit reference to function parameter or outer this -public abstract class JetExplicitReferenceUsage(element: T) : JetUsageInfo(element) { - abstract fun getReplacementText(changeInfo: JetChangeInfo): String +public abstract class KotlinExplicitReferenceUsage(element: T) : KotlinUsageInfo(element) { + abstract fun getReplacementText(changeInfo: KotlinChangeInfo): String protected open fun processReplacedElement(element: KtElement) { } - override fun processUsage(changeInfo: JetChangeInfo, element: T, allUsages: Array): Boolean { + override fun processUsage(changeInfo: KotlinChangeInfo, element: T, allUsages: Array): Boolean { val newElement = KtPsiFactory(element.getProject()).createExpression(getReplacementText(changeInfo)) val elementToReplace = (element.getParent() as? KtThisExpression) ?: element processReplacedElement(elementToReplace.replace(newElement) as KtElement) @@ -45,18 +45,18 @@ public abstract class JetExplicitReferenceUsage(element: T) : Jet } } -public class JetParameterUsage( +public class KotlinParameterUsage( element: KtElement, - private val parameterInfo: JetParameterInfo, - val containingCallable: JetCallableDefinitionUsage<*> -) : JetExplicitReferenceUsage(element) { + private val parameterInfo: KotlinParameterInfo, + val containingCallable: KotlinCallableDefinitionUsage<*> +) : KotlinExplicitReferenceUsage(element) { override fun processReplacedElement(element: KtElement) { val qualifiedExpression = element.getParent() as? KtQualifiedExpression val elementToShorten = if (qualifiedExpression?.getReceiverExpression() == element) qualifiedExpression!! else element elementToShorten.addToShorteningWaitSet(Options(removeThis = true, removeThisLabels = true)) } - override fun getReplacementText(changeInfo: JetChangeInfo): String { + override fun getReplacementText(changeInfo: KotlinChangeInfo): String { if (changeInfo.receiverParameterInfo != parameterInfo) return parameterInfo.getInheritedName(containingCallable) val newName = changeInfo.getNewName() @@ -66,13 +66,13 @@ public class JetParameterUsage( } } -public class JetNonQualifiedOuterThisUsage( +public class KotlinNonQualifiedOuterThisUsage( element: KtThisExpression, val targetDescriptor: DeclarationDescriptor -) : JetExplicitReferenceUsage(element) { +) : KotlinExplicitReferenceUsage(element) { override fun processReplacedElement(element: KtElement) { element.addToShorteningWaitSet(Options(removeThisLabels = true)) } - override fun getReplacementText(changeInfo: JetChangeInfo): String = "this@${targetDescriptor.getName().asString()}" + override fun getReplacementText(changeInfo: KotlinChangeInfo): String = "this@${targetDescriptor.getName().asString()}" } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetPropertyCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinPropertyCallUsage.kt similarity index 82% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetPropertyCallUsage.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinPropertyCallUsage.kt index 823eb72d420..3595a61ebb0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetPropertyCallUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinPropertyCallUsage.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.idea.caches.resolve.analyze -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtQualifiedExpression @@ -28,22 +28,22 @@ import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver -public class JetPropertyCallUsage(element: KtSimpleNameExpression): JetUsageInfo(element) { +public class KotlinPropertyCallUsage(element: KtSimpleNameExpression): KotlinUsageInfo(element) { private val resolvedCall = element.getResolvedCall(element.analyze()) - override fun processUsage(changeInfo: JetChangeInfo, element: KtSimpleNameExpression, allUsages: Array): Boolean { + override fun processUsage(changeInfo: KotlinChangeInfo, element: KtSimpleNameExpression, allUsages: Array): Boolean { updateName(changeInfo, element) updateReceiver(changeInfo, element) return true } - private fun updateName(changeInfo: JetChangeInfo, element: KtSimpleNameExpression) { + private fun updateName(changeInfo: KotlinChangeInfo, element: KtSimpleNameExpression) { if (changeInfo.isNameChanged()) { element.mainReference.handleElementRename(changeInfo.getNewName()) } } - private fun updateReceiver(changeInfo: JetChangeInfo, element: KtSimpleNameExpression) { + private fun updateReceiver(changeInfo: KotlinChangeInfo, element: KtSimpleNameExpression) { val newReceiver = changeInfo.receiverParameterInfo val oldReceiver = changeInfo.methodDescriptor.receiver if (newReceiver == oldReceiver) return diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetUsageInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinUsageInfo.kt similarity index 78% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetUsageInfo.kt rename to idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinUsageInfo.kt index fc988cc3910..4ca73c2f139 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetUsageInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinUsageInfo.kt @@ -19,14 +19,14 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.usageView.UsageInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo -public abstract class JetUsageInfo : UsageInfo { +public abstract class KotlinUsageInfo : UsageInfo { public constructor(element: T) : super(element) public constructor(reference: PsiReference) : super(reference) @Suppress("UNCHECKED_CAST") override fun getElement() = super.getElement() as T? - public abstract fun processUsage(changeInfo: JetChangeInfo, element: T, allUsages: Array): Boolean + public abstract fun processUsage(changeInfo: KotlinChangeInfo, element: T, allUsages: Array): Boolean } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt index 12d9499a094..aa879f6c152 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ExtractKotlinFunctionHandler.kt @@ -23,7 +23,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.openapi.project.Project import org.jetbrains.kotlin.idea.core.refactoring.getExtractionContainers -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ui.KotlinExtractFunctionDialog import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtBlockExpression @@ -83,4 +83,4 @@ public class ExtractKotlinFunctionHandler( } } -val EXTRACT_FUNCTION: String = JetRefactoringBundle.message("extract.function") +val EXTRACT_FUNCTION: String = KotlinRefactoringBundle.message("extract.function") diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java index e49e914c59e..c6bfd788f14 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinFileType; import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.core.refactoring.JetRefactoringUtilKt; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.lexer.KtTokens; @@ -78,7 +78,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { this.onAccept = onAccept; setModal(true); - setTitle(JetRefactoringBundle.message("extract.function")); + setTitle(KotlinRefactoringBundle.message("extract.function")); init(); update(); } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt index 9d4a0ee341a..8e5d8a06aed 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.replaced -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.ErrorMessage import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.Status import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.ExpressionValue @@ -457,7 +457,7 @@ class AnalysisResult ( } fun renderMessage(): String { - val message = JetRefactoringBundle.message( + val message = KotlinRefactoringBundle.message( when (this) { NO_EXPRESSION -> "cannot.refactor.no.expression" NO_CONTAINER -> "cannot.refactor.no.container" diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt index 254da240998..4c34a282305 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.Editor import java.util.ArrayList import com.intellij.openapi.editor.markup.RangeHighlighter import com.intellij.openapi.editor.ScrollType -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import com.intellij.openapi.application.ApplicationNamesInfo import com.intellij.openapi.editor.colors.EditorColorsManager import com.intellij.openapi.editor.colors.EditorColors @@ -79,7 +79,7 @@ public fun processDuplicates( else Messages.showYesNoDialog( project, - JetRefactoringBundle.message( + KotlinRefactoringBundle.message( "0.has.detected.1.code.fragments.in.this.file.that.can.be.replaced.with.a.call.to.extracted.declaration", ApplicationNamesInfo.getInstance().getProductName(), duplicateReplacers.size() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index 4ee4bd81290..19158f4752b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator import org.jetbrains.kotlin.idea.core.compareDescriptors import org.jetbrains.kotlin.idea.core.refactoring.createTempCopy -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.ErrorMessage import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.Status import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.* @@ -986,7 +986,7 @@ internal fun KtNamedDeclaration.getGeneratedBody() = fun ExtractableCodeDescriptor.validate(): ExtractableCodeDescriptorWithConflicts { fun getDeclarationMessage(declaration: PsiNamedElement, messageKey: String, capitalize: Boolean = true): String { - val message = JetRefactoringBundle.message(messageKey, RefactoringUIUtil.getDescription(declaration, true)) + val message = KotlinRefactoringBundle.message(messageKey, RefactoringUIUtil.getDescription(declaration, true)) return if (capitalize) message.capitalize() else message } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt index 4f7be4509c1..6a5549695e1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt @@ -29,7 +29,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.ui.JBColor import com.intellij.ui.NonFocusableCheckBox import org.jetbrains.kotlin.idea.core.refactoring.createPrimaryConstructorParameterListIfAbsent -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinValVar import org.jetbrains.kotlin.idea.refactoring.introduce.AbstractKotlinInplaceIntroducer import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinInplaceVariableIntroducer import org.jetbrains.kotlin.idea.util.application.runWriteAction @@ -135,7 +135,7 @@ public class KotlinInplaceParameterIntroducer( val parameterName = currentName ?: parameter.getName() val parameterType = currentType ?: parameter.getTypeReference()!!.getText() descriptor = descriptor.copy(newParameterName = parameterName!!, newParameterTypeText = parameterType) - val modifier = if (valVar != JetValVar.None) "${valVar.keywordName} " else "" + val modifier = if (valVar != KotlinValVar.None) "${valVar.keywordName} " else "" val defaultValue = if (withDefaultValue) " = ${newArgumentValue.getText()}" else "" "$modifier$parameterName: $parameterType$defaultValue" diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt index 0b5e964b963..f000c8e15ff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator import org.jetbrains.kotlin.idea.util.getResolutionScope import org.jetbrains.kotlin.idea.core.moveInsideParenthesesAndReplaceWith import org.jetbrains.kotlin.idea.core.refactoring.runRefactoringWithPostprocessing -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.changeSignature.* import org.jetbrains.kotlin.idea.refactoring.introduce.KotlinIntroduceHandlerBase import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.* @@ -80,7 +80,7 @@ public data class IntroduceParameterDescriptor( ) { val originalOccurrence: KotlinPsiRange get() = occurrencesToReplace.first { it.getTextRange().intersects(originalRange.getTextRange()) } - val valVar: JetValVar + val valVar: KotlinValVar init { valVar = if (callable is KtClass) { @@ -98,9 +98,9 @@ public data class IntroduceParameterDescriptor( } if (occurrencesToReplace.all { PsiTreeUtil.findCommonParent(it.elements)?.parentsWithSelf?.any(modifierIsUnnecessary) ?: false - }) JetValVar.None else JetValVar.Val + }) KotlinValVar.None else KotlinValVar.Val } - else JetValVar.None + else KotlinValVar.None } } @@ -123,8 +123,8 @@ fun getParametersToRemove( fun IntroduceParameterDescriptor.performRefactoring() { runWriteAction { - val config = object : JetChangeSignatureConfiguration { - override fun configure(originalDescriptor: JetMethodDescriptor): JetMethodDescriptor { + val config = object : KotlinChangeSignatureConfiguration { + override fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor { return originalDescriptor.modify { methodDescriptor -> if (!withDefaultValue) { val parameters = callable.getValueParameters() @@ -139,11 +139,11 @@ fun IntroduceParameterDescriptor.performRefactoring() { .forEach { methodDescriptor.removeParameter(it) } } - val parameterInfo = JetParameterInfo(callableDescriptor = callableDescriptor, - name = newParameterName, - defaultValueForCall = if (withDefaultValue) null else newArgumentValue, - defaultValueForParameter = if (withDefaultValue) newArgumentValue else null, - valOrVar = valVar) + val parameterInfo = KotlinParameterInfo(callableDescriptor = callableDescriptor, + name = newParameterName, + defaultValueForCall = if (withDefaultValue) null else newArgumentValue, + defaultValueForParameter = if (withDefaultValue) newArgumentValue else null, + valOrVar = valVar) parameterInfo.currentTypeText = newParameterTypeText methodDescriptor.addParameter(parameterInfo) } @@ -214,7 +214,7 @@ public open class KotlinIntroduceParameterHandler( } if (expressionType.isUnit() || expressionType.isNothing()) { - val message = JetRefactoringBundle.message( + val message = KotlinRefactoringBundle.message( "cannot.introduce.parameter.of.0.type", IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(expressionType) ) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt index 16e59492b2f..9e2ac36ec00 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt @@ -31,14 +31,14 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.caches.resolve.getJavaMethodDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.core.refactoring.j2k -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureData -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeSignatureData +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinParameterInfo import org.jetbrains.kotlin.idea.refactoring.changeSignature.originalBaseFunctionDescriptor -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetCallableDefinitionUsage -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetConstructorDelegationCallUsage -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetFunctionCallUsage -import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetUsageInfo +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinCallableDefinitionUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinConstructorDelegationCallUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinFunctionCallUsage +import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.KotlinUsageInfo import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest import org.jetbrains.kotlin.idea.search.declarationsSearch.searchOverriders import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers @@ -56,23 +56,23 @@ public class KotlinIntroduceParameterMethodUsageProcessor : IntroduceParameterMe } - private fun createChangeInfo(data: IntroduceParameterData, method: PsiElement): JetChangeInfo? { + private fun createChangeInfo(data: IntroduceParameterData, method: PsiElement): KotlinChangeInfo? { val psiMethodDescriptor = when (method) { is KtFunction -> method.resolveToDescriptor() as? FunctionDescriptor is PsiMethod -> method.getJavaMethodDescriptor() else -> null } ?: return null - val changeSignatureData = JetChangeSignatureData(psiMethodDescriptor, method, Collections.singletonList(psiMethodDescriptor)) - val changeInfo = JetChangeInfo(methodDescriptor = changeSignatureData, context = method) + val changeSignatureData = KotlinChangeSignatureData(psiMethodDescriptor, method, Collections.singletonList(psiMethodDescriptor)) + val changeInfo = KotlinChangeInfo(methodDescriptor = changeSignatureData, context = method) data.getParametersToRemove().toNativeArray().sortedDescending().forEach { changeInfo.removeParameter(it) } // Temporarily assume that the new parameter is of Any type. Actual type is substituted during the signature update phase val defaultValueForCall = (data.getParameterInitializer().getExpression()!! as? PsiExpression)?.let { it.j2k() } - changeInfo.addParameter(JetParameterInfo(callableDescriptor = psiMethodDescriptor, - name = data.getParameterName(), - type = psiMethodDescriptor.builtIns.anyType, - defaultValueForCall = defaultValueForCall)) + changeInfo.addParameter(KotlinParameterInfo(callableDescriptor = psiMethodDescriptor, + name = data.getParameterName(), + type = psiMethodDescriptor.builtIns.anyType, + defaultValueForCall = defaultValueForCall)) return changeInfo } @@ -92,7 +92,7 @@ public class KotlinIntroduceParameterMethodUsageProcessor : IntroduceParameterMe .map { it.unwrapped } .filterIsInstance() return (kotlinFunctions + element).all { - JetCallableDefinitionUsage(it, changeInfo.originalBaseFunctionDescriptor, null, null).processUsage(changeInfo, it, usages) + KotlinCallableDefinitionUsage(it, changeInfo.originalBaseFunctionDescriptor, null, null).processUsage(changeInfo, it, usages) } } @@ -103,10 +103,10 @@ public class KotlinIntroduceParameterMethodUsageProcessor : IntroduceParameterMe val callElement = refElement.getParentOfTypeAndBranch(true) { getCalleeExpression() } ?: return true val delegateUsage = if (callElement is KtConstructorDelegationCall) { @Suppress("CAST_NEVER_SUCCEEDS") - (JetConstructorDelegationCallUsage(callElement, changeInfo) as JetUsageInfo) + (KotlinConstructorDelegationCallUsage(callElement, changeInfo) as KotlinUsageInfo) } else { - JetFunctionCallUsage(callElement, changeInfo.methodDescriptor.originalPrimaryCallable) + KotlinFunctionCallUsage(callElement, changeInfo.methodDescriptor.originalPrimaryCallable) } return delegateUsage.processUsage(changeInfo, callElement, usages) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt index 588d53f18f0..3e7487f0f82 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinIntroducePropertyHandler.kt @@ -114,4 +114,4 @@ public class KotlinIntroducePropertyHandler( } } -val INTRODUCE_PROPERTY: String = JetRefactoringBundle.message("introduce.property") \ No newline at end of file +val INTRODUCE_PROPERTY: String = KotlinRefactoringBundle.message("introduce.property") \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt index 23d1336c22c..8964acf5d60 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt @@ -25,8 +25,8 @@ import com.intellij.psi.PsiFile import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.idea.core.refactoring.chooseContainerElementIfNecessary -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType @@ -37,7 +37,7 @@ fun showErrorHint(project: Project, editor: Editor, message: String, title: Stri } fun showErrorHintByKey(project: Project, editor: Editor, messageKey: String, title: String) { - showErrorHint(project, editor, JetRefactoringBundle.message(messageKey), title) + showErrorHint(project, editor, KotlinRefactoringBundle.message(messageKey), title) } fun selectElementsWithTargetSibling( @@ -113,7 +113,7 @@ fun selectElementsWithTargetParent( } fun selectSingleExpression() { - JetRefactoringUtil.selectExpression(editor, file, false) { expr -> + KotlinRefactoringUtil.selectExpression(editor, file, false) { expr -> if (expr != null) { selectTargetContainer(listOf(expr)) } 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 3b038556bfa..facf609bb9c 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 @@ -45,8 +45,8 @@ import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator; import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt; import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyIntention; import org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil; import org.jetbrains.kotlin.idea.refactoring.introduce.IntroduceUtilKt; import org.jetbrains.kotlin.idea.refactoring.introduce.KotlinIntroduceHandlerBase; import org.jetbrains.kotlin.idea.resolve.ResolutionFacade; @@ -76,20 +76,20 @@ import java.util.List; public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { - public static final String INTRODUCE_VARIABLE = JetRefactoringBundle.message("introduce.variable"); + public static final String INTRODUCE_VARIABLE = KotlinRefactoringBundle.message("introduce.variable"); @Override public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file, DataContext dataContext) { - JetRefactoringUtil.SelectExpressionCallback callback = new JetRefactoringUtil.SelectExpressionCallback() { + KotlinRefactoringUtil.SelectExpressionCallback callback = new KotlinRefactoringUtil.SelectExpressionCallback() { @Override public void run(@Nullable KtExpression expression) { doRefactoring(project, editor, expression, null, null); } }; try { - JetRefactoringUtil.selectExpression(editor, file, callback); + KotlinRefactoringUtil.selectExpression(editor, file, callback); } - catch (JetRefactoringUtil.IntroduceRefactoringException e) { + catch (KotlinRefactoringUtil.IntroduceRefactoringException e) { showErrorHint(project, editor, e.getMessage()); } } @@ -103,7 +103,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { @Nullable final Function1 onNonInteractiveFinish ) { if (_expression == null) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.expression")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression")); return; } if (_expression.getParent() instanceof KtParenthesizedExpression) { @@ -114,18 +114,18 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { if (expression.getParent() instanceof KtQualifiedExpression) { KtQualifiedExpression qualifiedExpression = (KtQualifiedExpression)expression.getParent(); if (qualifiedExpression.getReceiverExpression() != expression) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.expression")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression")); return; } } else if (expression instanceof KtStatementExpression) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.expression")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression")); return; } else if (expression.getParent() instanceof KtOperationExpression) { KtOperationExpression operationExpression = (KtOperationExpression)expression.getParent(); if (operationExpression.getOperationReference() == expression) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.expression")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.expression")); return; } } @@ -133,7 +133,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { //noinspection unchecked if (PsiTreeUtil.getNonStrictParentOfType(expression, KtTypeReference.class, KtConstructorCalleeExpression.class, KtSuperExpression.class) != null) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.container")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.container")); return; } @@ -153,17 +153,17 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { } if (expressionType == null && bindingContext.get(BindingContext.QUALIFIER, expression) != null) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.package.expression")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.package.expression")); return; } if (expressionType != null && KotlinBuiltIns.isUnit(expressionType)) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.expression.has.unit.type")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.expression.has.unit.type")); return; } final PsiElement container = getContainer(expression); PsiElement occurrenceContainer = getOccurrenceContainer(expression); if (container == null) { - showErrorHint(project, editor, JetRefactoringBundle.message("cannot.refactor.no.container")); + showErrorHint(project, editor, KotlinRefactoringBundle.message("cannot.refactor.no.container")); return; } final boolean isInplaceAvailableOnDataContext = diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt index 81f49b58563..d3c72e72d0e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt @@ -74,7 +74,7 @@ public class MoveKotlinFileHandler : MoveFileHandler() { val moveTarget = when (newPackageName) { UNKNOWN_PACKAGE_FQ_NAME -> EmptyKotlinMoveTarget - else -> DeferredJetFileKotlinMoveTarget(project, newPackageName.toSafe()) { + else -> KotlinMoveTargetForDeferredFile(project, newPackageName.toSafe()) { MoveFilesOrDirectoriesUtil.doMoveFile(psiFile, newParent) newParent?.findFile(psiFile.name) as? KtFile } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt index 3767426b20d..efbbd478e89 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt @@ -41,7 +41,7 @@ public object EmptyKotlinMoveTarget: KotlinMoveTarget { override fun verify(file: PsiFile) = null } -public class JetFileKotlinMoveTarget(val targetFile: KtFile): KotlinMoveTarget { +public class KotlinMoveTargetForExistingFile(val targetFile: KtFile): KotlinMoveTarget { override val packageWrapper: PackageWrapper? = targetFile.getPackageFqName().asString().let { packageName -> PackageWrapper(PsiManager.getInstance(targetFile.getProject()), packageName) } @@ -54,7 +54,7 @@ public class JetFileKotlinMoveTarget(val targetFile: KtFile): KotlinMoveTarget { override fun verify(file: PsiFile): String? = null } -public class DeferredJetFileKotlinMoveTarget( +public class KotlinMoveTargetForDeferredFile( project: Project, private val packageFqName: FqName, private val createFile: (KtFile) -> KtFile?): KotlinMoveTarget { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt index 0dd47917f60..7452bde031a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt @@ -85,7 +85,7 @@ public class MoveDeclarationToSeparateFileIntention : } return } - val moveTarget = DeferredJetFileKotlinMoveTarget(project, packageName) { + val moveTarget = KotlinMoveTargetForDeferredFile(project, packageName) { createKotlinFile(targetFileName, directory, packageName.asString()) } val moveOptions = MoveKotlinTopLevelDeclarationsOptions( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 29f2ff2bd95..8bd24b85538 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.kotlin.idea.core.deleteSingle import org.jetbrains.kotlin.idea.core.getPackage import org.jetbrains.kotlin.idea.core.refactoring.getUsageContext -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.idea.refactoring.move.* import org.jetbrains.kotlin.idea.references.KtSimpleNameReference.ShorteningMode @@ -92,7 +92,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor( val options: MoveKotlinTopLevelDeclarationsOptions, val mover: Mover = Mover.Default) : BaseRefactoringProcessor(project) { companion object { - private val REFACTORING_NAME: String = JetRefactoringBundle.message("refactoring.move.top.level.declarations") + private val REFACTORING_NAME: String = KotlinRefactoringBundle.message("refactoring.move.top.level.declarations") } private var nonCodeUsages: Array? = null @@ -172,7 +172,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor( conflicts.putValue( declaration, - JetRefactoringBundle.message( + KotlinRefactoringBundle.message( "package.private.0.will.no.longer.be.accessible.from.1", RefactoringUIUtil.getDescription(declaration, true), RefactoringUIUtil.getDescription(container, true) @@ -210,7 +210,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor( conflicts.putValue( declaration, - JetRefactoringBundle.message( + KotlinRefactoringBundle.message( "0.uses.package.private.1", RefactoringUIUtil.getDescription(declaration, true), RefactoringUIUtil.getDescription(refTarget, true) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index f76f5a385e9..1db00421fac 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -64,7 +64,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinFileType; import org.jetbrains.kotlin.idea.core.PackageUtilsKt; import org.jetbrains.kotlin.idea.core.refactoring.JetRefactoringUtilKt; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionPanel; import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionTable; @@ -341,7 +341,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { .withRoots(ProjectRootManager.getInstance(myProject).getContentRoots()) .withTreeRootVisible(true); - String title = JetRefactoringBundle.message("refactoring.move.top.level.declaration.file.title"); + String title = KotlinRefactoringBundle.message("refactoring.move.top.level.declaration.file.title"); fileChooser.addBrowseFolderListener(title, null, myProject, descriptor, TextComponentAccessor.TEXT_FIELD_WHOLE_TEXT); String initialTargetPath = @@ -532,7 +532,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { if (ret != Messages.YES) return null; } - return new DeferredJetFileKotlinMoveTarget( + return new KotlinMoveTargetForDeferredFile( myProject, new FqName(getTargetPackage()), new Function1() { @@ -556,7 +556,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { return null; } - return new JetFileKotlinMoveTarget(jetFile); + return new KotlinMoveTargetForExistingFile(jetFile); } File targetDir = targetFile.getParentFile(); @@ -569,7 +569,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { return null; } - return new DeferredJetFileKotlinMoveTarget( + return new KotlinMoveTargetForDeferredFile( myProject, new FqName(psiPackage.getQualifiedName()), new Function1() { @@ -594,7 +594,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { else { PsiFile targetFile = JetRefactoringUtilKt.toPsiFile(new File(getTargetFilePath()), myProject); if (!(targetFile == null || targetFile instanceof KtFile)) { - return JetRefactoringBundle.message("refactoring.move.non.kotlin.file"); + return KotlinRefactoringBundle.message("refactoring.move.non.kotlin.file"); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt index 0592710120c..6ffb35e2fcc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinParameterProcessor.kt @@ -22,8 +22,8 @@ import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureConfiguration -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinChangeSignatureConfiguration +import org.jetbrains.kotlin.idea.refactoring.changeSignature.KotlinMethodDescriptor import org.jetbrains.kotlin.idea.refactoring.changeSignature.modify import org.jetbrains.kotlin.idea.refactoring.changeSignature.runChangeSignature import org.jetbrains.kotlin.psi.KtNamedFunction @@ -49,8 +49,8 @@ public class RenameKotlinParameterProcessor : RenameKotlinPsiProcessor() { overriddenParameter -> OverrideResolver.shouldReportParameterNameOverrideWarning(parameterDescriptor, overriddenParameter) } - val changeSignatureConfiguration = object : JetChangeSignatureConfiguration { - override fun configure(originalDescriptor: JetMethodDescriptor): JetMethodDescriptor { + val changeSignatureConfiguration = object : KotlinChangeSignatureConfiguration { + override fun configure(originalDescriptor: KotlinMethodDescriptor): KotlinMethodDescriptor { val paramInfoIndex = if (functionDescriptor.getExtensionReceiverParameter() != null) paramIndex + 1 else paramIndex return originalDescriptor.modify { it.renameParameter(paramInfoIndex, newName) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt index 96f73bb98fc..8e6dd3e29c1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt @@ -17,16 +17,16 @@ package org.jetbrains.kotlin.idea.refactoring.rename import com.intellij.psi.PsiElement -import com.intellij.usageView.UsageInfo -import java.util.ArrayList -import com.intellij.refactoring.util.MoveRenameUsageInfo import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo +import com.intellij.refactoring.util.MoveRenameUsageInfo +import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringBundle import org.jetbrains.kotlin.idea.references.AbstractJetReference import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtNamedDeclaration +import java.util.* fun checkConflictsAndReplaceUsageInfos(result: MutableList) { val usagesToAdd = ArrayList() @@ -52,7 +52,7 @@ class UnresolvableConventionViolationUsageInfo( element: PsiElement, referencedElement: PsiElement ) : UnresolvableCollisionUsageInfo(element, referencedElement) { - override fun getDescription(): String = JetRefactoringBundle.message("naming.convention.will.be.violated.after.rename") + override fun getDescription(): String = KotlinRefactoringBundle.message("naming.convention.will.be.violated.after.rename") } fun dropOverrideKeywordIfNecessary(element: KtNamedDeclaration) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java index f707de49a8c..046fd80c1e0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.idea.KotlinBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.KtElement; import org.jetbrains.kotlin.psi.KtNamedFunction; @@ -110,7 +110,7 @@ class KotlinOverridingDialog extends DialogWrapper { assert element instanceof PsiMethod : "Method accepts only kotlin functions/properties and java methods, but '" + element.getText() + "' was found"; - return JetRefactoringUtil.formatPsiMethod((PsiMethod) element, true, false); + return KotlinRefactoringUtil.formatPsiMethod((PsiMethod) element, true, false); } @Override diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index 1a544aa46f1..10ed675afca 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.deleteElementAndCleanParent -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages import org.jetbrains.kotlin.lexer.KtTokens @@ -236,10 +236,10 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { .mapTo(ArrayList()) { overridenDescriptor -> KotlinBundle.message( "x.implements.y", - JetRefactoringUtil.formatFunction(declarationDescriptor, true), - JetRefactoringUtil.formatClass(declarationDescriptor.getContainingDeclaration(), true), - JetRefactoringUtil.formatFunction(overridenDescriptor, true), - JetRefactoringUtil.formatClass(overridenDescriptor.getContainingDeclaration(), true) + KotlinRefactoringUtil.formatFunction(declarationDescriptor, true), + KotlinRefactoringUtil.formatClass(declarationDescriptor.getContainingDeclaration(), true), + KotlinRefactoringUtil.formatFunction(overridenDescriptor, true), + KotlinRefactoringUtil.formatClass(overridenDescriptor.getContainingDeclaration(), true) ) } } @@ -308,18 +308,18 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { when (element) { is KtParameter -> return element.toPsiParameters().flatMap { psiParameter -> - JetRefactoringUtil.checkParametersInMethodHierarchy(psiParameter) ?: emptyList() + KotlinRefactoringUtil.checkParametersInMethodHierarchy(psiParameter) ?: emptyList() }.ifEmpty { listOf(element) } is PsiParameter -> - return JetRefactoringUtil.checkParametersInMethodHierarchy(element) + return KotlinRefactoringUtil.checkParametersInMethodHierarchy(element) } if (ApplicationManager.getApplication()!!.isUnitTestMode()) return Collections.singletonList(element) return when (element) { is KtNamedFunction, is KtProperty -> - JetRefactoringUtil.checkSuperMethods( + KotlinRefactoringUtil.checkSuperMethods( element as KtDeclaration, allElementsToDelete, "super.methods.delete.with.usage.search" ) diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java index 06f62bade70..0f89ba06193 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil; import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -31,7 +31,7 @@ public abstract class AbstractExpressionSelectionTest extends LightCodeInsightTe final String expectedExpression = KotlinTestUtils.getLastCommentInFile((KtFile) getFile()); try { - JetRefactoringUtil.selectExpression(getEditor(), getFile(), new JetRefactoringUtil.SelectExpressionCallback() { + KotlinRefactoringUtil.selectExpression(getEditor(), getFile(), new KotlinRefactoringUtil.SelectExpressionCallback() { @Override public void run(@Nullable KtExpression expression) { assertNotNull("Selected expression mustn't be null", expression); @@ -39,7 +39,7 @@ public abstract class AbstractExpressionSelectionTest extends LightCodeInsightTe } }); } - catch (JetRefactoringUtil.IntroduceRefactoringException e) { + catch (KotlinRefactoringUtil.IntroduceRefactoringException e) { assertEquals(expectedExpression, ""); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java index b11712ee4e6..c7d2a7b8a15 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil; import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.KotlinTestUtils; @@ -33,7 +33,7 @@ public abstract class AbstractSmartSelectionTest extends LightCodeInsightTestCas configureByFile(path); String expectedResultText = KotlinTestUtils.getLastCommentInFile((KtFile) getFile()); - List expressions = JetRefactoringUtil.getSmartSelectSuggestions( + List expressions = KotlinRefactoringUtil.getSmartSelectSuggestions( getFile(), getEditor().getCaretModel().getOffset()); List textualExpressions = new ArrayList(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt similarity index 82% rename from idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt index 9c799dab7ba..a332c37ec9f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt @@ -59,7 +59,7 @@ import org.jetbrains.kotlin.utils.sure import java.io.File import java.util.* -class JetChangeSignatureTest : KotlinCodeInsightTestCase() { +class KotlinChangeSignatureTest : KotlinCodeInsightTestCase() { companion object { private val BUILT_INS = JvmPlatform.builtIns private val EXTENSIONS = arrayOf(".kt", ".java") @@ -112,25 +112,25 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { setActiveEditor(editors!![0]) } - private fun createChangeInfo(): JetChangeInfo { + private fun createChangeInfo(): KotlinChangeInfo { configureFiles() - val element = (JetChangeSignatureHandler().findTargetMember(file, editor) as KtElement?).sure { "Target element is null" } + val element = (KotlinChangeSignatureHandler().findTargetMember(file, editor) as KtElement?).sure { "Target element is null" } val context = file.findElementAt(editor.caretModel.offset).sure { "Context element is null" } val bindingContext = element.analyze(BodyResolveMode.FULL) - val callableDescriptor = JetChangeSignatureHandler + val callableDescriptor = KotlinChangeSignatureHandler .findDescriptor(element, project, editor, bindingContext) .sure { "Target descriptor is null" } - return createChangeInfo(project, callableDescriptor, JetChangeSignatureConfiguration.Empty, context)!! + return createChangeInfo(project, callableDescriptor, KotlinChangeSignatureConfiguration.Empty, context)!! } - private fun doTest(configure: JetChangeInfo.() -> Unit = {}) { - JetChangeSignatureProcessor(project, createChangeInfo().apply { configure() }, "Change signature").run() + private fun doTest(configure: KotlinChangeInfo.() -> Unit = {}) { + KotlinChangeSignatureProcessor(project, createChangeInfo().apply { configure() }, "Change signature").run() compareEditorsWithExpectedData() } - private fun doTestConflict(configure: JetChangeInfo.() -> Unit = {}) { + private fun doTestConflict(configure: KotlinChangeInfo.() -> Unit = {}) { try { doTest(configure) TestCase.fail("No conflicts found") @@ -147,7 +147,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { } } - private fun doTestUnmodifiable(configure: JetChangeInfo.() -> Unit = {}) { + private fun doTestUnmodifiable(configure: KotlinChangeInfo.() -> Unit = {}) { try { doTest(configure) TestCase.fail("No conflicts found") @@ -243,7 +243,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { } } - private fun JetChangeInfo.swapParameters(i: Int, j: Int) { + private fun KotlinChangeInfo.swapParameters(i: Int, j: Int) { val newParameters = newParameters val temp = newParameters[i] setNewParameter(i, newParameters[j]) @@ -254,7 +254,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testBadSelection() { configureByFile(getTestName(false) + "Before.kt") - TestCase.assertNull(JetChangeSignatureHandler().findTargetMember(file, editor)) + TestCase.assertNull(KotlinChangeSignatureHandler().findTargetMember(file, editor)) } fun testSynthesized() = doTestConflict() @@ -274,12 +274,12 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testAddConstructorVisibility() = doTest { newVisibility = Visibilities.PROTECTED - val newParameter = JetParameterInfo( + val newParameter = KotlinParameterInfo( callableDescriptor = originalBaseFunctionDescriptor, name = "x", type = BUILT_INS.anyType, defaultValueForCall = KtPsiFactory(project).createExpression("12"), - valOrVar = JetValVar.Val + valOrVar = KotlinValVar.Val ) addParameter(newParameter) } @@ -287,9 +287,9 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testConstructor() = doTest { newVisibility = Visibilities.PUBLIC - newParameters[0].valOrVar = JetValVar.Var - newParameters[1].valOrVar = JetValVar.None - newParameters[2].valOrVar = JetValVar.Val + newParameters[0].valOrVar = KotlinValVar.Var + newParameters[1].valOrVar = KotlinValVar.None + newParameters[2].valOrVar = KotlinValVar.Val newParameters[0].name = "_x1" newParameters[1].name = "_x2" @@ -301,9 +301,9 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testGenericConstructor() = doTest { newVisibility = Visibilities.PUBLIC - newParameters[0].valOrVar = JetValVar.Var - newParameters[1].valOrVar = JetValVar.None - newParameters[2].valOrVar = JetValVar.Val + newParameters[0].valOrVar = KotlinValVar.Var + newParameters[1].valOrVar = KotlinValVar.None + newParameters[2].valOrVar = KotlinValVar.Val newParameters[0].name = "_x1" newParameters[1].name = "_x2" @@ -342,7 +342,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testExpressionFunction() = doTest { newParameters[0].name = "x1" - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "y1", BUILT_INS.intType)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "y1", BUILT_INS.intType)) } fun testFunctionsAddRemoveArguments() = doTest { @@ -352,16 +352,16 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { val newParameters = newParameters setNewParameter(2, newParameters[1]) setNewParameter(1, newParameters[0]) - setNewParameter(0, JetParameterInfo(originalBaseFunctionDescriptor, -1, "x0", BUILT_INS.nullableAnyType, null, defaultValueForCall)) + setNewParameter(0, KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "x0", BUILT_INS.nullableAnyType, null, defaultValueForCall)) } fun testFakeOverride() = doTest { - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "i", BUILT_INS.intType)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "i", BUILT_INS.intType)) } fun testFunctionLiteral() = doTest { newParameters[1].name = "y1" - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "x", BUILT_INS.anyType)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "x", BUILT_INS.anyType)) newReturnTypeText = "Int" } @@ -393,12 +393,12 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testNoDefaultValuesInOverrides() = doTest { swapParameters(0, 1) } fun testOverridesInEnumEntries() = doTest { - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType)) } fun testEnumEntriesWithoutSuperCalls() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) } fun testParameterChangeInOverrides() = doTest { @@ -408,15 +408,15 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testConstructorJavaUsages() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("\"abc\"") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) } fun testFunctionJavaUsagesAndOverridesAddParam() = doTest { val psiFactory = KtPsiFactory(project) val defaultValueForCall1 = psiFactory.createExpression("\"abc\"") val defaultValueForCall2 = psiFactory.createExpression("\"def\"") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall1)) - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "o", BUILT_INS.nullableAnyType, null, defaultValueForCall2)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall1)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "o", BUILT_INS.nullableAnyType, null, defaultValueForCall2)) } fun testFunctionJavaUsagesAndOverridesChangeNullability() = doTest { @@ -482,10 +482,10 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testFunctionRenameJavaUsages() = doTest { newName = "bar" } - fun testParameterModifiers() = doTest { addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType)) } + fun testParameterModifiers() = doTest { addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType)) } fun testFqNameShortening() = doTest { - val newParameter = JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.anyType).apply { + val newParameter = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.anyType).apply { currentTypeText = "kotlin.String" } addParameter(newParameter) @@ -493,7 +493,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testObjectMember() = doTest { removeParameter(0) } - fun testParameterListAddParam() = doTest { addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "l", BUILT_INS.longType)) } + fun testParameterListAddParam() = doTest { addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "l", BUILT_INS.longType)) } fun testParameterListRemoveParam() = doTest { removeParameter(getNewParametersCount() - 1) } @@ -501,25 +501,25 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testAddNewReceiver() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("X(0)") - receiverParameterInfo = JetParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) + receiverParameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) .apply { currentTypeText = "X" } } fun testAddNewReceiverForMember() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("X(0)") - receiverParameterInfo = JetParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) + receiverParameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) .apply { currentTypeText = "X" } } fun testAddNewReceiverForMemberConflict() = doTestConflict { val defaultValueForCall = KtPsiFactory(project).createExpression("X(0)") - receiverParameterInfo = JetParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) + receiverParameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) .apply { currentTypeText = "X" } } fun testAddNewReceiverConflict() = doTestConflict { val defaultValueForCall = KtPsiFactory(project).createExpression("X(0)") - receiverParameterInfo = JetParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) + receiverParameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "_", BUILT_INS.anyType, null, defaultValueForCall) .apply { currentTypeText = "X" } } @@ -572,36 +572,36 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testSecondaryConstructor() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("\"foo\"") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) } fun testJavaConstructorInDelegationCall() = doJavaTest { newParameters.add(ParameterInfoImpl(-1, "s", stringPsiType, "\"foo\"")) } fun testPrimaryConstructorByThisRef() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("\"foo\"") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) } fun testPrimaryConstructorBySuperRef() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("\"foo\"") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) } fun testSecondaryConstructorByThisRef() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("\"foo\"") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) } fun testSecondaryConstructorBySuperRef() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("\"foo\"") - addParameter(JetParameterInfo(methodDescriptor.baseDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(methodDescriptor.baseDescriptor, -1, "s", BUILT_INS.stringType, null, defaultValueForCall)) } fun testJavaConstructorBySuperRef() = doJavaTest { newParameters.add(ParameterInfoImpl(-1, "s", stringPsiType, "\"foo\"")) } fun testNoConflictWithReceiverName() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("0") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "i", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "i", BUILT_INS.intType, null, defaultValueForCall)) } fun testRemoveParameterBeforeLambda() = doTest { removeParameter(1) } @@ -639,7 +639,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testPrimaryConstructorByRef() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) } fun testReceiverToParameterExplicitReceiver() = doTest { receiverParameterInfo = null } @@ -669,12 +669,12 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testAddPropertyReceiverConflict() = doTestConflict { val defaultValueForCall = KtPsiFactory(project).createExpression("\"\"") - receiverParameterInfo = JetParameterInfo(originalBaseFunctionDescriptor, -1, "receiver", BUILT_INS.stringType, null, defaultValueForCall) + receiverParameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "receiver", BUILT_INS.stringType, null, defaultValueForCall) } fun testAddPropertyReceiver() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("\"\"") - receiverParameterInfo = JetParameterInfo(originalBaseFunctionDescriptor, -1, "receiver", BUILT_INS.stringType, null, defaultValueForCall) + receiverParameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "receiver", BUILT_INS.stringType, null, defaultValueForCall) } fun testChangePropertyReceiver() = doTest { receiverParameterInfo!!.currentTypeText = "Int" } @@ -683,7 +683,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testAddTopLevelPropertyReceiver() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("A()") - receiverParameterInfo = JetParameterInfo(originalBaseFunctionDescriptor, -1, "receiver", null, null, defaultValueForCall) + receiverParameterInfo = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "receiver", null, null, defaultValueForCall) .apply { currentTypeText = "test.A" } } @@ -700,12 +700,12 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { val psiFactory = KtPsiFactory(project) val defaultValueForCall1 = psiFactory.createExpression("1") - val newParameter1 = JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", null, null, defaultValueForCall1) + val newParameter1 = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", null, null, defaultValueForCall1) .apply { currentTypeText = "kotlin.Int" } addParameter(newParameter1) val defaultValueForCall2 = psiFactory.createExpression("\"abc\"") - val newParameter2 = JetParameterInfo(originalBaseFunctionDescriptor, -1, "s", null, null, defaultValueForCall2) + val newParameter2 = KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "s", null, null, defaultValueForCall2) .apply { currentTypeText = "kotlin.String" } addParameter(newParameter2) @@ -730,21 +730,21 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testPropagateWithParameterDuplication() = doTestConflict { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) primaryPropagationTargets = listOf(KotlinTopLevelFunctionFqnNameIndex.getInstance().get("bar", project, project.allScope()).first()) } fun testPropagateWithVariableDuplication() = doTestConflict { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) primaryPropagationTargets = listOf(KotlinTopLevelFunctionFqnNameIndex.getInstance().get("bar", project, project.allScope()).first()) } fun testPropagateWithThisQualificationInClassMember() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) val classA = KotlinFullClassNameIndex.getInstance().get("A", project, project.allScope()).first() val functionBar = classA.declarations.first { it is KtNamedFunction && it.name == "bar" } @@ -753,7 +753,7 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testPropagateWithThisQualificationInExtension() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) primaryPropagationTargets = listOf(KotlinTopLevelFunctionFqnNameIndex.getInstance().get("bar", project, project.allScope()).first()) } @@ -765,14 +765,14 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { fun testPrimaryConstructorParameterPropagation() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) primaryPropagationTargets = findCallers(method.getRepresentativeLightMethod()!!) } fun testSecondaryConstructorParameterPropagation() = doTest { val defaultValueForCall = KtPsiFactory(project).createExpression("1") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValueForCall)) primaryPropagationTargets = findCallers(method.getRepresentativeLightMethod()!!) } @@ -800,12 +800,12 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { private fun doTestJvmOverloadedAddDefault(index: Int) = doTest { val defaultValue = KtPsiFactory(project).createExpression("2") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, defaultValue, defaultValue), index) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, defaultValue, defaultValue), index) } private fun doTestJvmOverloadedAddNonDefault(index: Int) = doTest { val defaultValue = KtPsiFactory(project).createExpression("2") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValue), index) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "n", BUILT_INS.intType, null, defaultValue), index) } fun testJvmOverloadedAddDefault1() = doTestJvmOverloadedAddDefault(0) @@ -842,8 +842,8 @@ class JetChangeSignatureTest : KotlinCodeInsightTestCase() { val psiFactory = KtPsiFactory(project) val defaultValue1 = psiFactory.createExpression("4") val defaultValue2 = psiFactory.createExpression("5") - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "d", BUILT_INS.intType, null, defaultValue1), 2) - addParameter(JetParameterInfo(originalBaseFunctionDescriptor, -1, "e", BUILT_INS.intType, null, defaultValue2)) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "d", BUILT_INS.intType, null, defaultValue1), 2) + addParameter(KotlinParameterInfo(originalBaseFunctionDescriptor, -1, "e", BUILT_INS.intType, null, defaultValue2)) } fun testRemoveParameterKeepFormat1() = doTest { removeParameter(0) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt index ced43ad7ec0..2b879d263de 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt @@ -35,7 +35,7 @@ import com.intellij.refactoring.introduceParameter.Util import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.EXTRACT_FUNCTION import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.* @@ -108,7 +108,7 @@ public abstract class AbstractExtractionTest() : KotlinLightCodeInsightFixtureTe with (handler) { val target = (file as KtFile).findElementByCommentPrefix("// TARGET:") as? KtNamedDeclaration if (target != null) { - JetRefactoringUtil.selectExpression(fixture.getEditor(), file, true) { expression -> + KotlinRefactoringUtil.selectExpression(fixture.getEditor(), file, true) { expression -> invoke(fixture.getProject(), fixture.getEditor(), expression!!, target) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt index 1afd3b816c7..762952408a8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractMoveTest.kt @@ -42,8 +42,8 @@ import org.jetbrains.kotlin.idea.core.refactoring.toPsiDirectory import org.jetbrains.kotlin.idea.jsonUtils.getNullableString import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.refactoring.move.changePackage.KotlinChangePackageRefactoring -import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.DeferredJetFileKotlinMoveTarget -import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget +import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.KotlinMoveTargetForDeferredFile +import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.KotlinMoveTargetForExistingFile import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsProcessor import org.jetbrains.kotlin.idea.search.allScope @@ -249,12 +249,12 @@ enum class MoveAction { val elementToMove = elementAtCaret!!.getNonStrictParentOfType()!! val moveTarget = config.getNullableString("targetPackage")?.let { packageName -> - DeferredJetFileKotlinMoveTarget(project, FqName(packageName)) { + KotlinMoveTargetForDeferredFile(project, FqName(packageName)) { val moveDestination = MultipleRootsMoveDestination(PackageWrapper(mainFile.getManager(), packageName)) createKotlinFile(guessNewFileName(listOf(elementToMove))!!, moveDestination.getTargetDirectory(mainFile)) } } ?: config.getString("targetFile").let { filePath -> - JetFileKotlinMoveTarget(PsiManager.getInstance(project).findFile(rootDir.findFileByRelativePath(filePath)!!) as KtFile) + KotlinMoveTargetForExistingFile(PsiManager.getInstance(project).findFile(rootDir.findFileByRelativePath(filePath)!!) as KtFile) } val options = MoveKotlinTopLevelDeclarationsOptions(listOf(elementToMove), moveTarget) diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt index dbfb520db72..22f5f93c972 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/KotlinNameSuggesterTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.KotlinNameSuggester -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil +import org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringUtil import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtFile @@ -66,7 +66,7 @@ public class KotlinNameSuggesterTest : LightCodeInsightFixtureTestCase() { val file = myFixture.getFile() as KtFile val expectedResultText = KotlinTestUtils.getLastCommentInFile(file) try { - JetRefactoringUtil.selectExpression(myFixture.getEditor(), file, object : JetRefactoringUtil.SelectExpressionCallback { + KotlinRefactoringUtil.selectExpression(myFixture.getEditor(), file, object : KotlinRefactoringUtil.SelectExpressionCallback { override fun run(expression: KtExpression?) { val names = KotlinNameSuggester.suggestNamesByExpressionAndType(expression!!, expression.analyze(BodyResolveMode.PARTIAL), { true }, "value").sorted() val result = StringUtil.join(names, "\n").trim() @@ -74,7 +74,7 @@ public class KotlinNameSuggesterTest : LightCodeInsightFixtureTestCase() { } }) } - catch (e: JetRefactoringUtil.IntroduceRefactoringException) { + catch (e: KotlinRefactoringUtil.IntroduceRefactoringException) { throw AssertionError("Failed to find expression: " + e.getMessage()) } }