diff options
5 files changed, 10 insertions, 10 deletions
diff --git a/tools/codegen/src/com/android/codegen/Debug.kt b/tools/codegen/src/com/android/codegen/Debug.kt index de3184468540..6423c4f7f6c0 100644 --- a/tools/codegen/src/com/android/codegen/Debug.kt +++ b/tools/codegen/src/com/android/codegen/Debug.kt @@ -21,7 +21,7 @@ import com.github.javaparser.ast.Node fun Node.dump(indent: String = ""): String { return buildString { append(indent) - appendln(dumpOneLineNoChildren()) + appendLine(dumpOneLineNoChildren()) childNodes.forEach { child -> append(child.dump(indent + " ")) } diff --git a/tools/codegen/src/com/android/codegen/FeatureFlag.kt b/tools/codegen/src/com/android/codegen/FeatureFlag.kt index 24150d637a7b..f305429f516f 100644 --- a/tools/codegen/src/com/android/codegen/FeatureFlag.kt +++ b/tools/codegen/src/com/android/codegen/FeatureFlag.kt @@ -22,6 +22,6 @@ enum class FeatureFlag(val onByDefault: Boolean, val desc: String = "") { CONST_DEFS(true, "@Int/StringDef's based on declared static constants"), FOR_EACH_FIELD(false, "forEachField((name, value) -> ...)"); - val kebabCase = name.toLowerCase().replace("_", "-") - val upperCamelCase = name.split("_").map { it.toLowerCase().capitalize() }.joinToString("") + val kebabCase = name.lowercase().replace("_", "-") + val upperCamelCase = name.split("_").map { it.lowercase().capitalize() }.joinToString("") } diff --git a/tools/codegen/src/com/android/codegen/FileInfo.kt b/tools/codegen/src/com/android/codegen/FileInfo.kt index cc3a15654956..ca04f1eb9ab7 100644 --- a/tools/codegen/src/com/android/codegen/FileInfo.kt +++ b/tools/codegen/src/com/android/codegen/FileInfo.kt @@ -126,7 +126,7 @@ class FileInfo( +"\n}" } // Print general code as-is - is CodeChunk.Code -> chunk.lines.forEach { stringBuilder.appendln(it) } + is CodeChunk.Code -> chunk.lines.forEach { stringBuilder.appendLine(it) } // Recursively render data classes is CodeChunk.DataClass -> chunk.chunks.forEach { print(it) } } @@ -175,11 +175,11 @@ class FileInfo( /** Debug info */ override fun toString(): String { return buildString { - appendln("class $name $range") + appendLine("class $name $range") nested.forEach { - appendln(it) + appendLine(it) } - appendln("end $name") + appendLine("end $name") } } } diff --git a/tools/codegen/src/com/android/codegen/Generators.kt b/tools/codegen/src/com/android/codegen/Generators.kt index d3a8b033dfff..710960249661 100644 --- a/tools/codegen/src/com/android/codegen/Generators.kt +++ b/tools/codegen/src/com/android/codegen/Generators.kt @@ -43,7 +43,7 @@ fun ClassPrinter.generateConstDef(consts: List<Pair<VariableDeclarator, FieldDec } var AnnotationName = prefix.split("_") .filterNot { it.isBlank() } - .map { it.toLowerCase().capitalize() } + .map { it.lowercase().capitalize() } .joinToString("") val annotatedConst = consts.find { it.second.annotations.isNonEmpty } if (annotatedConst != null) { @@ -122,7 +122,7 @@ fun FileInfo.generateAidl() { if (aidl.exists()) return aidl.writeText(buildString { sourceLines.dropLastWhile { !it.startsWith("package ") }.forEach { - appendln(it) + appendLine(it) } append("\nparcelable ${mainClass.nameAsString};\n") }) diff --git a/tools/codegen/src/com/android/codegen/Utils.kt b/tools/codegen/src/com/android/codegen/Utils.kt index a40bdd7ba8e1..96314435d1b7 100644 --- a/tools/codegen/src/com/android/codegen/Utils.kt +++ b/tools/codegen/src/com/android/codegen/Utils.kt @@ -62,7 +62,7 @@ fun String.toLowerCamel(): String { if (length >= 2 && this[0] == 'm' && this[1].isUpperCase()) return substring(1).capitalize() if (all { it.isLetterOrDigit() }) return decapitalize() return split("[^a-zA-Z0-9]".toRegex()) - .map { it.toLowerCase().capitalize() } + .map { it.lowercase().capitalize() } .joinToString("") .decapitalize() } |