From 79a453f12ccbc01400b4d6adbd483289e2f9f4b8 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 26 Jun 2015 18:01:09 +0300 Subject: [PATCH] Renamed classes --- .../ParameterNameAndTypeCompletion.kt | 4 +-- .../completion/handlers/GenerateLambda.kt | 4 +-- ...ameSuggester.kt => KotlinNameSuggester.kt} | 26 +++++++++---------- .../{JetNameValidator.kt => NameValidator.kt} | 6 ++--- .../intentions/IterateExpressionIntention.kt | 4 +-- .../quickfix/AddFunctionParametersFix.java | 4 +-- .../ChangeFunctionLiteralSignatureFix.java | 8 +++--- .../quickfix/ChangeFunctionSignatureFix.java | 10 +++---- .../quickfix/DeprecatedSymbolUsageFixBase.kt | 12 ++++----- .../callableBuilder/CallableBuilder.kt | 6 ++--- .../callableBuilder/CallableInfo.kt | 4 +-- .../idea/refactoring/KotlinNamesValidator.kt | 4 +-- ...idatorImpl.java => NameValidatorImpl.java} | 6 ++--- .../changeSignature/JetChangeSignatureData.kt | 4 +-- .../ui/KotlinExtractFunctionDialog.java | 6 ++--- .../ui/KotlinParameterTablePanel.java | 4 +-- .../ExtractableCodeDescriptor.kt | 4 +-- .../extractableAnalysisUtil.kt | 16 ++++++------ .../extractionEngine/extractorUtil.kt | 12 ++++----- .../KotlinIntroduceParameterHandler.kt | 8 +++--- .../KotlinIntroduceVariableHandler.java | 10 +++---- .../nameSuggester/JetNameSuggesterTest.java | 4 +-- 22 files changed, 83 insertions(+), 83 deletions(-) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/{JetNameSuggester.kt => KotlinNameSuggester.kt} (93%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/{JetNameValidator.kt => NameValidator.kt} (95%) rename idea/src/org/jetbrains/kotlin/idea/refactoring/{JetNameValidatorImpl.java => NameValidatorImpl.java} (95%) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt index b3cba2bc728..b5a291a6076 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings import org.jetbrains.kotlin.idea.core.getResolutionScope import org.jetbrains.kotlin.idea.core.EmptyValidator -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetExpression @@ -142,7 +142,7 @@ class ParameterNameAndTypeCompletion( ProgressManager.checkCanceled() if (suggestionsByTypesAdded.contains(type)) return // don't add suggestions for the same with longer user prefix - val nameSuggestions = JetNameSuggester.getCamelNames(className, EmptyValidator, userPrefix.isEmpty()) + val nameSuggestions = KotlinNameSuggester.getCamelNames(className, EmptyValidator, userPrefix.isEmpty()) for (name in nameSuggestions) { if (prefixMatcher.prefixMatches(name)) { val lookupElement = MyLookupElement.create(userPrefix, name, type, lookupElementFactory) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt index 96d337701b0..89da1d1bf6e 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.completion.ExpectedInfos import org.jetbrains.kotlin.idea.core.EmptyValidator -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.idea.util.application.executeWriteCommand @@ -103,7 +103,7 @@ private fun buildTemplate(lambdaType: JetType, explicitParameterTypes: Boolean, template.addTextSegment(", ") } //TODO: check for names in scope - template.addVariable(ParameterNameExpression(JetNameSuggester.suggestNames(parameterType, EmptyValidator, "p")), true) + template.addVariable(ParameterNameExpression(KotlinNameSuggester.suggestNames(parameterType, EmptyValidator, "p")), true) if (explicitParameterTypes) { template.addTextSegment(": " + IdeDescriptorRenderers.SOURCE_CODE.renderType(parameterType)) } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/JetNameSuggester.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt similarity index 93% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/JetNameSuggester.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt index 96e244d95e8..6976cf3110e 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/JetNameSuggester.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinNameSuggester.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.util.ArrayUtil import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.caches.resolve.analyze -import org.jetbrains.kotlin.idea.core.JetNameValidator +import org.jetbrains.kotlin.idea.core.NameValidator import org.jetbrains.kotlin.lexer.JetLexer import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.* @@ -33,9 +33,9 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker import java.util.ArrayList import java.util.regex.Pattern -public object JetNameSuggester { +public object KotlinNameSuggester { - private fun addName(result: ArrayList, name: String?, validator: JetNameValidator) { + private fun addName(result: ArrayList, name: String?, validator: NameValidator) { var name = name ?: return if ("class" == name) name = "clazz" if (!isIdentifier(name)) return @@ -58,7 +58,7 @@ public object JetNameSuggester { * * * @return possible names */ - public fun suggestNames(expression: JetExpression, validator: JetNameValidator, defaultName: String?): Array { + public fun suggestNames(expression: JetExpression, validator: NameValidator, defaultName: String?): Array { val result = ArrayList() val bindingContext = expression.analyze(BodyResolveMode.FULL) @@ -72,20 +72,20 @@ public object JetNameSuggester { return ArrayUtil.toStringArray(result) } - public fun suggestNames(type: JetType, validator: JetNameValidator, defaultName: String?): Array { + public fun suggestNames(type: JetType, validator: NameValidator, defaultName: String?): Array { val result = ArrayList() addNamesForType(result, type, validator) if (result.isEmpty()) addName(result, defaultName, validator) return ArrayUtil.toStringArray(result) } - public fun suggestNamesForType(jetType: JetType, validator: JetNameValidator): Array { + public fun suggestNamesForType(jetType: JetType, validator: NameValidator): Array { val result = ArrayList() addNamesForType(result, jetType, validator) return ArrayUtil.toStringArray(result) } - jvmOverloads public fun suggestNamesForExpression(expression: JetExpression, validator: JetNameValidator, defaultName: String? = null): Array { + jvmOverloads public fun suggestNamesForExpression(expression: JetExpression, validator: NameValidator, defaultName: String? = null): Array { val result = ArrayList() addNamesForExpression(result, expression, validator) if (result.isEmpty()) addName(result, defaultName, validator) @@ -94,7 +94,7 @@ public object JetNameSuggester { private val COMMON_TYPE_PARAMETER_NAMES = arrayOf("T", "U", "V", "W", "X", "Y", "Z") - public fun suggestNamesForTypeParameters(count: Int, validator: JetNameValidator): Array { + public fun suggestNamesForTypeParameters(count: Int, validator: NameValidator): Array { val result = ArrayList() for (i in 0..count - 1) { result.add(validator.validateNameWithVariants(*COMMON_TYPE_PARAMETER_NAMES)) @@ -102,7 +102,7 @@ public object JetNameSuggester { return ArrayUtil.toStringArray(result) } - private fun addNamesForType(result: ArrayList, jetType: JetType, validator: JetNameValidator) { + private fun addNamesForType(result: ArrayList, jetType: JetType, validator: NameValidator) { var jetType = jetType val builtIns = KotlinBuiltIns.getInstance() val typeChecker = JetTypeChecker.DEFAULT @@ -177,7 +177,7 @@ public object JetNameSuggester { } } - private fun addForClassType(result: ArrayList, jetType: JetType, validator: JetNameValidator) { + private fun addForClassType(result: ArrayList, jetType: JetType, validator: NameValidator) { val descriptor = jetType.getConstructor().getDeclarationDescriptor() if (descriptor != null) { val className = descriptor.getName() @@ -189,13 +189,13 @@ public object JetNameSuggester { private val ACCESSOR_PREFIXES = arrayOf("get", "is", "set") - public fun getCamelNames(name: String, validator: JetNameValidator, startLowerCase: Boolean): List { + public fun getCamelNames(name: String, validator: NameValidator, startLowerCase: Boolean): List { val result = ArrayList() addCamelNames(result, name, validator, startLowerCase) return result } - private fun addCamelNames(result: ArrayList, name: String, validator: JetNameValidator, startLowerCase: Boolean = true) { + private fun addCamelNames(result: ArrayList, name: String, validator: NameValidator, startLowerCase: Boolean = true) { if (name === "") return var s = deleteNonLetterFromString(name) @@ -255,7 +255,7 @@ public object JetNameSuggester { return matcher.replaceAll("") } - private fun addNamesForExpression(result: ArrayList, expression: JetExpression?, validator: JetNameValidator) { + private fun addNamesForExpression(result: ArrayList, expression: JetExpression?, validator: NameValidator) { if (expression == null) return expression.accept(object : JetVisitorVoid() { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/JetNameValidator.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidator.kt similarity index 95% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/JetNameValidator.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidator.kt index 64f636a4229..fb0f8c46da8 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/JetNameValidator.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/NameValidator.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.core import java.util.HashSet import java.util.Collections -public abstract class JetNameValidator { +public abstract class NameValidator { /** * Validates name, and slightly improves it by adding number to name in case of conflicts * @param name to check it in scope @@ -55,14 +55,14 @@ public abstract class JetNameValidator { protected abstract fun validateInner(name: String): Boolean } -public object EmptyValidator : JetNameValidator() { +public object EmptyValidator : NameValidator() { override fun validateInner(name: String): Boolean = true } public open class CollectingValidator( existingNames: Collection = Collections.emptySet(), val filter: (String) -> Boolean = { true } -): JetNameValidator() { +): NameValidator() { private val suggestedSet = HashSet(existingNames) override fun validateInner(name: String): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt index 283a0365e2b..0f5d802db5a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.core.IterableTypesDetector import org.jetbrains.kotlin.idea.core.EmptyValidator -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.replaced import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.* @@ -60,7 +60,7 @@ public class IterateExpressionIntention : JetSelfTargetingIntention parameters = functionDescriptor.getValueParameters(); List arguments = callElement.getValueArguments(); - JetNameValidator validator = new SimpleCollectingValidator(); + NameValidator validator = new SimpleCollectingValidator(); for (int i = 0; i < arguments.size(); i ++) { ValueArgument argument = arguments.get(i); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java index f41cb09335b..3f337d3f229 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -25,8 +25,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.core.JetNameSuggester; -import org.jetbrains.kotlin.idea.core.JetNameValidator; +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; +import org.jetbrains.kotlin.idea.core.NameValidator; import org.jetbrains.kotlin.idea.core.SimpleCollectingValidator; import org.jetbrains.kotlin.idea.refactoring.changeSignature.*; import org.jetbrains.kotlin.psi.JetFile; @@ -68,10 +68,10 @@ public class ChangeFunctionLiteralSignatureFix extends ChangeFunctionSignatureFi new Function1() { @Override public Unit invoke(JetMutableMethodDescriptor descriptor) { - JetNameValidator validator = new SimpleCollectingValidator(); + NameValidator validator = new SimpleCollectingValidator(); descriptor.clearNonReceiverParameters(); for (JetType type : parameterTypes) { - String name = JetNameSuggester.INSTANCE$.suggestNames(type, validator, "param")[0]; + String name = KotlinNameSuggester.INSTANCE$.suggestNames(type, validator, "param")[0]; descriptor.addParameter( new JetParameterInfo(functionDescriptor, -1, name, type, null, null, JetValVar.None, null) ); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java index 2a2cf240613..ef288435f43 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java @@ -36,8 +36,8 @@ import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil; -import org.jetbrains.kotlin.idea.core.JetNameSuggester; -import org.jetbrains.kotlin.idea.core.JetNameValidator; +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; +import org.jetbrains.kotlin.idea.core.NameValidator; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; @@ -97,7 +97,7 @@ public abstract class ChangeFunctionSignatureFix extends JetIntentionAction>() typeCandidates[parameter.typeInfo]!!.forEach { typeCandidate -> - val suggestedNames = JetNameSuggester.suggestNamesForType(typeCandidate.theType, EmptyValidator) + val suggestedNames = KotlinNameSuggester.suggestNamesForType(typeCandidate.theType, EmptyValidator) parameterTypeToNamesMap[typeCandidate.renderedType!!] = suggestedNames } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt index cb80edf03c1..8691765a232 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import com.intellij.util.ArrayUtil import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.core.EmptyValidator -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.ClassInfo import org.jetbrains.kotlin.idea.util.makeNotNullable import org.jetbrains.kotlin.idea.util.supertypes @@ -44,7 +44,7 @@ abstract class TypeInfo(val variance: Variance) { class ByExpression(val expression: JetExpression, variance: Variance): TypeInfo(variance) { override val possibleNamesFromExpression: Array by Delegates.lazy { - JetNameSuggester.suggestNamesForExpression(expression, EmptyValidator) + KotlinNameSuggester.suggestNamesForExpression(expression, EmptyValidator) } override fun getPossibleTypes(builder: CallableBuilder): List = diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidator.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidator.kt index 5ad80ff9ebf..0aaeffc1118 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidator.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinNamesValidator.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring import com.intellij.lang.refactoring.NamesValidator import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.lexer.JetKeywordToken import org.jetbrains.kotlin.lexer.JetTokens @@ -26,5 +26,5 @@ public class KotlinNamesValidator : NamesValidator { private val KEYWORD_SET = JetTokens.KEYWORDS.getTypes().filterIsInstance().map { it.getValue() }.toSet() override fun isKeyword(name: String, project: Project?): Boolean = name in KEYWORD_SET - override fun isIdentifier(name: String, project: Project?): Boolean = JetNameSuggester.isIdentifier(name) + override fun isIdentifier(name: String, project: Project?): Boolean = KotlinNameSuggester.isIdentifier(name) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameValidatorImpl.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/NameValidatorImpl.java similarity index 95% rename from idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameValidatorImpl.java rename to idea/src/org/jetbrains/kotlin/idea/refactoring/NameValidatorImpl.java index ae0d2bf7ee9..aa7cd968953 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameValidatorImpl.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/NameValidatorImpl.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.core.CorePackage; -import org.jetbrains.kotlin.idea.core.JetNameValidator; +import org.jetbrains.kotlin.idea.core.NameValidator; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope; import java.util.HashSet; import java.util.Set; -public class JetNameValidatorImpl extends JetNameValidator { +public class NameValidatorImpl extends NameValidator { public static enum Target { FUNCTIONS_AND_CLASSES, PROPERTIES @@ -43,7 +43,7 @@ public class JetNameValidatorImpl extends JetNameValidator { private final PsiElement myAnchor; private final Target myTarget; - public JetNameValidatorImpl(PsiElement container, PsiElement anchor, Target target) { + public NameValidatorImpl(PsiElement container, PsiElement anchor, Target target) { myContainer = container; myAnchor = anchor; myTarget = target; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt index 570496b8fa9..434c1a87ac3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.CollectingValidator -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetFunctionDefinitionUsage import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.JetClass @@ -82,7 +82,7 @@ public class JetChangeSignatureData( } } ?: CollectingValidator(paramNames) val receiverType = baseDescriptor.getExtensionReceiverParameter()?.getType() ?: return null - val receiverName = JetNameSuggester.suggestNames(receiverType, validator, "receiver").first() + val receiverName = KotlinNameSuggester.suggestNames(receiverType, validator, "receiver").first() return JetParameterInfo(functionDescriptor = baseDescriptor, name = receiverName, type = receiverType) } 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 afd684eeb93..2ae2739bd8a 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 @@ -30,7 +30,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.JetFileType; -import org.jetbrains.kotlin.idea.core.JetNameSuggester; +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.core.refactoring.RefactoringPackage; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*; @@ -102,9 +102,9 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { } private boolean checkNames() { - if (!JetNameSuggester.INSTANCE$.isIdentifier(getFunctionName())) return false; + if (!KotlinNameSuggester.INSTANCE$.isIdentifier(getFunctionName())) return false; for (KotlinParameterTablePanel.ParameterInfo parameterInfo : parameterTablePanel.getParameterInfos()) { - if (!JetNameSuggester.INSTANCE$.isIdentifier(parameterInfo.getName())) return false; + if (!KotlinNameSuggester.INSTANCE$.isIdentifier(parameterInfo.getName())) return false; } return true; } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java index 664c8a57bdd..b0c5c0edc5f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java @@ -30,7 +30,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.core.JetNameSuggester; +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.Parameter; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.types.JetType; @@ -345,7 +345,7 @@ public class KotlinParameterTablePanel extends JPanel { } case PARAMETER_NAME_COLUMN: { String name = (String) aValue; - if (JetNameSuggester.INSTANCE$.isIdentifier(name)) { + if (KotlinNameSuggester.INSTANCE$.isIdentifier(name)) { info.setName(name); } updateSignature(); 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 be2d9cd6f5c..eba4e33f276 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 @@ -23,7 +23,7 @@ import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.kotlin.idea.core.refactoring.JetNameSuggester +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.introduce.extractionEngine.AnalysisResult.ErrorMessage @@ -85,7 +85,7 @@ class RenameReplacement(override val parameter: Parameter): ParameterReplacement var expressionToReplace = (e.getParent() as? JetThisExpression ?: e).getQualifiedExpressionForSelectorOrThis() val parameterName = JetPsiUtil.unquoteIdentifier(parameter.nameForRef) val replacingName = - if (e.getText().startsWith('`') || !JetNameSuggester.isIdentifier(parameterName)) "`$parameterName`" else parameterName + if (e.getText().startsWith('`') || !KotlinNameSuggester.isIdentifier(parameterName)) "`$parameterName`" else parameterName val psiFactory = JetPsiFactory(e) val replacement = if (expressionToReplace is JetOperationReferenceExpression) { 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 c573259cbee..f252685a4a9 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 @@ -45,12 +45,12 @@ import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.core.comparePossiblyOverridingDescriptors import org.jetbrains.kotlin.idea.core.getResolutionScope -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.refactoring.createTempCopy import org.jetbrains.kotlin.idea.core.refactoring.getContextForContainingDeclarationBody import org.jetbrains.kotlin.idea.imports.importableFqNameSafe import org.jetbrains.kotlin.idea.kdoc.getResolutionScope -import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl +import org.jetbrains.kotlin.idea.refactoring.NameValidatorImpl import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.ErrorMessage import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.Status @@ -743,10 +743,10 @@ private fun ExtractionData.inferParametersInfo( } } - val varNameValidator = JetNameValidatorImpl( + val varNameValidator = NameValidatorImpl( commonParent.getNonStrictParentOfType(), originalElements.firstOrNull(), - JetNameValidatorImpl.Target.PROPERTIES + NameValidatorImpl.Target.PROPERTIES ) for ((descriptorToExtract, parameter) in extractedDescriptorToParameter) { @@ -756,7 +756,7 @@ private fun ExtractionData.inferParametersInfo( with (parameter) { if (currentName == null) { - currentName = JetNameSuggester.suggestNames(getParameterType(options.allowSpecialClassNames), varNameValidator, "p").first() + currentName = KotlinNameSuggester.suggestNames(getParameterType(options.allowSpecialClassNames), varNameValidator, "p").first() } mirrorVarName = if (descriptorToExtract in modifiedVarDescriptors) varNameValidator.validateName(name) else null info.parameters.add(this) @@ -909,13 +909,13 @@ private fun ExtractionData.suggestFunctionNames(returnType: JetType): List() val validator = - JetNameValidatorImpl( + NameValidatorImpl( targetSibling.getParent(), if (targetSibling is JetClassInitializer) targetSibling.getParent() else targetSibling, - if (options.extractAsProperty) JetNameValidatorImpl.Target.PROPERTIES else JetNameValidatorImpl.Target.FUNCTIONS_AND_CLASSES + if (options.extractAsProperty) NameValidatorImpl.Target.PROPERTIES else NameValidatorImpl.Target.FUNCTIONS_AND_CLASSES ) if (!returnType.isDefault()) { - functionNames.addAll(JetNameSuggester.suggestNamesForType(returnType, validator)) + functionNames.addAll(KotlinNameSuggester.suggestNamesForType(returnType, validator)) } getExpressions().singleOrNull()?.let { expr -> diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt index 7222e0a80bc..b664367fdb5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt @@ -20,11 +20,11 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.core.appendElement -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.refactoring.isMultiLine import org.jetbrains.kotlin.idea.core.replaced import org.jetbrains.kotlin.idea.intentions.ConvertToExpressionBodyIntention -import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl +import org.jetbrains.kotlin.idea.refactoring.NameValidatorImpl import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.ExpressionValue import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.Initializer import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValue.Jump @@ -278,8 +278,8 @@ private fun makeCall( controlFlow.outputValueBoxer.getUnboxingExpressions(callText) } else { - val varNameValidator = JetNameValidatorImpl(block, anchorInBlock, JetNameValidatorImpl.Target.PROPERTIES) - val resultVal = JetNameSuggester.suggestNames(extractableDescriptor.returnType, varNameValidator, null).first() + val varNameValidator = NameValidatorImpl(block, anchorInBlock, NameValidatorImpl.Target.PROPERTIES) + val resultVal = KotlinNameSuggester.suggestNames(extractableDescriptor.returnType, varNameValidator, null).first() block.addBefore(psiFactory.createDeclaration("val $resultVal = $callText"), anchorInBlock) block.addBefore(newLine, anchorInBlock) controlFlow.outputValueBoxer.getUnboxingExpressions(resultVal) @@ -512,8 +512,8 @@ fun ExtractionGeneratorConfiguration.generateDeclaration( val (defaultExpression, expressionToUnifyWith) = if (!generatorOptions.inTempFile && defaultValue != null && descriptor.controlFlow.outputValueBoxer.boxingRequired && lastExpression!!.isMultiLine()) { - val varNameValidator = JetNameValidatorImpl(body, lastExpression, JetNameValidatorImpl.Target.PROPERTIES) - val resultVal = JetNameSuggester.suggestNames(defaultValue.valueType, varNameValidator, null).first() + val varNameValidator = NameValidatorImpl(body, lastExpression, NameValidatorImpl.Target.PROPERTIES) + val resultVal = KotlinNameSuggester.suggestNames(defaultValue.valueType, varNameValidator, null).first() val newDecl = body.addBefore(psiFactory.createDeclaration("val $resultVal = ${lastExpression!!.getText()}"), lastExpression) as JetProperty body.addBefore(psiFactory.createNewLine(), lastExpression) psiFactory.createExpression(resultVal) to newDecl.getInitializer()!! 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 4cd764cd66a..23dc0535228 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,9 +39,9 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.core.getResolutionScope -import org.jetbrains.kotlin.idea.core.JetNameSuggester +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester import org.jetbrains.kotlin.idea.core.refactoring.runRefactoringWithPostprocessing -import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl +import org.jetbrains.kotlin.idea.refactoring.NameValidatorImpl import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle import org.jetbrains.kotlin.idea.refactoring.changeSignature.* import org.jetbrains.kotlin.idea.refactoring.introduce.KotlinIntroduceHandlerBase @@ -234,8 +234,8 @@ public open class KotlinIntroduceParameterHandler( is JetClass -> targetParent.getBody() else -> null } ?: throw AssertionError("Body element is not found: ${targetParent.getElementTextWithContext()}") - val nameValidator = JetNameValidatorImpl(body, null, JetNameValidatorImpl.Target.PROPERTIES) - val suggestedNames = linkedSetOf(*JetNameSuggester.suggestNames(replacementType, nameValidator, "p")) + val nameValidator = NameValidatorImpl(body, null, NameValidatorImpl.Target.PROPERTIES) + val suggestedNames = linkedSetOf(*KotlinNameSuggester.suggestNames(replacementType, nameValidator, "p")) val parametersUsages = findInternalUsagesOfParametersAndReceiver(targetParent, functionDescriptor) 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 4f9018b9e4a..4d539903d34 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 @@ -41,10 +41,10 @@ import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; import org.jetbrains.kotlin.idea.core.CorePackage; -import org.jetbrains.kotlin.idea.core.JetNameSuggester; +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyIntention; import org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention; -import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl; +import org.jetbrains.kotlin.idea.refactoring.NameValidatorImpl; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.idea.refactoring.introduce.IntroducePackage; @@ -192,12 +192,12 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { PsiElement commonParent = PsiTreeUtil.findCommonParent(allReplaces); PsiElement commonContainer = getContainer(commonParent); - JetNameValidatorImpl validator = new JetNameValidatorImpl( + NameValidatorImpl validator = new NameValidatorImpl( commonContainer, calculateAnchor(commonParent, commonContainer, allReplaces), - JetNameValidatorImpl.Target.PROPERTIES + NameValidatorImpl.Target.PROPERTIES ); - final String[] suggestedNames = JetNameSuggester.INSTANCE$.suggestNames(expression, validator, "value"); + final String[] suggestedNames = KotlinNameSuggester.INSTANCE$.suggestNames(expression, validator, "value"); final Ref propertyRef = new Ref(); final ArrayList references = new ArrayList(); final Ref reference = new Ref(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java index e5aac55c94e..60a4f5fa3f5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java @@ -21,7 +21,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.idea.core.EmptyValidator; -import org.jetbrains.kotlin.idea.core.JetNameSuggester; +import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; @@ -100,7 +100,7 @@ public class JetNameSuggesterTest extends LightCodeInsightFixtureTestCase { JetRefactoringUtil.selectExpression(myFixture.getEditor(), file, new JetRefactoringUtil.SelectExpressionCallback() { @Override public void run(@Nullable JetExpression expression) { - String[] names = JetNameSuggester.INSTANCE$.suggestNames(expression, EmptyValidator.INSTANCE$, "value"); + String[] names = KotlinNameSuggester.INSTANCE$.suggestNames(expression, EmptyValidator.INSTANCE$, "value"); Arrays.sort(names); String result = StringUtil.join(names, "\n").trim(); assertEquals(expectedResultText, result);