From 39f38591d905ed2656dd4556203d04347a6f662e Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 26 Jun 2015 14:16:58 +0200 Subject: [PATCH] Converted JetNameSuggester to Kotlin (step 2) --- .../{JetNameSuggester.java => JetNameSuggester.kt} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/{JetNameSuggester.java => JetNameSuggester.kt} (98%) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/JetNameSuggester.java b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/JetNameSuggester.kt similarity index 98% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/JetNameSuggester.java rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/JetNameSuggester.kt index 2e19fd986ac..aaa323eb788 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/JetNameSuggester.java +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/JetNameSuggester.kt @@ -41,7 +41,7 @@ import java.util.regex.Pattern public object JetNameSuggester { private fun addName(result: ArrayList, name: String?, validator: JetNameValidator) { - var name: kotlin.String? = name ?: return + var name = name ?: return if ("class" == name) name = "clazz" if (!isIdentifier(name)) return result.add(validator.validateName(name)) @@ -200,7 +200,7 @@ public object JetNameSuggester { return result } - jvmOverloads private fun addCamelNames(result: ArrayList, name: String, validator: JetNameValidator, startLowerCase: Boolean = true) { + private fun addCamelNames(result: ArrayList, name: String, validator: JetNameValidator, startLowerCase: Boolean = true) { if (name === "") return var s = deleteNonLetterFromString(name)