Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff04f751 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Fixes for Kotlin 2.1 in codegen_cli 

Replace `toLowerCase()` with `lowercase`.

Replace `appendln()` with `appendLine()`.

Bug: 399463072
Flag: EXEMPT minor refactor
Test: m out/soong/.intermediates/frameworks/base/tools/codegen/codegen_cli/linux_glibc_common/kotlin/codegen_cli.jar
Change-Id: Iab0e484380d65f7b764c74c26bc592e65c567f0e
(cherry picked from commit 48805141)
parent c7c65484

tools/codegen/src/com/android/codegen/Debug.kt

+1 −1
Original line number Diff line number Diff line
@@ -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 + "  "))

        }

tools/codegen/src/com/android/codegen/FeatureFlag.kt

+2 −2
Original line number Diff line number Diff line
@@ -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("")

}

tools/codegen/src/com/android/codegen/FileInfo.kt

+4 −4
Original line number Diff line number Diff line
@@ -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")

            }

        }

    }

tools/codegen/src/com/android/codegen/Generators.kt

+2 −2
Original line number Diff line number Diff line
@@ -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")

    })

tools/codegen/src/com/android/codegen/Utils.kt

+1 −1
Original line number Diff line number Diff line
@@ -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()

}