Converted JetNameSuggester to Kotlin (step 2)

This commit is contained in:
Valentin Kipyatkov
2015-06-26 14:16:58 +02:00
parent 6f9e5ed386
commit 39f38591d9
@@ -41,7 +41,7 @@ import java.util.regex.Pattern
public object JetNameSuggester {
private fun addName(result: ArrayList<String>, 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<String>, name: String, validator: JetNameValidator, startLowerCase: Boolean = true) {
private fun addCamelNames(result: ArrayList<String>, name: String, validator: JetNameValidator, startLowerCase: Boolean = true) {
if (name === "") return
var s = deleteNonLetterFromString(name)