Add Kotlin format check to presubmit
Also format all Kotlin files in tests from running:
find src/test/ -name '*.kt' | \
xargs /usr/local/google/home/sgjesse/prj/r8/r8/third_party/openjdk/jdk-11/linux/bin/java \
-jar \
third_party/google/google-kotlin-format/0.54/ktfmt-0.54-jar-with-dependencies.jar \
--google-style
Change-Id: I414e6fb1e4736552708ac3fc87042bddaabb2dfd
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 986d67c..31c491e 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -14,6 +14,20 @@
sys.path.append(os.path.join(
path.dirname(inspect.getfile(lambda: None)), 'tools'))
from tools.utils import EnsureDepFromGoogleCloudStorage
+from tools.jdk import GetJavaExecutable
+
+
+KOTLIN_FMT_JAR = path.join(
+ 'third_party',
+ 'google',
+ 'google-kotlin-format',
+ '0.54',
+ 'ktfmt-0.54-jar-with-dependencies.jar')
+
+KOTLIN_FMT_SHA1 = path.join(
+ 'third_party', 'google', 'google-kotlin-format', '0.54.tar.gz.sha1')
+KOTLIN_FMT_TGZ = path.join(
+ 'third_party', 'google', 'google-kotlin-format', '0.54.tar.gz.sha1')
FMT_CMD = path.join(
'third_party',
@@ -38,22 +52,45 @@
return []
def CheckFormatting(input_api, output_api, branch):
- EnsureDepFromGoogleCloudStorage(FMT_CMD, FMT_TGZ, FMT_SHA1, 'google-format')
+ EnsureDepFromGoogleCloudStorage(
+ KOTLIN_FMT_JAR, KOTLIN_FMT_TGZ, KOTLIN_FMT_SHA1, 'google-kotlin-format')
+ EnsureDepFromGoogleCloudStorage(
+ FMT_CMD, FMT_TGZ, FMT_SHA1, 'google-java-format')
results = []
for f in input_api.AffectedFiles():
path = f.LocalPath()
- if not path.endswith('.java'):
+ if not path.endswith('.java') and not path.endswith('.kt'):
continue
- diff = check_output(
- ['git', 'diff', '--no-prefix', '-U0', branch, '--', path])
+ if path.endswith('.kt'):
+ result = check_output(
+ [GetJavaExecutable(), '-jar', KOTLIN_FMT_JAR, '--google-style', '-n', path])
+ if len(result) > 0:
+ results.append(output_api.PresubmitError(
+ """Please fix the Kotlin formatting by running:
- proc = Popen(FMT_CMD, stdin=PIPE, stdout=PIPE, stderr=STDOUT)
- (stdout, stderr) = proc.communicate(input=diff)
- if len(stdout) > 0:
- results.append(output_api.PresubmitError(stdout.decode('utf-8')))
- if len(results) > 0:
- results.append(output_api.PresubmitError(
- """Please fix the formatting by running:
+ git diff $(git cl upstream) --name-only "*.kt" | xargs {java} -jar {fmt_jar} --google-style
+
+or fix formatting, commit and upload:
+
+ git diff $(git cl upstream) --name-only "*.kt" | xargs {java} -jar {fmt_jar} --google-style && git commit -a --amend --no-edit && git cl upload
+
+or bypass the checks with:
+
+ git cl upload --bypass-hooks
+ """.format(java=GetJavaExecutable(), fmt_jar=KOTLIN_FMT_JAR)))
+ return results
+ else:
+ # Now path.endeWith('.java') is true.
+ diff = check_output(
+ ['git', 'diff', '--no-prefix', '-U0', branch, '--', path])
+
+ proc = Popen(FMT_CMD, stdin=PIPE, stdout=PIPE, stderr=STDOUT)
+ (stdout, stderr) = proc.communicate(input=diff)
+ if len(stdout) > 0:
+ results.append(output_api.PresubmitError(stdout.decode('utf-8')))
+ if len(results) > 0:
+ results.append(output_api.PresubmitError(
+ """Please fix the Java formatting by running:
git diff -U0 $(git cl upstream) | %s -p1 -i
diff --git a/src/test/java/com/android/tools/r8/cf/bootstrap/Hello.kt b/src/test/java/com/android/tools/r8/cf/bootstrap/Hello.kt
index fdfc655..8aae7fe 100644
--- a/src/test/java/com/android/tools/r8/cf/bootstrap/Hello.kt
+++ b/src/test/java/com/android/tools/r8/cf/bootstrap/Hello.kt
@@ -3,6 +3,6 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.cf.bootstrap
-fun main(args : Array<String>) {
+fun main(args: Array<String>) {
println("I'm Woody. Howdy, howdy, howdy.")
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Blog.kt b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Blog.kt
index 8ee0c5e..bb671dc 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Blog.kt
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Blog.kt
@@ -4,18 +4,18 @@
package com.android.tools.r8.desugar.desugaredlibrary.kotlin
-import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+import java.nio.file.StandardOpenOption
fun main() {
- val tempDirectory = Files.createTempDirectory("tempFile")
- val tempFile = tempDirectory.resolve("tempFile")
- Files.write(tempFile, "first ".toByteArray(StandardCharsets.UTF_8), StandardOpenOption.CREATE)
- Files.write(tempFile, "second".toByteArray(StandardCharsets.UTF_8), StandardOpenOption.APPEND)
- println("Content: " + Files.readAllLines(tempFile).get(0))
- println("Size: " + Files.getAttribute(tempFile, "basic:size"))
- println("Exists (before deletion): " + Files.exists(tempFile));
- Files.deleteIfExists(tempFile);
- println("Exists (after deletion): " + Files.exists(tempFile));
+ val tempDirectory = Files.createTempDirectory("tempFile")
+ val tempFile = tempDirectory.resolve("tempFile")
+ Files.write(tempFile, "first ".toByteArray(StandardCharsets.UTF_8), StandardOpenOption.CREATE)
+ Files.write(tempFile, "second".toByteArray(StandardCharsets.UTF_8), StandardOpenOption.APPEND)
+ println("Content: " + Files.readAllLines(tempFile).get(0))
+ println("Size: " + Files.getAttribute(tempFile, "basic:size"))
+ println("Exists (before deletion): " + Files.exists(tempFile))
+ Files.deleteIfExists(tempFile)
+ println("Exists (after deletion): " + Files.exists(tempFile))
}
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Main.kt b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Main.kt
index f7e56bc..3bcb2bb 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Main.kt
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/kotlin/Main.kt
@@ -13,6 +13,8 @@
val primaryConstructor = Skynet::class.primaryConstructor
val skynet = primaryConstructor?.call(java.time.LocalDateTime.of(1997, 8, 29, 2, 14, 0))
val sd = skynet?.specialDay
- println("Wuhuu, my special day is: " +
- "${sd?.year}-${sd?.monthValue}-${sd?.dayOfMonth}-${sd?.hour}-${sd?.minute}")
+ println(
+ "Wuhuu, my special day is: " +
+ "${sd?.year}-${sd?.monthValue}-${sd?.dayOfMonth}-${sd?.hour}-${sd?.minute}"
+ )
}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/kotlin/Main.kt b/src/test/java/com/android/tools/r8/enumunboxing/kotlin/Main.kt
index 3e5e636..383f65e 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/kotlin/Main.kt
+++ b/src/test/java/com/android/tools/r8/enumunboxing/kotlin/Main.kt
@@ -7,9 +7,9 @@
enum class Color {
RED,
GREEN,
- BLUE
+ BLUE,
}
fun main() {
enumValues<Color>().forEach { println(it.name) }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/base.kt b/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/base.kt
index aced216..a627c4e 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/base.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b148525512/base.kt
@@ -4,7 +4,7 @@
package com.android.tools.r8.kotlin.lambda.b148525512
-fun printInt(l: () -> Int ) = println(l())
+fun printInt(l: () -> Int) = println(l())
open class Base(@JvmField var x: Int, @JvmField var y: Int)
@@ -15,4 +15,4 @@
if (FeatureAPI.hasFeature()) {
FeatureAPI.feature(args.size + 3)
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Main.kt b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Main.kt
index eed8d91..0b06956 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Main.kt
@@ -5,9 +5,9 @@
package com.android.tools.r8.kotlin.lambda.b159688129
fun main() {
- run ({ arg -> println(arg)}, 3)
+ run({ arg -> println(arg) }, 3)
}
-fun run(param: Function1<Int, Unit>, arg : Int) {
+fun run(param: Function1<Int, Unit>, arg: Int) {
param.invoke(arg)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Simple.kt b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Simple.kt
index 3fe6e9e..2957c96 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Simple.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Simple.kt
@@ -5,14 +5,14 @@
package com.android.tools.r8.kotlin.lambda.b159688129
fun main() {
- runSimple { println("Hello1")}
- runSimple { println("Hello2")}
- runSimple { println("Hello3")}
- runSimple { println("Hello4")}
- runSimple { println("Hello5")}
- runSimple { println("Hello6")}
+ runSimple { println("Hello1") }
+ runSimple { println("Hello2") }
+ runSimple { println("Hello3") }
+ runSimple { println("Hello4") }
+ runSimple { println("Hello5") }
+ runSimple { println("Hello6") }
}
fun runSimple(cb: () -> Unit) {
cb()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Test.kt b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Test.kt
index b213076..4b76dec 100644
--- a/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Test.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/lambda/b159688129/Test.kt
@@ -5,5 +5,5 @@
package com.android.tools.r8.kotlin.lambda.b159688129
fun test() {
- run({ })
+ run({})
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_app/main.kt
index fc2e518..bf6ac8f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_app/main.kt
@@ -37,4 +37,4 @@
staticPrivateReference()
staticInternalReference()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib.kt
index f77d4f8..2e9482f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib.kt
@@ -4,11 +4,13 @@
package com.android.tools.r8.kotlin.metadata.allow_access_modification_lib
-internal class Lib internal constructor(
+internal class Lib
+internal constructor(
internal val readOnlyPropPrimaryInternal: Int,
- internal var propPrimaryInternal : Int,
+ internal var propPrimaryInternal: Int,
private val readOnlyPropPrimaryPrivate: Int,
- internal var propPrimaryPrivate : Int) {
+ internal var propPrimaryPrivate: Int,
+) {
internal val propInternal: Int = 42
private var propPrivate: Int = 0
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib_reference.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib_reference.kt
index a26d8d2..ff9ce5a 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib_reference.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/allow_access_modification_lib/lib_reference.kt
@@ -6,9 +6,10 @@
class LibReference(
val readOnlyPropPrimaryInternal: Int,
- var propPrimaryInternal : Int,
+ var propPrimaryInternal: Int,
val readOnlyPropPrimaryPrivate: Int,
- var propPrimaryPrivate : Int) {
+ var propPrimaryPrivate: Int,
+) {
val readOnlyPropInternal: Int = 42
var propPrivate: Int = 42
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/anno/Anno.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/anno/Anno.kt
index 3e37cc4..a379dc3 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/anno/Anno.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/anno/Anno.kt
@@ -3,5 +3,4 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.kotlin.metadata.anno
-@Retention(AnnotationRetention.RUNTIME)
-annotation class Anno
+@Retention(AnnotationRetention.RUNTIME) annotation class Anno
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_app/main.kt
index 414da89..2234238 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_app/main.kt
@@ -24,8 +24,15 @@
// We cannot reflect on annotations on typealiases:
// https://youtrack.jetbrains.com/issue/KT-21489
Quux::methodWithTypeAnnotations
- .returnType.arguments.get(0).type?.annotations?.get(0)?.printAnnoWithClassAndEnum()
- val nested = Quux::methodWithNestedAnnotations.returnType.arguments[0].type?.annotations?.get(0) as Nested
+ .returnType
+ .arguments
+ .get(0)
+ .type
+ ?.annotations
+ ?.get(0)
+ ?.printAnnoWithClassAndEnum()
+ val nested =
+ Quux::methodWithNestedAnnotations.returnType.arguments[0].type?.annotations?.get(0) as Nested
println(nested.message)
nested.kept.printAnnoWithClassAndEnum()
if (nested::class.memberProperties.any { it.name.equals("notKept") }) {
@@ -44,4 +51,4 @@
val annoWithClassAndEnum = this as AnnoWithClassAndEnum
println(annoWithClassAndEnum.clazz)
println(annoWithClassAndEnum.direction)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_lib/lib.kt
index 0c6ff6c..0efed61 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/annotation_lib/lib.kt
@@ -7,18 +7,28 @@
import kotlin.reflect.KClass
enum class Direction {
- UP, RIGHT, DOWN, LEFT
+ UP,
+ RIGHT,
+ DOWN,
+ LEFT,
}
-@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION,
- AnnotationTarget.VALUE_PARAMETER,
- AnnotationTarget.PROPERTY,
- AnnotationTarget.TYPE)
+@Target(
+ AnnotationTarget.CLASS,
+ AnnotationTarget.FUNCTION,
+ AnnotationTarget.VALUE_PARAMETER,
+ AnnotationTarget.PROPERTY,
+ AnnotationTarget.TYPE,
+)
@Retention(AnnotationRetention.RUNTIME)
-annotation class AnnoWithClassAndEnum(val clazz : KClass<*>, val direction : Direction)
+annotation class AnnoWithClassAndEnum(val clazz: KClass<*>, val direction: Direction)
-@Target(AnnotationTarget.CLASS, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.TYPEALIAS,
- AnnotationTarget.TYPE)
+@Target(
+ AnnotationTarget.CLASS,
+ AnnotationTarget.CONSTRUCTOR,
+ AnnotationTarget.TYPEALIAS,
+ AnnotationTarget.TYPE,
+)
@Retention(AnnotationRetention.RUNTIME)
annotation class AnnoWithClassArr(val classes: Array<KClass<*>>)
@@ -27,11 +37,13 @@
class Bar @AnnoWithClassArr([Foo::class]) constructor()
@AnnoWithClassArr([Foo::class, Bar::class])
-@AnnoWithClassAndEnum(Foo::class, Direction.UP) class Baz {
+@AnnoWithClassAndEnum(Foo::class, Direction.UP)
+class Baz {
- @AnnoWithClassAndEnum(Foo::class, Direction.LEFT) val prop : Int = 0
+ @AnnoWithClassAndEnum(Foo::class, Direction.LEFT) val prop: Int = 0
- @AnnoWithClassAndEnum(Foo::class, Direction.RIGHT) fun baz(@AnnoWithClassAndEnum(Foo::class, Direction.DOWN) foo: Int): Int {
+ @AnnoWithClassAndEnum(Foo::class, Direction.RIGHT)
+ fun baz(@AnnoWithClassAndEnum(Foo::class, Direction.DOWN) foo: Int): Int {
return 1
}
}
@@ -45,17 +57,20 @@
annotation class Nested(
val message: String,
val kept: AnnoWithClassAndEnum,
- val notKept: AnnoNotKept
+ val notKept: AnnoNotKept,
)
class Quux {
- fun methodWithTypeAnnotations() : Array<@AnnoWithClassAndEnum(Foo::class, Direction.UP) Int> {
+ fun methodWithTypeAnnotations(): Array<@AnnoWithClassAndEnum(Foo::class, Direction.UP) Int> {
return arrayOf(1)
}
- fun methodWithNestedAnnotations() : Array<@Nested("Top most", AnnoWithClassAndEnum(Foo::class, Direction.DOWN), AnnoNotKept()) Int> {
+ fun methodWithNestedAnnotations():
+ Array<
+ @Nested("Top most", AnnoWithClassAndEnum(Foo::class, Direction.DOWN), AnnoNotKept())
+ Int
+ > {
return arrayOf(1)
}
}
-
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_app/main.kt
index 14cd0b1..4b937c7 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_app/main.kt
@@ -8,4 +8,4 @@
fun main() {
println(Test().prop.foo())
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_lib/lib.kt
index 70d6668..e146386 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/anonymous_lib/lib.kt
@@ -7,14 +7,15 @@
class Test {
abstract class A {
- abstract fun foo() : String;
+ abstract fun foo(): String
}
- private val internalProp = object : A() {
- override fun foo(): String {
- return "foo";
+ private val internalProp =
+ object : A() {
+ override fun foo(): String {
+ return "foo"
+ }
}
- }
val prop = internalProp
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main.kt
index 2a7cb0c..13d0506 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main.kt
@@ -27,5 +27,8 @@
test.testNumber.add(test.number)
println(test.getFirstNumber(test.testNumber))
test.functionWithUnit { println(it) }
- test.functionWithVoid { println(it); null }
-}
\ No newline at end of file
+ test.functionWithVoid {
+ println(it)
+ null
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main_reflect.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main_reflect.kt
index be89c90..adc569b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main_reflect.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_app/main_reflect.kt
@@ -23,12 +23,23 @@
val test = Test()
assert(test::getFirstBoolean.parameters.size == 1)
assert(test::getFirstBoolean.parameters.get(0).name == "l")
- assert(test::getFirstBoolean
- .parameters.get(0).type.classifier.toString() == "class kotlin.collections.List")
+ assert(
+ test::getFirstBoolean.parameters.get(0).type.classifier.toString() ==
+ "class kotlin.collections.List"
+ )
assert(test::getFirstBoolean.parameters.get(0).type.arguments.size == 1)
- assert(test::getFirstBoolean
- .parameters.get(0).type.arguments.get(0).type!!.classifier.toString().equals(
- test::boolean.returnType.classifier.toString()))
+ assert(
+ test::getFirstBoolean
+ .parameters
+ .get(0)
+ .type
+ .arguments
+ .get(0)
+ .type!!
+ .classifier
+ .toString()
+ .equals(test::boolean.returnType.classifier.toString())
+ )
}
fun runReflective() {
@@ -62,11 +73,14 @@
test::testNumber.get().add(test::number.get())
println(test::getFirstNumber.call(test::testNumber.get()))
test::functionWithUnit.call({ i: Int -> println(i) })
- test::functionWithVoid.call({ i: Int -> println(i); null })
+ test::functionWithVoid.call({ i: Int ->
+ println(i)
+ null
+ })
}
fun main() {
trivialTypeAssertionsForProperties()
trivialTypeAssertionsForFunctions()
runReflective()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_lib/lib.kt
index 7193b62..d24da27 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/box_primitives_lib/lib.kt
@@ -6,36 +6,46 @@
class Test {
- val testReadOnly : List<Boolean> = listOf()
+ val testReadOnly: List<Boolean> = listOf()
- var boolean : Boolean = false
- var testBoolean : MutableList<Boolean> = mutableListOf()
- var byte : Byte = 0
- var testByte : MutableList<Byte> = mutableListOf()
- var char : Char = 'a'
- var testChar : MutableList<Char> = mutableListOf()
- var double : Double = 0.042
- var testDouble : MutableList<Double> = mutableListOf()
- var float : Float = 0.42F
- var testFloat : MutableList<Float> = mutableListOf()
- var int : Int = 42
- var testInt : MutableList<Int> = mutableListOf()
- var long : Long = 442
- var testLong : MutableList<Long> = mutableListOf()
- var short : Short = 1
- var testShort : MutableList<Short> = mutableListOf()
- var number : Number = 2
- var testNumber : MutableList<Number> = mutableListOf()
+ var boolean: Boolean = false
+ var testBoolean: MutableList<Boolean> = mutableListOf()
+ var byte: Byte = 0
+ var testByte: MutableList<Byte> = mutableListOf()
+ var char: Char = 'a'
+ var testChar: MutableList<Char> = mutableListOf()
+ var double: Double = 0.042
+ var testDouble: MutableList<Double> = mutableListOf()
+ var float: Float = 0.42F
+ var testFloat: MutableList<Float> = mutableListOf()
+ var int: Int = 42
+ var testInt: MutableList<Int> = mutableListOf()
+ var long: Long = 442
+ var testLong: MutableList<Long> = mutableListOf()
+ var short: Short = 1
+ var testShort: MutableList<Short> = mutableListOf()
+ var number: Number = 2
+ var testNumber: MutableList<Number> = mutableListOf()
- fun getFirstBoolean(l : List<Boolean>) : Boolean = l.get(0)
- fun getFirstByte(l : List<Byte>) : Byte = l.get(0)
- fun getFirstChar(l : List<Char>) : Char = l.get(0)
- fun getFirstDouble(l : List<Double>) : Double = l.get(0)
- fun getFirstFloat(l : List<Float>) : Float = l.get(0)
- fun getFirstInt(l : List<Int>) : Int = l.get(0)
- fun getFirstLong(l : List<Long>) : Long = l.get(0)
- fun getFirstShort(l : List<Short>) : Short = l.get(0)
- fun getFirstNumber(l : List<Number>) : Number = l.get(0)
- fun functionWithUnit(consumer : (Int) -> Unit) = consumer(42)
- fun functionWithVoid(consumer : (Int) -> Void?) = consumer(42)
+ fun getFirstBoolean(l: List<Boolean>): Boolean = l.get(0)
+
+ fun getFirstByte(l: List<Byte>): Byte = l.get(0)
+
+ fun getFirstChar(l: List<Char>): Char = l.get(0)
+
+ fun getFirstDouble(l: List<Double>): Double = l.get(0)
+
+ fun getFirstFloat(l: List<Float>): Float = l.get(0)
+
+ fun getFirstInt(l: List<Int>): Int = l.get(0)
+
+ fun getFirstLong(l: List<Long>): Long = l.get(0)
+
+ fun getFirstShort(l: List<Short>): Short = l.get(0)
+
+ fun getFirstNumber(l: List<Number>): Number = l.get(0)
+
+ fun functionWithUnit(consumer: (Int) -> Unit) = consumer(42)
+
+ fun functionWithVoid(consumer: (Int) -> Void?) = consumer(42)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/companion_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/companion_app/main.kt
index ef4e23f..dc50fa9 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/companion_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/companion_app/main.kt
@@ -11,6 +11,6 @@
B.elt2.doStuff()
println(B.foo)
println(B.bar)
- B.bar = "Hello World!";
+ B.bar = "Hello World!"
println(B.bar)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/companion_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/companion_lib/lib.kt
index 54db448..64d443a 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/companion_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/companion_lib/lib.kt
@@ -20,11 +20,11 @@
companion object {
val elt1: Super = B()
- @JvmField
- val elt2: Super = B()
+ @JvmField val elt2: Super = B()
val foo: String
get() = "B.Companion::foo"
- var bar : String = "B.Companion::bar"
+
+ var bar: String = "B.Companion::bar"
get() = field
set(value) {
field = value
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/companion_remove_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/companion_remove_lib/lib.kt
index a16595e..d25513f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/companion_remove_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/companion_remove_lib/lib.kt
@@ -7,6 +7,7 @@
fun doStuff() {
println(foo)
}
+
companion object {
val foo: String
get() = "Hello World!"
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_app/main.kt
index 99a3882..9044757 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_app/main.kt
@@ -8,11 +8,13 @@
import com.android.tools.r8.kotlin.metadata.crossinline_anon_lib.Handler
fun main() {
- Handler({ context, throwable ->
- println(context)
- }).handle(object : Context {
- override fun toString(): String {
- return "foo"
- }
- }, NullPointerException())
-}
\ No newline at end of file
+ Handler({ context, throwable -> println(context) })
+ .handle(
+ object : Context {
+ override fun toString(): String {
+ return "foo"
+ }
+ },
+ NullPointerException(),
+ )
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_lib/lib.kt
index b820f4a..8c79a4c 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_anon_lib/lib.kt
@@ -4,16 +4,13 @@
package com.android.tools.r8.kotlin.metadata.crossinline_anon_lib
-public interface Context {
-
-}
+public interface Context {}
public inline fun Handler(crossinline handler: (Context, Throwable) -> Unit): Handler =
object : Handler {
- override fun handle(context: Context, exception: Throwable) =
- handler.invoke(context, exception)
+ override fun handle(context: Context, exception: Throwable) = handler.invoke(context, exception)
}
public interface Handler {
fun handle(context: Context, exception: Throwable)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_app/main.kt
index b349233..995acee 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_app/main.kt
@@ -7,7 +7,7 @@
import com.android.tools.r8.kotlin.metadata.crossinline_block_lib.bar
import com.android.tools.r8.kotlin.metadata.crossinline_block_lib.foo
-fun main(args : Array<String>) {
+fun main(args: Array<String>) {
if (args.isEmpty()) {
call("foo")
bar(bar3 = 0)
@@ -19,4 +19,4 @@
fun call(name: String) {
foo { name }
println(name)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_lib/lib.kt
index d7efaaf..c31ef65 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_block_lib/lib.kt
@@ -4,10 +4,7 @@
package com.android.tools.r8.kotlin.metadata.crossinline_block_lib
-public inline fun foo(
- bar: String? = null,
- crossinline block: () -> String? = { null }
-) {
+public inline fun foo(bar: String? = null, crossinline block: () -> String? = { null }) {
block()
}
@@ -44,7 +41,7 @@
bar30: Int = 42,
bar31: Int = 42,
bar32: Int = 42,
- bar33: Int = 42
+ bar33: Int = 42,
) {
println(bar1)
println(bar2)
@@ -79,4 +76,4 @@
println(bar31)
println(bar32)
println(bar33)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_app/main.kt
index 4c5c3a7..566fecb 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_app/main.kt
@@ -8,11 +8,13 @@
import com.android.tools.r8.kotlin.metadata.crossinline_concrete_lib.Handler
fun main() {
- Handler({ context, throwable ->
- println(context)
- }).handle(object : Context {
- override fun toString(): String {
- return "foo"
- }
- }, NullPointerException())
-}
\ No newline at end of file
+ Handler({ context, throwable -> println(context) })
+ .handle(
+ object : Context {
+ override fun toString(): String {
+ return "foo"
+ }
+ },
+ NullPointerException(),
+ )
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_lib/lib.kt
index cf5da42..6434f76 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/crossinline_concrete_lib/lib.kt
@@ -4,9 +4,7 @@
package com.android.tools.r8.kotlin.metadata.crossinline_concrete_lib
-public interface Context {
-
-}
+public interface Context {}
public inline fun Handler(crossinline handler: (Context, Throwable) -> Unit): Handler =
ConcreteClass().getHandler(handler)
@@ -22,4 +20,4 @@
public interface Handler {
fun handle(context: Context, exception: Throwable)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_app/main.kt
index 43a9e2e..fa54d32 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_app/main.kt
@@ -8,7 +8,7 @@
fun main() {
val myDelegatedProperty = MyDelegatedProperty()
- myDelegatedProperty.oldName = "foobar";
+ myDelegatedProperty.oldName = "foobar"
println(myDelegatedProperty.newName)
println(myDelegatedProperty::oldName.toString())
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_lib/lib.kt
index da40ce5..0aeee2c 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/delegated_property_lib/lib.kt
@@ -7,4 +7,4 @@
class MyDelegatedProperty {
var newName: String = "Hello World!"
var oldName: String by this::newName
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/enum_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/enum_lib/lib.kt
index 0423b6d..e3d9592 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/enum_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/enum_lib/lib.kt
@@ -5,5 +5,8 @@
package com.android.tools.r8.kotlin.metadata.enum_lib
enum class Direction {
- UP, RIGHT, DOWN, LEFT
+ UP,
+ RIGHT,
+ DOWN,
+ LEFT,
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/extension_function_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/extension_function_app/main.kt
index dc7d16e..401a17b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/extension_function_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/extension_function_app/main.kt
@@ -4,8 +4,8 @@
package com.android.tools.r8.kotlin.metadata.extension_function_app
import com.android.tools.r8.kotlin.metadata.extension_function_lib.B
-import com.android.tools.r8.kotlin.metadata.extension_function_lib.extension
import com.android.tools.r8.kotlin.metadata.extension_function_lib.csHash
+import com.android.tools.r8.kotlin.metadata.extension_function_lib.extension
import com.android.tools.r8.kotlin.metadata.extension_function_lib.longArrayHash
import com.android.tools.r8.kotlin.metadata.extension_function_lib.myApply
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_app/main.kt
index 320bad9..bbab6b5 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_app/main.kt
@@ -10,4 +10,4 @@
val b = B()
b.doStuff()
b.asI.doStuff()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_lib/B.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_lib/B.kt
index 4be711f..1352212 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_lib/B.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/extension_property_lib/B.kt
@@ -15,5 +15,5 @@
class B : Super()
-val B.asI : I
+val B.asI: I
get() = this
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_app/main.kt
index 9c56878..6dc518d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_app/main.kt
@@ -11,4 +11,4 @@
val flexible = FlexibleUpperBound(B())
flexible.ref.get().foo(42)
flexible.ref.set(null)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_lib/lib.kt
index 9dbb382..5dd190c 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/flexible_upper_bound_lib/lib.kt
@@ -6,18 +6,18 @@
open class A<T> {
- open fun foo(t : T) {
+ open fun foo(t: T) {
println("A.foo(): " + t.toString())
}
}
class B : A<Int>() {
- override fun foo(t : Int) {
+ override fun foo(t: Int) {
println("B.foo(): " + t)
}
}
class FlexibleUpperBound<T> constructor(element: A<T>) {
var ref = java.util.concurrent.atomic.AtomicReference(element)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_lib/lib.kt
index bb88f97..2369f42 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_lib/lib.kt
@@ -24,8 +24,7 @@
val canDrink: Boolean
get() = age >= 21
- @set:JvmName("changeMaritalStatus")
- var married: Boolean = false
+ @set:JvmName("changeMaritalStatus") var married: Boolean = false
}
fun Person.changeAgeLegally(newAge: Int) {
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_only_getter/getter_user.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_only_getter/getter_user.kt
index b3aba2e..16268f6 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_only_getter/getter_user.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/fragile_property_only_getter/getter_user.kt
@@ -12,4 +12,4 @@
println(x.canDrink)
println(x.married)
println(y.name)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/function_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/function_app/main.kt
index 2f51f32..f0b47d3 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/function_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/function_app/main.kt
@@ -9,4 +9,4 @@
fun main() {
B().doStuff()
`fun`(B())
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_app/main.kt
index 28cecd5..b0604d9 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_app/main.kt
@@ -9,4 +9,4 @@
fun main() {
login(Password("Hello World!"))
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt
index a9d5023..dcc0d47 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_app/main.kt
@@ -5,9 +5,8 @@
package com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_app
import com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_lib.create
-import com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_lib.Password
import com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_lib.login
fun main() {
login(create("Hello World!"))
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/keepForApi.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/keepForApi.kt
index 1e0ec5a..b8fc896 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/keepForApi.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/keepForApi.kt
@@ -6,6 +6,4 @@
@Target(AnnotationTarget.FUNCTION)
@Retention(AnnotationRetention.RUNTIME)
-annotation class KeepForApi {
-
-}
\ No newline at end of file
+annotation class KeepForApi {}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/lib.kt
index 8c902e7..5f8ccb3 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_fun_descriptor_classes_lib/lib.kt
@@ -4,15 +4,14 @@
package com.android.tools.r8.kotlin.metadata.inline_class_fun_descriptor_classes_lib
-@JvmInline
-value class Password(val s: String)
+@JvmInline value class Password(val s: String)
@KeepForApi
-fun create(pw : String) : Password {
+fun create(pw: String): Password {
return Password(pw)
}
@KeepForApi
-fun login(pw : Password) {
+fun login(pw: Password) {
println(pw.s)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_lib/lib.kt
index 56bc18f..07bbf6a 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_class_lib/lib.kt
@@ -4,9 +4,8 @@
package com.android.tools.r8.kotlin.metadata.inline_class_lib
-@JvmInline
-value class Password(private val s: String)
+@JvmInline value class Password(private val s: String)
-fun login(pw : Password) {
+fun login(pw: Password) {
println(pw)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_app/main.kt
index 3f7acc6..f3cdcbb 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_app/main.kt
@@ -12,4 +12,4 @@
println(Lib(42).is7)
println(Lib(7).is42)
println(Lib(7).is7)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_lib/lib.kt
index 0636795..7c27db6 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/inline_property_lib/lib.kt
@@ -4,12 +4,13 @@
package com.android.tools.r8.kotlin.metadata.inline_property_lib
-class Lib(val number : Int) {
+class Lib(val number: Int) {
val is42
- inline get() = number == 42;
+ inline get() = number == 42
}
class LibExt
- val Lib.is7
- inline get() = number == 7;
\ No newline at end of file
+
+val Lib.is7
+ inline get() = number == 7
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_app/main.kt
index 6bd1218..5005663 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_app/main.kt
@@ -12,4 +12,4 @@
Lib.staticFun { true }
Lib.staticProp = "Foo"
println(Lib.staticProp)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_lib/lib.kt
index cc0f1fb..b689c13 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/jvmstatic_lib/lib.kt
@@ -6,7 +6,8 @@
interface InterfaceWithCompanion {
companion object {
- @JvmStatic fun greet(username: String) {
+ @JvmStatic
+ fun greet(username: String) {
println("Hello, $username")
}
}
@@ -15,11 +16,10 @@
object Lib {
@JvmStatic
- fun staticFun(func : () -> Boolean) {
+ fun staticFun(func: () -> Boolean) {
println("Calling func...")
func()
}
- @JvmStatic
- var staticProp : String = ""
-}
\ No newline at end of file
+ @JvmStatic var staticProp: String = ""
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/local_delegated_property_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/local_delegated_property_app/main.kt
index b8959e8..5c6eaa4 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/local_delegated_property_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/local_delegated_property_app/main.kt
@@ -8,33 +8,34 @@
import kotlin.reflect.full.declaredMemberProperties
import kotlin.reflect.jvm.isAccessible
-class Resource(private var s : String = "Initial string") {
+class Resource(private var s: String = "Initial string") {
override fun toString(): String {
- return s;
+ return s
}
}
object CustomDelegate {
- private var resource : Resource = Resource()
+ private var resource: Resource = Resource()
operator fun getValue(thisRef: Any?, property: KProperty<*>): Resource {
println("$resource has been read in CustomDelegate from '${property.name}'")
- return resource;
+ return resource
}
operator fun setValue(thisRef: Any?, property: KProperty<*>, value: Resource) {
println("$value has been assigned to '${property.name}'")
- this.resource = resource;
+ this.resource = resource
}
}
open class Base {
- fun doSomethingOnBarRef() : Resource {
+ fun doSomethingOnBarRef(): Resource {
var x by CustomDelegate
- val propRef = x.javaClass.kotlin.declaredMemberProperties.first() as KMutableProperty1<Resource, String>
+ val propRef =
+ x.javaClass.kotlin.declaredMemberProperties.first() as KMutableProperty1<Resource, String>
propRef.isAccessible = true
propRef.set(x, "New value")
propRef.get(x)
@@ -51,9 +52,7 @@
}
}
-
fun main() {
val impl = Impl()
impl.doSomethingOnBarRef()
}
-
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/metadata_pruned_fields/Methods.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/metadata_pruned_fields/Methods.kt
index 5f67164..33c5362 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/metadata_pruned_fields/Methods.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/metadata_pruned_fields/Methods.kt
@@ -6,4 +6,4 @@
fun staticMethod() {
println("Hello World!")
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/signed.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/signed.kt
index 81c4994..f3e64d7 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/signed.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/signed.kt
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
@file:kotlin.jvm.JvmMultifileClass
@file:kotlin.jvm.JvmName("UtilKt")
+
package com.android.tools.r8.kotlin.metadata.multifileclass_lib
@kotlin.jvm.JvmName("joinOfInt")
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/unsigned.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/unsigned.kt
index 25dac69..8773669 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/unsigned.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/multifileclass_lib/unsigned.kt
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
@file:kotlin.jvm.JvmMultifileClass
@file:kotlin.jvm.JvmName("UtilKt")
+
package com.android.tools.r8.kotlin.metadata.multifileclass_lib
@SinceKotlin("1.3")
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/nested_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/nested_app/main.kt
index d4f91d4..950e36f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/nested_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/nested_app/main.kt
@@ -9,4 +9,4 @@
val o = Outer()
println(o.delegateInner())
println(o.delegateNested(21))
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/nested_reflect/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/nested_reflect/main.kt
index f73e134..3a493f8 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/nested_reflect/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/nested_reflect/main.kt
@@ -8,6 +8,7 @@
class Outer {
data class Nested(val data: Int)
+
inner class Inner(val data: Int)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/parametertype_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/parametertype_lib/lib.kt
index 75c3d78..a4e51b3 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/parametertype_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/parametertype_lib/lib.kt
@@ -4,12 +4,13 @@
package com.android.tools.r8.kotlin.metadata.parametertype_lib
interface Itf {
- fun foo(arg : Itf)
+ fun foo(arg: Itf)
+
fun bar()
}
open class Impl : Itf {
- override fun foo(arg : Itf) {
+ override fun foo(arg: Itf) {
arg.bar()
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_app/main.kt
index adcf477..7706187 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_app/main.kt
@@ -8,4 +8,4 @@
fun main() {
foo()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_lib/lib.kt
index ec26d64..9fb25fe 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/primitive_type_rewrite_lib/lib.kt
@@ -6,4 +6,4 @@
fun foo() {
println("Hello World")
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_app/main.kt
index 214300c..53e122f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_app/main.kt
@@ -5,10 +5,9 @@
import com.android.tools.r8.kotlin.metadata.propertytype_lib.Impl
-class ProgramClass : Impl(8) {
-}
+class ProgramClass : Impl(8) {}
fun main() {
- val instance : Impl = ProgramClass()
+ val instance: Impl = ProgramClass()
println(instance.prop1)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_lib/lib.kt
index 40aa801..f130122 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/propertytype_lib/lib.kt
@@ -15,4 +15,4 @@
override fun toString(): String {
return "Impl::$id"
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_app/main.kt
index 1ba0b77..f027287 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_app/main.kt
@@ -11,4 +11,4 @@
val sub = Sub()
println(sub.kept())
SubUser().use(sub)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_lib/lib.kt
index 7cb8107..eb9963f 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/pruned_lib/lib.kt
@@ -11,22 +11,22 @@
class Sub : Base() {
- var notExposedProperty : Int = 42
- var keptProperty : String = "Hello World";
+ var notExposedProperty: Int = 42
+ var keptProperty: String = "Hello World"
- fun notKept() : Boolean {
+ fun notKept(): Boolean {
return true
}
@NeverInline
- fun keptWithoutPinning() : Int {
+ fun keptWithoutPinning(): Int {
if (System.currentTimeMillis() == 0L) {
- return 41;
+ return 41
}
- return 42;
+ return 42
}
- fun kept() : Int {
+ fun kept(): Int {
if (System.currentTimeMillis() > 0) {
notExposedProperty = 0
keptProperty = "Goodbye World"
@@ -38,8 +38,8 @@
class SubUser {
@NeverInline
- fun use(s : Sub) {
+ fun use(s: Sub) {
println(s.notExposedProperty)
println(s.keptProperty)
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/returntype_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/returntype_lib/lib.kt
index c24e292..68e9c76 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/returntype_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/returntype_lib/lib.kt
@@ -4,11 +4,11 @@
package com.android.tools.r8.kotlin.metadata.returntype_lib
interface Itf {
- fun foo() : Itf
+ fun foo(): Itf
}
open class Impl : Itf {
- override fun foo() : Itf {
+ override fun foo(): Itf {
println("Impl::foo")
return this
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/main.kt
index 2d6f4c8..f71fa32 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/main.kt
@@ -17,4 +17,4 @@
fun main() {
staticDeclaration()
reflectiveUse()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/valid.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/valid.kt
index 379c17e..b29370a 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/valid.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_app/valid.kt
@@ -3,8 +3,8 @@
// BSD-style license that can be found in the LICENSE file.
package com.android.tools.r8.kotlin.metadata.sealed_app
-import com.android.tools.r8.kotlin.metadata.sealed_lib.eval
import com.android.tools.r8.kotlin.metadata.sealed_lib.ExprFactory
+import com.android.tools.r8.kotlin.metadata.sealed_lib.eval
fun main() {
println(ExprFactory.createSum(ExprFactory.createNum(4), ExprFactory.createNum(2)).eval())
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/lib.kt
index ea64d13..42550c8 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/lib.kt
@@ -15,11 +15,12 @@
object ExprFactory {
fun createNum(i: Int): Expr = Num(i)
+
fun createSum(e1: Expr, e2: Expr): Expr = Sum(e1, e2)
}
fun Expr.eval(): Int =
- when(this) {
+ when (this) {
is Num -> num
is Sum -> e1.eval() + e2.eval()
else -> throw IllegalArgumentException("Unknown Expr: $this")
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/nested.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/nested.kt
index edf60d8..fe356a1 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/nested.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/sealed_lib/nested.kt
@@ -5,28 +5,24 @@
package com.android.tools.r8.kotlin.metadata.sealed_lib
/** Code originating from this bug b/163359809 */
-
interface Log {
val source: String
}
-sealed class TestEvent(
- open var stamp: Long = currentStamp
-) {
+sealed class TestEvent(open var stamp: Long = currentStamp) {
sealed class DiagnosticEvent(
open val name: String,
open val display: Boolean = false,
- override var stamp: Long = currentStamp
+ override var stamp: Long = currentStamp,
) : TestEvent(stamp) {
data class DataTestControllerStartEvent(
override val source: String,
override val name: String = DataTestControllerStartEvent::class.java.simpleName,
override val display: Boolean = false,
- override var stamp: Long = currentStamp
- ) :
- DiagnosticEvent(name, display, stamp),
- Log
+ override var stamp: Long = currentStamp,
+ ) : DiagnosticEvent(name, display, stamp), Log
}
+
companion object {
var currentStamp = 0L
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_app/main.kt
index 309b756..42b21c0 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_app/main.kt
@@ -14,4 +14,4 @@
fun main() {
ProgramClass().foo()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/impl.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/impl.kt
index 448cb10..5fd2c18 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/impl.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/impl.kt
@@ -9,4 +9,4 @@
override fun foo() {
println("Impl::foo")
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/internal/itf.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/internal/itf.kt
index 7fff074..974dc72 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/internal/itf.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/supertype_lib/internal/itf.kt
@@ -5,4 +5,4 @@
interface Itf {
fun foo()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/syntheticmethodforannotations/kt/Metadata.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/syntheticmethodforannotations/kt/Metadata.kt
index 74154f1..70eb9f0 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/syntheticmethodforannotations/kt/Metadata.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/syntheticmethodforannotations/kt/Metadata.kt
@@ -10,11 +10,9 @@
class Data {
companion object {
- @Test
- var All: Set<String> = emptySet()
+ @Test var All: Set<String> = emptySet()
- @property:Test
- var All2: Set<String> = emptySet()
+ @property:Test var All2: Set<String> = emptySet()
}
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_app/main.kt
index 7cb36c2..563516c 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_app/main.kt
@@ -8,4 +8,4 @@
fun main() {
println(ClassWithRawType().returnsRaw())
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_lib/lib.kt
index df9a05a..eb35eb7 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/type_raw_lib/lib.kt
@@ -6,5 +6,5 @@
class ClassWithRawType {
- fun returnsRaw() = JavaLibraryClass.getGeneric();
+ fun returnsRaw() = JavaLibraryClass.getGeneric()
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_app/main.kt
index 71dc2aa..d08eedf 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_app/main.kt
@@ -38,67 +38,72 @@
}
fun testUnusedArgument() {
- val u = UnusedTypeArgument<Int>();
+ val u = UnusedTypeArgument<Int>()
}
fun testSimpleClass() {
- val simple = object : AlphaNaming() { }
+ val simple = object : AlphaNaming() {}
println(SimpleClassTester.f(SimpleClassTester.g(simple)).y)
}
fun testArr2D() {
- val arr1d : Arr1D<Int> = Arr1D(42);
- val arr2d : Arr2D<Int> = Arr2D(arr1d);
- println(Arr2DTester.f(Arr2DTester.g(arr2d)).x.x);
+ val arr1d: Arr1D<Int> = Arr1D(42)
+ val arr2d: Arr2D<Int> = Arr2D(arr1d)
+ println(Arr2DTester.f(Arr2DTester.g(arr2d)).x.x)
}
fun testInterface() {
- val myInstance = object : MyI {
- override fun f() {
- println("42");
+ val myInstance =
+ object : MyI {
+ override fun f() {
+ println("42")
+ }
}
- }
InterfaceTester.f(myInstance).f()
- val map : MyMapToSetOfInt<Int> = HashMap();
- val set : IntSet = mutableSetOf(42);
- map.put(1, set);
- println(InterfaceTester.i(InterfaceTester.h(map))[1]?.iterator()?.next() ?: "");
+ val map: MyMapToSetOfInt<Int> = HashMap()
+ val set: IntSet = mutableSetOf(42)
+ map.put(1, set)
+ println(InterfaceTester.i(InterfaceTester.h(map))[1]?.iterator()?.next() ?: "")
}
fun testFunctionTypes() {
- FunctionTester.f(FunctionTester.g({ i : Int, a : Any ->
- println(i)
- println(a)
- }))(42, "42")
- FunctionTester.h(FunctionTester.i({ b ->
- println(b)
- false
- }))(true)
+ FunctionTester.f(
+ FunctionTester.g({ i: Int, a: Any ->
+ println(i)
+ println(a)
+ })
+ )(42, "42")
+ FunctionTester.h(
+ FunctionTester.i({ b ->
+ println(b)
+ false
+ })
+ )(true)
}
fun testNestedClasses() {
- val nested = OuterNested(42);
- val myInner : OuterNestedInner = nested.Inner(1)
+ val nested = OuterNested(42)
+ val myInner: OuterNestedInner = nested.Inner(1)
println(OuterTester.f(OuterTester.g(nested)).y)
println(OuterTester.h(OuterTester.i(myInner)).x)
}
fun testCompanion() {
- println(ClassWithCompanionC.fooOnCompanion);
+ println(ClassWithCompanionC.fooOnCompanion)
}
fun testConstructor() {
- println(CWithConstructorTester.f(CWithConstructorTester.g(CWithConstructor(42))).x);
+ println(CWithConstructorTester.f(CWithConstructorTester.g(CWithConstructor(42))).x)
}
fun testUnderlyingType() {
val cWithConstructor = StillCWithConstructor(42)
println(UnderlyingTypeTester.f(UnderlyingTypeTester.g(cWithConstructor)).x)
- val advancedMap : MyAdvancedMap = HashMap();
- val nested = OuterNested(42);
- val myInner : OuterNestedInner = nested.Inner(1)
- advancedMap.put(nested, myInner);
+ val advancedMap: MyAdvancedMap = HashMap()
+ val nested = OuterNested(42)
+ val myInner: OuterNestedInner = nested.Inner(1)
+ advancedMap.put(nested, myInner)
val sameMap = UnderlyingTypeTester.h(UnderlyingTypeTester.i(advancedMap))
println(sameMap.get(nested)?.x)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib.kt
index 15771dd..96ec13e 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib.kt
@@ -15,8 +15,9 @@
typealias Jude = Long
interface Itf {
- fun foo() : Itf
- fun hey() : Jude
+ fun foo(): Itf
+
+ fun hey(): Jude
}
// KmTypeAlias {
@@ -58,7 +59,7 @@
typealias APIs = myAliasedArray<API>
open class Impl : API {
- override fun foo() : API {
+ override fun foo(): API {
println("Impl::foo")
return this
}
@@ -68,6 +69,6 @@
}
}
-fun seq(vararg itfs : Itf) : APIs {
+fun seq(vararg itfs: Itf): APIs {
return arrayOf(*itfs)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib_ext.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib_ext.kt
index 481adfc..6e44f99 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib_ext.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/typealias_lib/lib_ext.kt
@@ -7,7 +7,7 @@
// Unused type aliases
-open class LibraryClass { }
+open class LibraryClass {}
// KmTypeAlias {
// name: Unused
@@ -36,7 +36,7 @@
// Expansion to simple class
open class SimpleClass {
- val y : Int = 42;
+ val y: Int = 42
}
// KmTypeAlias {
@@ -53,14 +53,13 @@
class SimpleClassTester {
companion object {
- fun f(a : Any) : AlphaNaming {
- return a as AlphaNaming;
+ fun f(a: Any): AlphaNaming {
+ return a as AlphaNaming
}
- fun g(a : AlphaNaming) : Any {
- return a;
+ fun g(a: AlphaNaming): Any {
+ return a
}
-
}
}
@@ -68,7 +67,7 @@
interface Api {
- fun foo();
+ fun foo()
}
class ApiImpl : Api {
@@ -96,15 +95,15 @@
return ApiImpl()
}
- fun passThrough(a : ApiAlias) : ApiAlias {
- return a;
+ fun passThrough(a: ApiAlias): ApiAlias {
+ return a
}
}
}
// Multiple expansions
-class Arr<K>(val x : K)
+class Arr<K>(val x: K)
// KmTypeAlias {
// name: Arr1D
@@ -138,14 +137,13 @@
companion object {
- fun <K> f(a : Arr1D<Arr1D<K>>) : Arr2D<K> {
- return a;
+ fun <K> f(a: Arr1D<Arr1D<K>>): Arr2D<K> {
+ return a
}
- fun <K> g(a : Arr2D<K>) : Arr1D<Arr1D<K>> {
- return a;
+ fun <K> g(a: Arr2D<K>): Arr1D<Arr1D<K>> {
+ return a
}
-
}
}
@@ -186,7 +184,8 @@
// typeParameters: K
// underlyingType {
// classifier: Class(name=kotlin/collections/MutableMap)
-// arguments: TypeParameter(id=0),TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/IntSet)
+// arguments:
+// TypeParameter(id=0),TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/IntSet)
// }
// expandedType {
// classifier: Class(name=kotlin/collections/MutableMap)
@@ -199,20 +198,20 @@
companion object {
- fun f(i : Any) : MyI {
+ fun f(i: Any): MyI {
return i as MyI
}
- fun g(myI : MyI) : Any {
- return myI;
+ fun g(myI: MyI): Any {
+ return myI
}
- fun h(k : MyMapToSetOfInt<Int>) : MutableMap<Int, IntSet> {
- return k;
+ fun h(k: MyMapToSetOfInt<Int>): MutableMap<Int, IntSet> {
+ return k
}
- fun i(myMap : MutableMap<Int, IntSet>) : MyMapToSetOfInt<Int> {
- return myMap;
+ fun i(myMap: MutableMap<Int, IntSet>): MyMapToSetOfInt<Int> {
+ return myMap
}
}
}
@@ -250,20 +249,20 @@
companion object {
- fun f(a : (Int, Any) -> Unit) : MyHandler {
- return a;
+ fun f(a: (Int, Any) -> Unit): MyHandler {
+ return a
}
- fun g(a : MyHandler) : (Int, Any) -> Unit {
- return a;
+ fun g(a: MyHandler): (Int, Any) -> Unit {
+ return a
}
- fun h(a : (Boolean) -> Boolean) : MyGenericPredicate<Boolean> {
- return a;
+ fun h(a: (Boolean) -> Boolean): MyGenericPredicate<Boolean> {
+ return a
}
- fun i(a : MyGenericPredicate<Boolean>) : (Boolean) -> Boolean {
- return a;
+ fun i(a: MyGenericPredicate<Boolean>): (Boolean) -> Boolean {
+ return a
}
}
}
@@ -271,10 +270,8 @@
// Expansion to nested classes
class Outer {
- class Nested(val y : Int) {
- inner class Inner(val x : Int) {
-
- }
+ class Nested(val y: Int) {
+ inner class Inner(val x: Int) {}
}
}
@@ -304,20 +301,20 @@
companion object {
- fun f(a : Any) : OuterNested {
- return a as OuterNested;
+ fun f(a: Any): OuterNested {
+ return a as OuterNested
}
- fun g(a : OuterNested) : Any {
- return a;
+ fun g(a: OuterNested): Any {
+ return a
}
- fun h(a : Any) : OuterNestedInner {
- return a as OuterNestedInner;
+ fun h(a: Any): OuterNestedInner {
+ return a as OuterNestedInner
}
- fun i(a : OuterNestedInner) : Any {
- return a;
+ fun i(a: OuterNestedInner): Any {
+ return a
}
}
}
@@ -335,17 +332,19 @@
// KmTypeAlias {
// name: ClassWithCompanionC
// underlyingType {
-// classifier: Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/ClassWithCompanion.Companion)
+// classifier:
+// Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/ClassWithCompanion.Companion)
// }
// expandedType {
-// classifier: Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/ClassWithCompanion.Companion)
+// classifier:
+// Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/ClassWithCompanion.Companion)
// }
// },
typealias ClassWithCompanionC = ClassWithCompanion.Companion
// Expansion to constructor
-class C(val x : Int) {
+class C(val x: Int) {
private constructor() : this(0)
}
@@ -365,12 +364,12 @@
companion object {
- fun f(a : Any) : CWithConstructor {
- return a as CWithConstructor;
+ fun f(a: Any): CWithConstructor {
+ return a as CWithConstructor
}
- fun g(a : CWithConstructor) : Any {
- return a;
+ fun g(a: CWithConstructor): Any {
+ return a
}
}
}
@@ -380,7 +379,8 @@
// KmTypeAlias {
// name: StillCWithConstructor
// underlyingType {
-// classifier: TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/CWithConstructor)
+// classifier:
+// TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/CWithConstructor)
// }
// expandedType {
// classifier: Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/C)
@@ -392,11 +392,13 @@
// name: MyAdvancedMap
// underlyingType {
// classifier: Class(name=kotlin/collections/MutableMap)
-// arguments: TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/OuterNested),TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/OuterNestedInner)
+// arguments:
+// TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/OuterNested),TypeAlias(name=com/android/tools/r8/kotlin/metadata/typealias_lib/OuterNestedInner)
// }
// expandedType {
// classifier: Class(name=kotlin/collections/MutableMap)
-// arguments: Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/Outer.Nested),Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/Outer.Nested.Inner)
+// arguments:
+// Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/Outer.Nested),Class(name=com/android/tools/r8/kotlin/metadata/typealias_lib/Outer.Nested.Inner)
// }
// },
typealias MyAdvancedMap = MutableMap<OuterNested, OuterNestedInner>
@@ -405,20 +407,20 @@
companion object {
- fun f(a : StillCWithConstructor) : CWithConstructor {
- return a;
+ fun f(a: StillCWithConstructor): CWithConstructor {
+ return a
}
- fun g(a : CWithConstructor) : StillCWithConstructor {
- return a;
+ fun g(a: CWithConstructor): StillCWithConstructor {
+ return a
}
- fun h(a : MutableMap<OuterNested, OuterNestedInner>) : MyAdvancedMap {
- return a;
+ fun h(a: MutableMap<OuterNested, OuterNestedInner>): MyAdvancedMap {
+ return a
}
- fun i(a : MyAdvancedMap) : MutableMap<OuterNested, OuterNestedInner> {
- return a;
+ fun i(a: MyAdvancedMap): MutableMap<OuterNested, OuterNestedInner> {
+ return a
}
}
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_app/main.kt
index 2129081..1afcb4d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_app/main.kt
@@ -18,13 +18,13 @@
import com.android.tools.r8.kotlin.metadata.typeargument_lib.unboxAndPutInBox
import com.android.tools.r8.kotlin.metadata.typeargument_lib.update
-class SomeSubClass(val x : Int) : SomeClass(), Comparable<SomeClass> {
+class SomeSubClass(val x: Int) : SomeClass(), Comparable<SomeClass> {
override fun compareTo(other: SomeClass): Int {
if (other !is SomeSubClass) {
- return -1;
+ return -1
}
- return x.compareTo(other.x);
+ return x.compareTo(other.x)
}
}
@@ -40,7 +40,7 @@
}
fun testCoVariant() {
- println(CoVariant(42).classGenerics().t)
+ println(CoVariant(42).classGenerics().t)
}
fun testContraVariant() {
@@ -71,7 +71,7 @@
fun main() {
testInvariant()
testCoVariant()
- testContraVariant();
+ testContraVariant()
testExtension()
testPlainBox()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_lib/lib.kt
index d9d3bea..f0a51ed 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/typeargument_lib/lib.kt
@@ -6,97 +6,97 @@
open class SomeClass
-class PlainBox<T>(var plainBox : T)
+class PlainBox<T>(var plainBox: T)
-class ClassThatWillBeObfuscated(val x : Int)
+class ClassThatWillBeObfuscated(val x: Int)
class Invariant<T, C> {
- constructor(someValue : C) {
+ constructor(someValue: C) {
println(someValue)
}
- fun classGenerics(t : T) : T {
+ fun classGenerics(t: T): T {
return t
}
- fun <R> funGenerics(r : R) : R {
+ fun <R> funGenerics(r: R): R {
return r
}
- fun <R : SomeClass> funGenericsWithUpperBound(r : R) : R {
- return r;
+ fun <R : SomeClass> funGenericsWithUpperBound(r: R): R {
+ return r
}
- fun <R> funGenericsWithUpperBounds(r1 : R, r2 : R) : R
- where R : SomeClass,
- R : Comparable<SomeClass> {
+ fun <R> funGenericsWithUpperBounds(r1: R, r2: R): R where
+ R : SomeClass,
+ R : Comparable<SomeClass> {
return when {
r1 > r2 -> {
- r1;
+ r1
}
else -> {
- r2;
+ r2
}
}
}
- fun <R : T> mixedGenerics(r : R) : T {
- return r;
+ fun <R : T> mixedGenerics(r: R): T {
+ return r
}
}
-class CoVariant<out T>(val t : T) {
+class CoVariant<out T>(val t: T) {
- fun classGenerics() : CoVariant<T> {
- return CoVariant(t);
+ fun classGenerics(): CoVariant<T> {
+ return CoVariant(t)
}
}
class ContraVariant<in T> {
- fun classGenerics(t : T) {
+ fun classGenerics(t: T) {
println(t)
}
}
-fun <T> CoVariant<T>.unBoxAndBox() : CoVariant<T> {
+fun <T> CoVariant<T>.unBoxAndBox(): CoVariant<T> {
return CoVariant(this.t)
}
-fun <T, R> CoVariant<R>.update(t : T) : CoVariant<T> {
+fun <T, R> CoVariant<R>.update(t: T): CoVariant<T> {
println(this.t)
return CoVariant(t)
}
-fun <T> CoVariant<T>.unboxAndPutInBox(box : CoVariant<T>) : CoVariant<T> {
+fun <T> CoVariant<T>.unboxAndPutInBox(box: CoVariant<T>): CoVariant<T> {
println(this.t)
println(box.t)
return CoVariant(box.t)
}
-inline fun <reified T> CoVariant<T>.asList() : CoVariant<Array<T>> {
+inline fun <reified T> CoVariant<T>.asList(): CoVariant<Array<T>> {
println(this.t)
return CoVariant(arrayOf(this.t))
}
-inline fun <reified T> CoVariant<T>.asListWithVarargs(vararg ts : T) : CoVariant<Array<out T>> {
+inline fun <reified T> CoVariant<T>.asListWithVarargs(vararg ts: T): CoVariant<Array<out T>> {
println(this.t)
return CoVariant(ts)
}
-fun <T> CoVariant<T>.asListWithVarargs2(vararg ts : CoVariant<T>) : CoVariant<List<T>> {
+fun <T> CoVariant<T>.asListWithVarargs2(vararg ts: CoVariant<T>): CoVariant<List<T>> {
println(this.t)
return CoVariant(listOf(ts.get(0).t))
}
-fun <T> CoVariant<T>.asObfuscatedClass() : CoVariant<Array<Array<ClassThatWillBeObfuscated>>> {
+fun <T> CoVariant<T>.asObfuscatedClass(): CoVariant<Array<Array<ClassThatWillBeObfuscated>>> {
println(this.t)
val classThatWillBeObfuscated = ClassThatWillBeObfuscated(9)
println(classThatWillBeObfuscated.x)
return CoVariant(arrayOf(arrayOf(classThatWillBeObfuscated)))
}
-fun CoVariant<*>.asStar() : CoVariant<*> {
- return this;
-}
\ No newline at end of file
+fun CoVariant<*>.asStar(): CoVariant<*> {
+ return this
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_app/main.kt
index b3d5d3c..a9fa661 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_app/main.kt
@@ -8,14 +8,16 @@
import kotlin.reflect.full.declaredFunctions
fun main() {
- var lib = Lib();
- lib::class.declaredFunctions.forEach({
- println(it)
- var msg = it.call(lib)
- if (msg is IntArray) {
- println(msg[0])
- } else {
- println(msg)
- }
- })
-}
\ No newline at end of file
+ var lib = Lib()
+ lib::class
+ .declaredFunctions
+ .forEach({
+ println(it)
+ var msg = it.call(lib)
+ if (msg is IntArray) {
+ println(msg[0])
+ } else {
+ println(msg)
+ }
+ })
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_lib/lib.kt
index 65ae861..7b3dd31 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/unit_primitive_lib/lib.kt
@@ -4,23 +4,23 @@
package com.android.tools.r8.kotlin.metadata.unit_primitive_lib
class Lib {
- fun testUnit() : Unit {
+ fun testUnit(): Unit {
println("testUnit")
}
- fun testInt() : Int {
+ fun testInt(): Int {
return 42
}
- fun testIntArray() : IntArray {
+ fun testIntArray(): IntArray {
return intArrayOf(42)
}
- fun testUInt() : UInt {
+ fun testUInt(): UInt {
return 42u
}
- fun testUIntArray() : UIntArray {
+ fun testUIntArray(): UIntArray {
return uintArrayOf(42u)
}
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_app/main.kt
index 476c6e1..93cdc0d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_app/main.kt
@@ -10,4 +10,4 @@
Name("John Doe").prettyPrint()
compute(42)
compute(UInt(42))
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_lib/lib.kt
index 0c4d392..7561c68 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/value_class_lib/lib.kt
@@ -14,7 +14,7 @@
value class Name(val s: String) : Printable {
init {
- require(s.length > 0) { }
+ require(s.length > 0) {}
}
val length: Int
@@ -25,15 +25,14 @@
}
}
-@JvmInline
-value class UInt(val x: Int)
+@JvmInline value class UInt(val x: Int)
// Represented as 'public final void compute(int x)' on the JVM
fun compute(x: Int) {
- println(x);
+ println(x)
}
// Also represented as 'public final void compute(int x)' on the JVM thus name is mangled!
fun compute(x: UInt) {
- println(x);
+ println(x)
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_app/main.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_app/main.kt
index 417bfcd..42f19be 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_app/main.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_app/main.kt
@@ -6,7 +6,5 @@
import com.android.tools.r8.kotlin.metadata.vararg_lib.bar
fun main() {
- bar("R8") { instance, str ->
- instance.foo(str)
- }
-}
\ No newline at end of file
+ bar("R8") { instance, str -> instance.foo(str) }
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_lib/lib.kt b/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_lib/lib.kt
index 8cc6e19..14949a6 100644
--- a/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_lib/lib.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/metadata/vararg_lib/lib.kt
@@ -4,7 +4,7 @@
package com.android.tools.r8.kotlin.metadata.vararg_lib
class SomeClass {
- fun foo(x : String) {
+ fun foo(x: String) {
println("SomeClass::$x")
}
}
@@ -12,8 +12,6 @@
fun bar(vararg strs: String, f: (SomeClass, String) -> Unit) {
if (strs.isNotEmpty() && strs.any { it.startsWith("R8") }) {
val instance = SomeClass()
- strs
- .filter { it.startsWith("R8") }
- .map { f.invoke(instance, it) }
+ strs.filter { it.startsWith("R8") }.map { f.invoke(instance, it) }
}
}
diff --git a/src/test/java/com/android/tools/r8/kotlin/optimize/defaultarguments/kt/DefaultArguments.kt b/src/test/java/com/android/tools/r8/kotlin/optimize/defaultarguments/kt/DefaultArguments.kt
index b0cfc1c..69126f4b 100644
--- a/src/test/java/com/android/tools/r8/kotlin/optimize/defaultarguments/kt/DefaultArguments.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/optimize/defaultarguments/kt/DefaultArguments.kt
@@ -9,10 +9,10 @@
fun main(args: Array<String>) {
val byteArray = ByteArray(4, { it.toByte() })
f = byteArray
- read(byteArray, len=1)
- read(byteArray, len=2)
- read(len=3)
- read(len=4)
+ read(byteArray, len = 1)
+ read(byteArray, len = 2)
+ read(len = 3)
+ read(len = 4)
}
fun read(b: ByteArray = f, off: Int = 0, len: Int = b.size) {
@@ -21,4 +21,4 @@
for (i in start..end) {
println(b.get(i))
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClass.kt b/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClass.kt
index 0d3a7da..30f0121 100644
--- a/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClass.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/reflection/ReflectiveConstructionWithInlineClass.kt
@@ -5,10 +5,8 @@
package com.android.tools.r8.kotlin.reflection
import kotlin.reflect.full.primaryConstructor
-import kotlin.time.Duration
-@JvmInline
-value class Value(private val rawValue: Int)
+@JvmInline value class Value(private val rawValue: Int)
data class Data(val value: Value)
diff --git a/src/test/java/com/android/tools/r8/kotlin/sealed/kt/Format.kt b/src/test/java/com/android/tools/r8/kotlin/sealed/kt/Format.kt
index 2c1e189..3fba81d 100644
--- a/src/test/java/com/android/tools/r8/kotlin/sealed/kt/Format.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/sealed/kt/Format.kt
@@ -5,16 +5,20 @@
package com.android.tools.r8.kotlin.sealed.kt
public sealed class Format(val name: String) {
- object Zip : Format("ZIP")
- object Directory : Format("DIRECTORY")
+ object Zip : Format("ZIP")
+
+ object Directory : Format("DIRECTORY")
}
fun main() {
- val value = when ("ZIP") {
+ val value =
+ when ("ZIP") {
Format.Zip.name -> Format.Zip
Format.Directory.name -> Format.Directory
- else -> throw IllegalArgumentException(
- "Valid formats: ${Format.Zip.name} or ${Format.Directory.name}.")
- }
+ else ->
+ throw IllegalArgumentException(
+ "Valid formats: ${Format.Zip.name} or ${Format.Directory.name}."
+ )
+ }
println(value.name)
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/kotlin/sealed/kt/SealedInterfaceSubClasses.kt b/src/test/java/com/android/tools/r8/kotlin/sealed/kt/SealedInterfaceSubClasses.kt
index 469e08c..fcf2426 100644
--- a/src/test/java/com/android/tools/r8/kotlin/sealed/kt/SealedInterfaceSubClasses.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/sealed/kt/SealedInterfaceSubClasses.kt
@@ -6,19 +6,24 @@
sealed interface SealedInterfaceSubClasses {
object A : SealedInterfaceSubClasses {
- override fun toString() : String { return "I am A" }
+ override fun toString(): String {
+ return "I am A"
+ }
}
+
object B : SealedInterfaceSubClasses {
- override fun toString() : String { return "I am B" }
+ override fun toString(): String {
+ return "I am B"
+ }
}
}
-fun f(o : SealedInterfaceSubClasses) {
+fun f(o: SealedInterfaceSubClasses) {
when (o) {
SealedInterfaceSubClasses.A -> print("an A: ")
SealedInterfaceSubClasses.B -> print("a B: ")
}
- println(o);
+ println(o)
}
fun main() {
diff --git a/src/test/java/com/android/tools/r8/kotlin/stringplus/kt/StringPlus.kt b/src/test/java/com/android/tools/r8/kotlin/stringplus/kt/StringPlus.kt
index 4213f76..76bb058 100644
--- a/src/test/java/com/android/tools/r8/kotlin/stringplus/kt/StringPlus.kt
+++ b/src/test/java/com/android/tools/r8/kotlin/stringplus/kt/StringPlus.kt
@@ -4,11 +4,11 @@
package com.android.tools.r8.kotlin.sealed.kt
-fun string1() : String {
+fun string1(): String {
return "Hello "
}
-fun string2() : String {
+fun string2(): String {
return "World!"
}
@@ -17,17 +17,21 @@
println(string1().plus(string2()))
println("StringConcat(" + string1() + string2() + ")")
println(StringBuilder().append("StringBuilder[").append(string1()).append(string2()).append("]"))
- var foo = "a";
- foo = foo + "b";
+ var foo = "a"
+ foo = foo + "b"
println(foo + "c")
}
fun keepForNoMemberRebinding() {
- println((if (System.currentTimeMillis() > 0) "foo" else "bar")
- + (if (System.currentTimeMillis() > 0) "baz" else "qux"))
+ println(
+ (if (System.currentTimeMillis() > 0) "foo" else "bar") +
+ (if (System.currentTimeMillis() > 0) "baz" else "qux")
+ )
}
fun keepForNoDoubleInlining() {
- println((if (System.currentTimeMillis() > 0) "ini" else "mini")
- + (if (System.currentTimeMillis() > 0) "miny" else "moe"))
+ println(
+ (if (System.currentTimeMillis() > 0) "ini" else "mini") +
+ (if (System.currentTimeMillis() > 0) "miny" else "moe")
+ )
}
diff --git a/src/test/java/com/android/tools/r8/regress/b191296688/B.kt b/src/test/java/com/android/tools/r8/regress/b191296688/B.kt
index a0ed49a..5bcf9d9 100644
--- a/src/test/java/com/android/tools/r8/regress/b191296688/B.kt
+++ b/src/test/java/com/android/tools/r8/regress/b191296688/B.kt
@@ -13,4 +13,4 @@
}
}
-fun main() = B().doIt()
\ No newline at end of file
+fun main() = B().doIt()
diff --git a/src/test/java/com/android/tools/r8/retrace/kt/InlineFunction.kt b/src/test/java/com/android/tools/r8/retrace/kt/InlineFunction.kt
index ceb2656..38b7e52 100644
--- a/src/test/java/com/android/tools/r8/retrace/kt/InlineFunction.kt
+++ b/src/test/java/com/android/tools/r8/retrace/kt/InlineFunction.kt
@@ -15,4 +15,4 @@
throw java.lang.Exception("inlineExceptionInstance")
println("will not be printed")
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt b/src/test/java/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt
index 2047a48..a0de68c 100644
--- a/src/test/java/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt
+++ b/src/test/java/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt
@@ -4,9 +4,7 @@
package retrace
inline fun foo() {
- bar {
- throw Exception("foo")
- }
+ bar { throw Exception("foo") }
}
inline fun bar(f: () -> Unit) {
@@ -19,4 +17,4 @@
fun main(args: Array<String>) {
foo()
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/retrace/kt/Main.kt b/src/test/java/com/android/tools/r8/retrace/kt/Main.kt
index 1c97080..89bc812 100644
--- a/src/test/java/com/android/tools/r8/retrace/kt/Main.kt
+++ b/src/test/java/com/android/tools/r8/retrace/kt/Main.kt
@@ -6,7 +6,5 @@
// Adding a few spaces to better see where the debug information is positioned.
fun main(args: Array<String>) {
- inlineExceptionStatic {
- throw Exception("Never get's here")
- }
+ inlineExceptionStatic { throw Exception("Never get's here") }
}
diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainInstance.kt b/src/test/java/com/android/tools/r8/retrace/kt/MainInstance.kt
index 38a781f..51fe255 100644
--- a/src/test/java/com/android/tools/r8/retrace/kt/MainInstance.kt
+++ b/src/test/java/com/android/tools/r8/retrace/kt/MainInstance.kt
@@ -4,7 +4,5 @@
package retrace
fun main(args: Array<String>) {
- InlineFunction().inlineExceptionInstance {
- throw Exception("Never get's here")
- }
+ InlineFunction().inlineExceptionInstance { throw Exception("Never get's here") }
}
diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainNested.kt b/src/test/java/com/android/tools/r8/retrace/kt/MainNested.kt
index f8329be..f21ecfa 100644
--- a/src/test/java/com/android/tools/r8/retrace/kt/MainNested.kt
+++ b/src/test/java/com/android/tools/r8/retrace/kt/MainNested.kt
@@ -5,10 +5,6 @@
// Some spaces to better see if retrace is working as expected.
-
fun main(args: Array<String>) {
- nestedInline {
- throw Exception("Never get's here")
- }
+ nestedInline { throw Exception("Never get's here") }
}
-
diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt b/src/test/java/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt
index 6c34142..fa6de9f 100644
--- a/src/test/java/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt
+++ b/src/test/java/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt
@@ -5,12 +5,6 @@
// Some spaces to better see if retrace is working as expected.
-
fun main(args: Array<String>) {
- nestedInlineOnFirstLine {
- throw Exception("Never get's here")
- }
+ nestedInlineOnFirstLine { throw Exception("Never get's here") }
}
-
-
-
diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt b/src/test/java/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt
index c968da4..f09e735 100644
--- a/src/test/java/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt
+++ b/src/test/java/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt
@@ -5,14 +5,8 @@
fun main(args: Array<String>) {
println("Before")
- inlineExceptionStatic {
- throw Exception("Never get's here")
- }
+ inlineExceptionStatic { throw Exception("Never get's here") }
println("Middle")
- inlineExceptionStatic {
- throw Exception("Never get's here")
- }
+ inlineExceptionStatic { throw Exception("Never get's here") }
println("After")
}
-
-
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionDoubleCheck.kt b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionDoubleCheck.kt
index 3351bcd..4cb0d92 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionDoubleCheck.kt
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionDoubleCheck.kt
@@ -24,5 +24,5 @@
}
fun main() {
- doubleCheckAssertionsEnabled();
-}
\ No newline at end of file
+ doubleCheckAssertionsEnabled()
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionsMock.kt b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionsMock.kt
index bd05154..bfab69a 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionsMock.kt
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerdoublecheck/AssertionsMock.kt
@@ -5,6 +5,5 @@
package com.android.tools.r8.rewrite.assertions.kotlinassertionhandlerdoublecheck
object AssertionsMock {
- @JvmField
- val ENABLED: Boolean = false
+ @JvmField val ENABLED: Boolean = false
}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionSimple.kt b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionSimple.kt
index 7f6066b..611da78 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionSimple.kt
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlersimple/AssertionSimple.kt
@@ -10,6 +10,6 @@
}
fun main() {
- simpleAssertion();
- multipleAssertions();
-}
\ No newline at end of file
+ simpleAssertion()
+ multipleAssertions()
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerwithexceptions/AssertionsWithExceptionHandlers.kt b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerwithexceptions/AssertionsWithExceptionHandlers.kt
index dd70bc1..cab3a51 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerwithexceptions/AssertionsWithExceptionHandlers.kt
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlinassertionhandlerwithexceptions/AssertionsWithExceptionHandlers.kt
@@ -1,26 +1,24 @@
package com.android.tools.r8.rewrite.assertions.kotlinassertionhandlerwithexceptions
-fun methodWithAssertionError(assertion : Throwable) : String {
- return assertion.getStackTrace()[0].getMethodName();
+fun methodWithAssertionError(assertion: Throwable): String {
+ return assertion.getStackTrace()[0].getMethodName()
}
fun assertionsWithCatch1() {
try {
assert(false) { "First assertion" }
- } catch (e : NoSuchMethodError) {
- } catch (e: NoSuchFieldError) {
- } catch (e : NoClassDefFoundError) {
- }
+ } catch (e: NoSuchMethodError) {} catch (e: NoSuchFieldError) {} catch (
+ e: NoClassDefFoundError) {}
}
fun assertionsWithCatch2() {
try {
assert(false) { "Second assertion" }
- } catch (e : AssertionError) {
+ } catch (e: AssertionError) {
println("Caught: " + e.message)
try {
assert(false) { "Third assertion" }
- } catch (e : AssertionError) {
+ } catch (e: AssertionError) {
println("Caught: " + e.message)
}
}
@@ -33,22 +31,22 @@
fun assertionsWithCatch3() {
try {
assert(false) { "Fourth assertion" }
- } catch (e1 : AssertionError) {
- println("Caught from: " + methodWithAssertionError(e1));
+ } catch (e1: AssertionError) {
+ println("Caught from: " + methodWithAssertionError(e1))
try {
- simpleAssertion();
- } catch (e2 : AssertionError) {
- println("Caught from: " + methodWithAssertionError(e2));
+ simpleAssertion()
+ } catch (e2: AssertionError) {
+ println("Caught from: " + methodWithAssertionError(e2))
}
}
}
fun main() {
try {
- assertionsWithCatch1();
- } catch (e : AssertionError) {
+ assertionsWithCatch1()
+ } catch (e: AssertionError) {
// Ignore.
}
- assertionsWithCatch2();
- assertionsWithCatch3();
+ assertionsWithCatch2()
+ assertionsWithCatch3()
}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class1.kt b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class1.kt
index 582c029..4614d7c 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class1.kt
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class1.kt
@@ -8,4 +8,4 @@
fun m() {
assert(hashCode() == 0)
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class2.kt b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class2.kt
index 2936e6e..cf69f67 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class2.kt
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/Class2.kt
@@ -8,4 +8,4 @@
fun m() {
assert(false)
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/TestClass.kt b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/TestClass.kt
index 990999c..23e75d4 100644
--- a/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/TestClass.kt
+++ b/src/test/java/com/android/tools/r8/rewrite/assertions/kotlintestclasses/TestClass.kt
@@ -16,4 +16,4 @@
println("AssertionError in Class2")
}
println("DONE")
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlinR8TestResources/accessors/Accessor.kt b/src/test/kotlinR8TestResources/accessors/Accessor.kt
index ffd0395..d99ad8a 100644
--- a/src/test/kotlinR8TestResources/accessors/Accessor.kt
+++ b/src/test/kotlinR8TestResources/accessors/Accessor.kt
@@ -5,23 +5,23 @@
package accessors
class Accessor {
- companion object {
- private val property = "foo"
+ companion object {
+ private val property = "foo"
- fun accessPropertyFromCompanionClass() {
- println(property)
- }
+ fun accessPropertyFromCompanionClass() {
+ println(property)
}
+ }
- fun accessPropertyFromOuterClass() {
- println(property)
- }
+ fun accessPropertyFromOuterClass() {
+ println(property)
+ }
}
fun accessor_accessPropertyFromCompanionClass() {
- Accessor.accessPropertyFromCompanionClass()
+ Accessor.accessPropertyFromCompanionClass()
}
fun accessor_accessPropertyFromOuterClass() {
- Accessor().accessPropertyFromOuterClass()
-}
\ No newline at end of file
+ Accessor().accessPropertyFromOuterClass()
+}
diff --git a/src/test/kotlinR8TestResources/accessors/CompanionProperties.kt b/src/test/kotlinR8TestResources/accessors/CompanionProperties.kt
index cd3cffc..0452146 100644
--- a/src/test/kotlinR8TestResources/accessors/CompanionProperties.kt
+++ b/src/test/kotlinR8TestResources/accessors/CompanionProperties.kt
@@ -5,26 +5,26 @@
package accessors
class CompanionProperties {
- companion object {
- private var privateProp: String = "privateProp"
- }
+ companion object {
+ private var privateProp: String = "privateProp"
+ }
- fun callSetterPrivateProp(v: String) {
- privateProp = v
- }
+ fun callSetterPrivateProp(v: String) {
+ privateProp = v
+ }
- fun callGetterPrivateProp(): String {
- return privateProp
- }
+ fun callGetterPrivateProp(): String {
+ return privateProp
+ }
}
fun companionProperties_noUseOfProperties() {
- CompanionProperties()
- println("DONE")
+ CompanionProperties()
+ println("DONE")
}
fun companionProperties_usePrivatePropFromOuter() {
- val obj = CompanionProperties()
- obj.callSetterPrivateProp("foo")
- println(obj.callGetterPrivateProp())
+ val obj = CompanionProperties()
+ obj.callSetterPrivateProp("foo")
+ println(obj.callGetterPrivateProp())
}
diff --git a/src/test/kotlinR8TestResources/accessors/PropertyAccessorForInnerClass.kt b/src/test/kotlinR8TestResources/accessors/PropertyAccessorForInnerClass.kt
index a2dd823..4bbaa76 100644
--- a/src/test/kotlinR8TestResources/accessors/PropertyAccessorForInnerClass.kt
+++ b/src/test/kotlinR8TestResources/accessors/PropertyAccessorForInnerClass.kt
@@ -5,40 +5,40 @@
package accessors
class PropertyAccessorForInnerClass {
- private var privateProp = "private"
+ private var privateProp = "private"
- private lateinit var privateLateInitProp: String
+ private lateinit var privateLateInitProp: String
- // Causes a class initializer to be added to the class.
- companion object {
- public var companionProperty = "static"
+ // Causes a class initializer to be added to the class.
+ companion object {
+ public var companionProperty = "static"
+ }
+
+ inner class Inner {
+ fun accessPrivateProperty() {
+ privateProp = "bar"
+ println(privateProp)
}
- inner class Inner {
- fun accessPrivateProperty() {
- privateProp = "bar"
- println(privateProp)
- }
-
- fun accessPrivateLateInitPropertyStatus() {
- println(::privateLateInitProp.isInitialized)
- }
+ fun accessPrivateLateInitPropertyStatus() {
+ println(::privateLateInitProp.isInitialized)
}
+ }
}
fun noUseOfPropertyAccessorFromInnerClass() {
- // Create instance of class to keep them after tree shaking.
- PropertyAccessorForInnerClass().Inner()
+ // Create instance of class to keep them after tree shaking.
+ PropertyAccessorForInnerClass().Inner()
}
fun usePrivatePropertyAccessorFromInnerClass() {
- // Creates a non-trivial class initializer
- println(PropertyAccessorForInnerClass.companionProperty)
- PropertyAccessorForInnerClass().Inner().accessPrivateProperty()
+ // Creates a non-trivial class initializer
+ println(PropertyAccessorForInnerClass.companionProperty)
+ PropertyAccessorForInnerClass().Inner().accessPrivateProperty()
}
fun usePrivateLateInitPropertyAccessorFromInnerClass() {
- // Creates a non-trivial class initializer
- println(PropertyAccessorForInnerClass.companionProperty)
- PropertyAccessorForInnerClass().Inner().accessPrivateLateInitPropertyStatus()
-}
\ No newline at end of file
+ // Creates a non-trivial class initializer
+ println(PropertyAccessorForInnerClass.companionProperty)
+ PropertyAccessorForInnerClass().Inner().accessPrivateLateInitPropertyStatus()
+}
diff --git a/src/test/kotlinR8TestResources/accessors/PropertyAccessorForLambda.kt b/src/test/kotlinR8TestResources/accessors/PropertyAccessorForLambda.kt
index 28bed0a..9e6eb6d 100644
--- a/src/test/kotlinR8TestResources/accessors/PropertyAccessorForLambda.kt
+++ b/src/test/kotlinR8TestResources/accessors/PropertyAccessorForLambda.kt
@@ -5,29 +5,29 @@
package accessors
class PropertyAccessorForLambda {
- private var property: String = "foo"
- get() = { field }()
- set(v) = { field = v }()
+ private var property: String = "foo"
+ get() = { field }()
+ set(v) = { field = v }()
- // Causes a class initializer to be added to the class.
- companion object {
- public var companionProperty = "static"
- }
+ // Causes a class initializer to be added to the class.
+ companion object {
+ public var companionProperty = "static"
+ }
- fun accessPropertyOfOuterClass() {
- // Access to the property requires to go through an accessor method, respectively
- // named "access$getProperty$lp" for getter and "access$setProperty$lp" for setter).
- property = "bar"
- println(property)
- }
+ fun accessPropertyOfOuterClass() {
+ // Access to the property requires to go through an accessor method, respectively
+ // named "access$getProperty$lp" for getter and "access$setProperty$lp" for setter).
+ property = "bar"
+ println(property)
+ }
}
fun noUseOfPropertyAccessorFromLambda() {
- // Create instance of class to keep them after tree shaking.
- PropertyAccessorForLambda()
+ // Create instance of class to keep them after tree shaking.
+ PropertyAccessorForLambda()
}
fun usePropertyAccessorFromLambda() {
- PropertyAccessorForLambda.companionProperty = "fake"
- PropertyAccessorForLambda().accessPropertyOfOuterClass()
-}
\ No newline at end of file
+ PropertyAccessorForLambda.companionProperty = "fake"
+ PropertyAccessorForLambda().accessPropertyOfOuterClass()
+}
diff --git a/src/test/kotlinR8TestResources/class_inliner_data_class/main.kt b/src/test/kotlinR8TestResources/class_inliner_data_class/main.kt
index f4e2c7a..4f69910 100644
--- a/src/test/kotlinR8TestResources/class_inliner_data_class/main.kt
+++ b/src/test/kotlinR8TestResources/class_inliner_data_class/main.kt
@@ -5,19 +5,19 @@
package class_inliner_data_class
fun main(args: Array<String>) {
- val alpha = Alpha("", "m", "")
- alpha.right = "l"
- alpha.left = "r"
- alpha.rotate()
- // For Kotlin 1.5 we need to have the toString call outside the concat.
- val alphaString = alpha.toString()
- println("result: ${alphaString} is good")
+ val alpha = Alpha("", "m", "")
+ alpha.right = "l"
+ alpha.left = "r"
+ alpha.rotate()
+ // For Kotlin 1.5 we need to have the toString call outside the concat.
+ val alphaString = alpha.toString()
+ println("result: ${alphaString} is good")
}
data class Alpha(var left: String, val middle: String, var right: String) {
- fun rotate() {
- val t = left
- left = right
- right = t
- }
+ fun rotate() {
+ val t = left
+ left = right
+ right = t
+ }
}
diff --git a/src/test/kotlinR8TestResources/class_inliner_lambda_j_style/main.kt b/src/test/kotlinR8TestResources/class_inliner_lambda_j_style/main.kt
index f95125c..5848fa7 100644
--- a/src/test/kotlinR8TestResources/class_inliner_lambda_j_style/main.kt
+++ b/src/test/kotlinR8TestResources/class_inliner_lambda_j_style/main.kt
@@ -7,89 +7,90 @@
private var COUNT = 0
fun nextInt() = COUNT++
+
fun next() = "${nextInt()}".padStart(3, '0')
fun main(args: Array<String>) {
- testStateless()
- testStateful()
- testStateful2()
- testStateful3()
+ testStateless()
+ testStateful()
+ testStateful2()
+ testStateful3()
}
fun testStateless() {
- SamIface.Consumer.consume { "123" }
- SamIface.Consumer.consume { "ABC" }
- SamIface.Consumer.consume {
- var x = 0
- println("A: ${x++}")
- println("B: ${x++}")
- println("C: ${x++}")
- println("D: ${x++}")
- println("E: ${x++}")
- "outer + $x"
- }
+ SamIface.Consumer.consume { "123" }
+ SamIface.Consumer.consume { "ABC" }
+ SamIface.Consumer.consume {
+ var x = 0
+ println("A: ${x++}")
+ println("B: ${x++}")
+ println("C: ${x++}")
+ println("D: ${x++}")
+ println("E: ${x++}")
+ "outer + $x"
+ }
}
fun testStateful() {
- var someVariable = 0
+ var someVariable = 0
+ SamIface.Consumer.consume {
+ println("A: someVariable = $someVariable")
+ someVariable += 1
+ "B: someVariable = $someVariable"
+ }
+ SamIface.Consumer.consume {
SamIface.Consumer.consume {
- println("A: someVariable = $someVariable")
- someVariable += 1
- "B: someVariable = $someVariable"
+ println("E: someVariable = $someVariable")
+ someVariable += 1
+ "F: someVariable = $someVariable"
}
- SamIface.Consumer.consume {
- SamIface.Consumer.consume {
- println("E: someVariable = $someVariable")
- someVariable += 1
- "F: someVariable = $someVariable"
- }
- for (i in 1..20) {
- someVariable += 1
- if (i % 4 == 0) {
- println("G: someVariable = $someVariable")
- }
- }
- someVariable += 1
- "H: someVariable = $someVariable"
+ for (i in 1..20) {
+ someVariable += 1
+ if (i % 4 == 0) {
+ println("G: someVariable = $someVariable")
+ }
}
- SamIface.Consumer.consumeBig {
- println("I: someVariable = $someVariable")
- someVariable += 1
- "J: someVariable = $someVariable"
- }
+ someVariable += 1
+ "H: someVariable = $someVariable"
+ }
+ SamIface.Consumer.consumeBig {
+ println("I: someVariable = $someVariable")
+ someVariable += 1
+ "J: someVariable = $someVariable"
+ }
}
fun testStateful2() {
- var someVariable = 0
- SamIface.Consumer.consumeBig {
- println("[Z] A: someVariable = $someVariable")
- someVariable += 1
- println("[Z] B: someVariable = $someVariable")
- someVariable += 1
- println("[Z] C: someVariable = $someVariable")
- someVariable += 1
- println("[Z] D: someVariable = $someVariable")
- someVariable += 1
- println("[Z] E: someVariable = $someVariable")
- someVariable += 1
- "[Z] F: someVariable = $someVariable"
- }
+ var someVariable = 0
+ SamIface.Consumer.consumeBig {
+ println("[Z] A: someVariable = $someVariable")
+ someVariable += 1
+ println("[Z] B: someVariable = $someVariable")
+ someVariable += 1
+ println("[Z] C: someVariable = $someVariable")
+ someVariable += 1
+ println("[Z] D: someVariable = $someVariable")
+ someVariable += 1
+ println("[Z] E: someVariable = $someVariable")
+ someVariable += 1
+ "[Z] F: someVariable = $someVariable"
+ }
}
fun testStateful3() {
- var someVariable = 0
- SamIface.Consumer.consumeBig {
- println("[W] A: someVariable = $someVariable")
- someVariable += 1
- println("[W] B: someVariable = $someVariable")
- someVariable += 1
- println("[W] C: someVariable = $someVariable")
- someVariable += 1
- println("[W] D: someVariable = $someVariable")
- someVariable += 1
- println("[W] E: someVariable = $someVariable")
- someVariable += 1
- "[W] F: someVariable = $someVariable"
- }
+ var someVariable = 0
+ SamIface.Consumer.consumeBig {
+ println("[W] A: someVariable = $someVariable")
+ someVariable += 1
+ println("[W] B: someVariable = $someVariable")
+ someVariable += 1
+ println("[W] C: someVariable = $someVariable")
+ someVariable += 1
+ println("[W] D: someVariable = $someVariable")
+ someVariable += 1
+ println("[W] E: someVariable = $someVariable")
+ someVariable += 1
+ "[W] F: someVariable = $someVariable"
+ }
}
diff --git a/src/test/kotlinR8TestResources/class_inliner_lambda_k_style/main.kt b/src/test/kotlinR8TestResources/class_inliner_lambda_k_style/main.kt
index ea315ba..c0729b1 100644
--- a/src/test/kotlinR8TestResources/class_inliner_lambda_k_style/main.kt
+++ b/src/test/kotlinR8TestResources/class_inliner_lambda_k_style/main.kt
@@ -9,84 +9,85 @@
fun next() = "${COUNT++}".padStart(3, '0')
fun main(args: Array<String>) {
- testKotlinSequencesStateless(produceSequence(10))
- testKotlinSequencesStateful(5, 2, produceSequence(10))
- testBigExtraMethod()
- testBigExtraMethodReturningLambda()
+ testKotlinSequencesStateless(produceSequence(10))
+ testKotlinSequencesStateful(5, 2, produceSequence(10))
+ testBigExtraMethod()
+ testBigExtraMethodReturningLambda()
}
data class Record(val foo: String, val good: Boolean)
fun testKotlinSequencesStateless(strings: Sequence<String>) {
- useRecord()
- // Stateless k-style lambda
- strings.map { Record(it, false) }.forEach { println(it) }
+ useRecord()
+ // Stateless k-style lambda
+ strings.map { Record(it, false) }.forEach { println(it) }
}
fun testKotlinSequencesStateful(a: Int, b: Int, strings: Sequence<String>) {
- useRecord()
- // Big stateful k-style lambda
- val capture = next()
- strings.map {
- val x = it.toInt()
- val y = a + x
- val z = capture.toInt() + b
- println("logging $x/$y/$z") // Intentional
- Record(it, y % z == 0)
- }.forEach {
- println(it)
+ useRecord()
+ // Big stateful k-style lambda
+ val capture = next()
+ strings
+ .map {
+ val x = it.toInt()
+ val y = a + x
+ val z = capture.toInt() + b
+ println("logging $x/$y/$z") // Intentional
+ Record(it, y % z == 0)
}
+ .forEach { println(it) }
}
fun testBigExtraMethod() {
- useRecord()
- bigUserWithNotNullChecksAndTwoCalls(next()) { next() }
- testBigExtraMethod2()
- testBigExtraMethod3()
+ useRecord()
+ bigUserWithNotNullChecksAndTwoCalls(next()) { next() }
+ testBigExtraMethod2()
+ testBigExtraMethod3()
}
fun testBigExtraMethod2() {
- bigUserWithNotNullChecksAndTwoCalls(next()) { next() }
+ bigUserWithNotNullChecksAndTwoCalls(next()) { next() }
}
fun testBigExtraMethod3() {
- bigUserWithNotNullChecksAndTwoCalls(next()) { next() }
+ bigUserWithNotNullChecksAndTwoCalls(next()) { next() }
}
fun bigUserWithNotNullChecksAndTwoCalls(id: String, lambda: () -> String): String {
- useRecord()
- println("[A] logging call#$id returning ${lambda()}")
- return "$id: ${lambda()}"
+ useRecord()
+ println("[A] logging call#$id returning ${lambda()}")
+ return "$id: ${lambda()}"
}
fun testBigExtraMethodReturningLambda() {
- useRecord()
- bigUserReturningLambda(next()) { next() } // Not used
- testBigExtraMethodReturningLambda2()
- testBigExtraMethodReturningLambda3()
+ useRecord()
+ bigUserReturningLambda(next()) { next() } // Not used
+ testBigExtraMethodReturningLambda2()
+ testBigExtraMethodReturningLambda3()
}
fun testBigExtraMethodReturningLambda2() {
- bigUserReturningLambda(next()) { next() } // Not used
+ bigUserReturningLambda(next()) { next() } // Not used
}
fun testBigExtraMethodReturningLambda3() {
- bigUserReturningLambda(next()) { next() } // Not used
+ bigUserReturningLambda(next()) { next() } // Not used
}
fun bigUserReturningLambda(id: String, lambda: () -> String): () -> String {
- useRecord()
- println("[B] logging call#$id returning ${lambda()}")
- println("[C] logging call#$id returning ${lambda()}")
- return lambda
+ useRecord()
+ println("[B] logging call#$id returning ${lambda()}")
+ println("[C] logging call#$id returning ${lambda()}")
+ return lambda
}
fun produceSequence(size: Int): Sequence<String> {
- var count = size
- return generateSequence { if (count-- > 0) next() else null }
+ var count = size
+ return generateSequence { if (count-- > 0) next() else null }
}
// Need this to make sure testKotlinSequenceXXX is not processed
// concurrently with invoke() on lambdas.
@Synchronized fun useRecord() = useRecord2()
+
@Synchronized fun useRecord2() = Record("", true)
diff --git a/src/test/kotlinR8TestResources/class_staticizer/main.kt b/src/test/kotlinR8TestResources/class_staticizer/main.kt
index 01915c4..2cc1b53 100644
--- a/src/test/kotlinR8TestResources/class_staticizer/main.kt
+++ b/src/test/kotlinR8TestResources/class_staticizer/main.kt
@@ -9,35 +9,38 @@
fun next() = "${COUNT++}".padStart(3, '0')
fun main(args: Array<String>) {
- println(Regular.foo)
- println(Regular.bar)
- println(Regular.blah(next()))
- println(Derived.foo)
- println(Derived.bar)
- println(Derived.blah(next()))
- println(Util.foo)
- println(Util.bar)
- println(Util.blah(next()))
+ println(Regular.foo)
+ println(Regular.bar)
+ println(Regular.blah(next()))
+ println(Derived.foo)
+ println(Derived.bar)
+ println(Derived.blah(next()))
+ println(Util.foo)
+ println(Util.bar)
+ println(Util.blah(next()))
}
open class Regular {
- companion object {
- var foo: String = "Regular::CC::foo[${next()}]"
- var bar: String = blah(next())
- fun blah(p: String) = "Regular::CC::blah($p)[${next()}]"
- }
+ companion object {
+ var foo: String = "Regular::CC::foo[${next()}]"
+ var bar: String = blah(next())
+
+ fun blah(p: String) = "Regular::CC::blah($p)[${next()}]"
+ }
}
open class Derived : Regular() {
- companion object {
- var foo: String = "Derived::CC::foo[${next()}]"
- var bar: String = blah(next())
- fun blah(p: String) = "Derived::CC::blah($p)[${next()}]"
- }
+ companion object {
+ var foo: String = "Derived::CC::foo[${next()}]"
+ var bar: String = blah(next())
+
+ fun blah(p: String) = "Derived::CC::blah($p)[${next()}]"
+ }
}
object Util {
- var foo: String = "Util::foo[${next()}]"
- var bar: String = Regular.blah(next()) + Derived.blah(next())
- fun blah(p: String) = "Util::blah($p)[${next()}]"
+ var foo: String = "Util::foo[${next()}]"
+ var bar: String = Regular.blah(next()) + Derived.blah(next())
+
+ fun blah(p: String) = "Util::blah($p)[${next()}]"
}
diff --git a/src/test/kotlinR8TestResources/dataclass/MainComponentOnly.kt b/src/test/kotlinR8TestResources/dataclass/MainComponentOnly.kt
index 33036fa..d178da1 100644
--- a/src/test/kotlinR8TestResources/dataclass/MainComponentOnly.kt
+++ b/src/test/kotlinR8TestResources/dataclass/MainComponentOnly.kt
@@ -11,11 +11,11 @@
* See https://kotlinlang.org/docs/reference/multi-declarations.html.
*/
fun main(args: Array<String>) {
- testAllDataClassComponentFunctions()
+ testAllDataClassComponentFunctions()
}
fun testAllDataClassComponentFunctions() {
- val (name, age) = Person("Albert", 28)
- println("Name: $name")
- println("Age: $age")
-}
\ No newline at end of file
+ val (name, age) = Person("Albert", 28)
+ println("Name: $name")
+ println("Age: $age")
+}
diff --git a/src/test/kotlinR8TestResources/dataclass/MainComponentPartial.kt b/src/test/kotlinR8TestResources/dataclass/MainComponentPartial.kt
index c7090b8..91e9b9e 100644
--- a/src/test/kotlinR8TestResources/dataclass/MainComponentPartial.kt
+++ b/src/test/kotlinR8TestResources/dataclass/MainComponentPartial.kt
@@ -11,11 +11,11 @@
* See https://kotlinlang.org/docs/reference/multi-declarations.html.
*/
fun main(args: Array<String>) {
- testSomeDataClassComponentFunctions()
+ testSomeDataClassComponentFunctions()
}
fun testSomeDataClassComponentFunctions() {
- // We only access to age (tied to component2 method)
- val (_, age) = Person("Albert", 28)
- println("Age: $age")
-}
\ No newline at end of file
+ // We only access to age (tied to component2 method)
+ val (_, age) = Person("Albert", 28)
+ println("Age: $age")
+}
diff --git a/src/test/kotlinR8TestResources/dataclass/MainCopy.kt b/src/test/kotlinR8TestResources/dataclass/MainCopy.kt
index 2644302..b5c976b1 100644
--- a/src/test/kotlinR8TestResources/dataclass/MainCopy.kt
+++ b/src/test/kotlinR8TestResources/dataclass/MainCopy.kt
@@ -11,13 +11,13 @@
* See https://kotlinlang.org/docs/reference/data-classes.html#copying.
*/
fun main(args: Array<String>) {
- testDataClassCopy()
+ testDataClassCopy()
}
fun testDataClassCopy() {
- val albert = Person("Albert", 28)
- val youngerJonas = albert.copy("Jonas", albert.age - 10)
- val olderJonas = youngerJonas.copy("Jonas", albert.age + 20)
- println("Name: ${olderJonas.name}")
- println("Age: ${olderJonas.age}")
-}
\ No newline at end of file
+ val albert = Person("Albert", 28)
+ val youngerJonas = albert.copy("Jonas", albert.age - 10)
+ val olderJonas = youngerJonas.copy("Jonas", albert.age + 20)
+ println("Name: ${olderJonas.name}")
+ println("Age: ${olderJonas.age}")
+}
diff --git a/src/test/kotlinR8TestResources/dataclass/MainGettersOnly.kt b/src/test/kotlinR8TestResources/dataclass/MainGettersOnly.kt
index a946385..bc5fbac 100644
--- a/src/test/kotlinR8TestResources/dataclass/MainGettersOnly.kt
+++ b/src/test/kotlinR8TestResources/dataclass/MainGettersOnly.kt
@@ -5,18 +5,18 @@
package dataclass
/**
- * This is an example of accessing properties of a data class instance by only using its
- * synthesized getter methods. Therefore, the other synthesized methods (like componentN or copy)
- * can be removed after shrinking.
+ * This is an example of accessing properties of a data class instance by only using its synthesized
+ * getter methods. Therefore, the other synthesized methods (like componentN or copy) can be removed
+ * after shrinking.
*
* See https://kotlinlang.org/docs/reference/properties.html.
*/
fun main(args: Array<String>) {
- testDataClassGetters();
+ testDataClassGetters()
}
fun testDataClassGetters() {
- val person = Person("Albert", 28)
- println("Name: ${person.name}")
- println("Age: ${person.age}")
-}
\ No newline at end of file
+ val person = Person("Albert", 28)
+ println("Name: ${person.name}")
+ println("Age: ${person.age}")
+}
diff --git a/src/test/kotlinR8TestResources/dataclass/Person.kt b/src/test/kotlinR8TestResources/dataclass/Person.kt
index 9a8eaa5..157e37c 100644
--- a/src/test/kotlinR8TestResources/dataclass/Person.kt
+++ b/src/test/kotlinR8TestResources/dataclass/Person.kt
@@ -4,5 +4,4 @@
package dataclass
-data class Person(val name: String, val age: Int) {
-}
\ No newline at end of file
+data class Person(val name: String, val age: Int) {}
diff --git a/src/test/kotlinR8TestResources/debug/KotlinApp.kt b/src/test/kotlinR8TestResources/debug/KotlinApp.kt
index 094407b..f347218 100644
--- a/src/test/kotlinR8TestResources/debug/KotlinApp.kt
+++ b/src/test/kotlinR8TestResources/debug/KotlinApp.kt
@@ -4,26 +4,27 @@
class KotlinApp {
- fun ifElse(cond: Boolean) {
- val a = 10
- if (cond) {
- val b = a * 2
- printInt(b)
- } else {
- val c = a / 2
- print(c)
- }
+ fun ifElse(cond: Boolean) {
+ val a = 10
+ if (cond) {
+ val b = a * 2
+ printInt(b)
+ } else {
+ val c = a / 2
+ print(c)
}
+ }
- fun printInt(i: Int) {
- println(i)
- }
+ fun printInt(i: Int) {
+ println(i)
+ }
- companion object {
- @JvmStatic fun main(args: Array<String>) {
- val instance = KotlinApp()
- instance.ifElse(true)
- instance.ifElse(false)
- }
+ companion object {
+ @JvmStatic
+ fun main(args: Array<String>) {
+ val instance = KotlinApp()
+ instance.ifElse(true)
+ instance.ifElse(false)
}
-}
\ No newline at end of file
+ }
+}
diff --git a/src/test/kotlinR8TestResources/debug/KotlinInline.kt b/src/test/kotlinR8TestResources/debug/KotlinInline.kt
index 4b55c57..479efe2 100644
--- a/src/test/kotlinR8TestResources/debug/KotlinInline.kt
+++ b/src/test/kotlinR8TestResources/debug/KotlinInline.kt
@@ -4,81 +4,80 @@
class KotlinInline {
- fun processObject(obj: Any, func: (Any) -> Unit) {
- func(obj)
- }
+ fun processObject(obj: Any, func: (Any) -> Unit) {
+ func(obj)
+ }
- fun printObject(obj: Any) {
- println(obj)
- }
+ fun printObject(obj: Any) {
+ println(obj)
+ }
- fun invokeInlinedFunctions() {
- inlinedA {
- val inA = 1
- inlinedB {
- val inB = 2
- foo(inA, inB)
- }
- }
+ fun invokeInlinedFunctions() {
+ inlinedA {
+ val inA = 1
+ inlinedB {
+ val inB = 2
+ foo(inA, inB)
+ }
}
+ }
- inline fun inlinedA(f: () -> Unit) {
- f()
- }
+ inline fun inlinedA(f: () -> Unit) {
+ f()
+ }
- inline fun inlinedB(f: () -> Unit) {
- f()
- }
+ inline fun inlinedB(f: () -> Unit) {
+ f()
+ }
- fun foo(a: Int, b: Int) {
- println("a=$a, b=$b")
- }
+ fun foo(a: Int, b: Int) {
+ println("a=$a, b=$b")
+ }
- fun emptyMethod(unused: Int) {
- }
+ fun emptyMethod(unused: Int) {}
- fun singleInline() {
- emptyMethod(0)
- inlined()
- emptyMethod(1)
- }
+ fun singleInline() {
+ emptyMethod(0)
+ inlined()
+ emptyMethod(1)
+ }
- inline fun inlined() {
- emptyMethod(-1)
- }
+ inline fun inlined() {
+ emptyMethod(-1)
+ }
- // Double inlining
- fun testNestedInlining() {
- val l1 = Int.MAX_VALUE
- val l2 = Int.MIN_VALUE
- inlinee1(l1, l2)
- }
- inline fun inlinee1(a: Int, b: Int) {
- val c = a - 2
- inlinee2(1) {
- val left = a + b
- val right = a - b
- foo(left, right)
- }
- inlinee2(c) {
- foo(b, a)
- }
- }
+ // Double inlining
+ fun testNestedInlining() {
+ val l1 = Int.MAX_VALUE
+ val l2 = Int.MIN_VALUE
+ inlinee1(l1, l2)
+ }
- inline fun inlinee2(p: Int, block: () -> Unit) {
- if (p > 0) {
- block()
- }
+ inline fun inlinee1(a: Int, b: Int) {
+ val c = a - 2
+ inlinee2(1) {
+ val left = a + b
+ val right = a - b
+ foo(left, right)
}
+ inlinee2(c) { foo(b, a) }
+ }
- companion object {
- @JvmStatic fun main(args: Array<String>) {
- println("Hello world!")
- val instance = KotlinInline()
- instance.processObject(instance, instance::printObject)
- instance.invokeInlinedFunctions()
- instance.singleInline()
- instance.testNestedInlining()
- }
+ inline fun inlinee2(p: Int, block: () -> Unit) {
+ if (p > 0) {
+ block()
}
-}
\ No newline at end of file
+ }
+
+ companion object {
+ @JvmStatic
+ fun main(args: Array<String>) {
+ println("Hello world!")
+ val instance = KotlinInline()
+ instance.processObject(instance, instance::printObject)
+ instance.invokeInlinedFunctions()
+ instance.singleInline()
+ instance.testNestedInlining()
+ }
+ }
+}
diff --git a/src/test/kotlinR8TestResources/enumswitch/EnumSwitch.kt b/src/test/kotlinR8TestResources/enumswitch/EnumSwitch.kt
index 4d5dcaf..12f5b3d 100644
--- a/src/test/kotlinR8TestResources/enumswitch/EnumSwitch.kt
+++ b/src/test/kotlinR8TestResources/enumswitch/EnumSwitch.kt
@@ -7,23 +7,25 @@
North,
South,
East,
- West
+ West,
}
-fun direction1(direction: KDirection) = when (direction) {
- KDirection.North -> "N"
- KDirection.South -> "S"
- KDirection.East -> "E"
- KDirection.West -> "W"
-}
+fun direction1(direction: KDirection) =
+ when (direction) {
+ KDirection.North -> "N"
+ KDirection.South -> "S"
+ KDirection.East -> "E"
+ KDirection.West -> "W"
+ }
// Different declaration order than direction1 or direction2
-fun direction2(direction: KDirection) = when (direction) {
- KDirection.East -> "E"
- KDirection.North -> "N"
- KDirection.West -> "W"
- KDirection.South -> "S"
-}
+fun direction2(direction: KDirection) =
+ when (direction) {
+ KDirection.East -> "E"
+ KDirection.North -> "N"
+ KDirection.West -> "W"
+ KDirection.South -> "S"
+ }
fun main(args: Array<String>) {
println(direction1(KDirection.North))
diff --git a/src/test/kotlinR8TestResources/internal_annotation/Annotation.kt b/src/test/kotlinR8TestResources/internal_annotation/Annotation.kt
index 40bc6b0..5847632 100644
--- a/src/test/kotlinR8TestResources/internal_annotation/Annotation.kt
+++ b/src/test/kotlinR8TestResources/internal_annotation/Annotation.kt
@@ -5,14 +5,10 @@
@Target(AnnotationTarget.CLASS)
internal annotation class Annotation(
- @get:JvmName("f1")
- val field1: Int = 0,
- @get:JvmName("f2")
- val field2: String = "",
- @get:JvmName("f3")
- val field3: IntArray = [],
- @get:JvmName("f4")
- val field4: Array<String> = []
+ @get:JvmName("f1") val field1: Int = 0,
+ @get:JvmName("f2") val field2: String = "",
+ @get:JvmName("f3") val field3: IntArray = [],
+ @get:JvmName("f4") val field4: Array<String> = [],
)
@JvmName("foo")
@@ -34,5 +30,4 @@
return res.toTypedArray()
}
-private fun Base.getMyAnnotation(): Annotation? =
- javaClass.getAnnotation(Annotation::class.java)
+private fun Base.getMyAnnotation(): Annotation? = javaClass.getAnnotation(Annotation::class.java)
diff --git a/src/test/kotlinR8TestResources/internal_annotation/Base.kt b/src/test/kotlinR8TestResources/internal_annotation/Base.kt
index cedf902..61d89f8 100644
--- a/src/test/kotlinR8TestResources/internal_annotation/Base.kt
+++ b/src/test/kotlinR8TestResources/internal_annotation/Base.kt
@@ -7,8 +7,7 @@
internal abstract class Base {
protected abstract fun foo(): Any?
- public override fun toString(): String =
- "${foo() ?: this::class.java.name}"
+ public override fun toString(): String = "${foo() ?: this::class.java.name}"
}
// If we don't adjust annotation values, lack of f(3|4) will trigger errors on legacy VMs.
@@ -21,9 +20,5 @@
}
}
- public override fun toString(): String =
- if (flag)
- super.toString()
- else
- "Impl::toString"
-}
\ No newline at end of file
+ public override fun toString(): String = if (flag) super.toString() else "Impl::toString"
+}
diff --git a/src/test/kotlinR8TestResources/intrinsics/Intrinsics.kt b/src/test/kotlinR8TestResources/intrinsics/Intrinsics.kt
index 90d26bf..0c4a09c 100644
--- a/src/test/kotlinR8TestResources/intrinsics/Intrinsics.kt
+++ b/src/test/kotlinR8TestResources/intrinsics/Intrinsics.kt
@@ -7,26 +7,25 @@
import java.lang.reflect.InvocationTargetException
fun main(args: Array<String>) {
- testParameterNullCheck()
+ testParameterNullCheck()
}
fun expectsNonNullParameters(a: String, b: String): String = a + b
fun testParameterNullCheck() {
- println("> ${expectsNonNullParameters("pre", "post")} <")
+ println("> ${expectsNonNullParameters("pre", "post")} <")
- val intrinsics = Class.forName("intrinsics.IntrinsicsKt")
- val method = intrinsics.getMethod(
- "expectsNonNullParameters", String::class.java, String::class.java)
+ val intrinsics = Class.forName("intrinsics.IntrinsicsKt")
+ val method =
+ intrinsics.getMethod("expectsNonNullParameters", String::class.java, String::class.java)
- println("> ${method.invoke(null, "pre", "post")} <")
+ println("> ${method.invoke(null, "pre", "post")} <")
- try {
- println("> ${method.invoke(null, "pre", null)} <")
- } catch (e: InvocationTargetException) {
- println("> exception: ${e.targetException::javaClass} <")
- return
- }
- throw AssertionError()
+ try {
+ println("> ${method.invoke(null, "pre", null)} <")
+ } catch (e: InvocationTargetException) {
+ println("> exception: ${e.targetException::javaClass} <")
+ return
+ }
+ throw AssertionError()
}
-
diff --git a/src/test/kotlinR8TestResources/intrinsics/inlineChainParameterCheck.kt b/src/test/kotlinR8TestResources/intrinsics/inlineChainParameterCheck.kt
index e77fab7..30ac99b 100644
--- a/src/test/kotlinR8TestResources/intrinsics/inlineChainParameterCheck.kt
+++ b/src/test/kotlinR8TestResources/intrinsics/inlineChainParameterCheck.kt
@@ -7,11 +7,11 @@
println("field is " + field)
}
-fun bar(field : String) {
+fun bar(field: String) {
println(field)
foo(field)
}
-fun main(args : Array<String>) {
+fun main(args: Array<String>) {
bar((if (args.size > 0) args.get(0) else null) as String)
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlinR8TestResources/intrinsics_identifiers/example1.kt b/src/test/kotlinR8TestResources/intrinsics_identifiers/example1.kt
index 4409232..8d3348a 100644
--- a/src/test/kotlinR8TestResources/intrinsics_identifiers/example1.kt
+++ b/src/test/kotlinR8TestResources/intrinsics_identifiers/example1.kt
@@ -14,4 +14,3 @@
println(instance.toBeRenamedMethod("arg4"))
}
}
-
diff --git a/src/test/kotlinR8TestResources/intrinsics_identifiers/example2.kt b/src/test/kotlinR8TestResources/intrinsics_identifiers/example2.kt
index c6c5e09..de351a2 100644
--- a/src/test/kotlinR8TestResources/intrinsics_identifiers/example2.kt
+++ b/src/test/kotlinR8TestResources/intrinsics_identifiers/example2.kt
@@ -4,11 +4,13 @@
package intrinsics_identifiers
class AnotherClass {
- var anotherField : String = "PREFIX"
- fun anotherMethod(arg: String) : String {
+ var anotherField: String = "PREFIX"
+
+ fun anotherMethod(arg: String): String {
return anotherField + arg
}
- fun updateField(arg: String) : Unit {
+
+ fun updateField(arg: String): Unit {
anotherField = arg
}
}
@@ -24,4 +26,3 @@
println(instance.anotherMethod("arg4"))
}
}
-
diff --git a/src/test/kotlinR8TestResources/intrinsics_identifiers/example3.kt b/src/test/kotlinR8TestResources/intrinsics_identifiers/example3.kt
index 47b1d00..e9a122f 100644
--- a/src/test/kotlinR8TestResources/intrinsics_identifiers/example3.kt
+++ b/src/test/kotlinR8TestResources/intrinsics_identifiers/example3.kt
@@ -8,7 +8,7 @@
fun main(args: Array<String>) {
// By specifying non-null type of variables for library uses,
// kotlin.jvm.internal.Intrinsics#check*Null(...) is added by kotlinc.
- val uri : URI = URI.create("google.com")
- val host : String = uri.host
+ val uri: URI = URI.create("google.com")
+ val host: String = uri.host
println(host)
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer1.kt b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer1.kt
index fb88996..ca0fe7b 100644
--- a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer1.kt
+++ b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer1.kt
@@ -4,16 +4,17 @@
package lambdas_jstyle_runnable
-private val liveChecker = object : Runnable {
- override fun run() {
- if (!Thread.currentThread().isInterrupted) {
- publish("liveChecker")
+private val liveChecker =
+ object : Runnable {
+ override fun run() {
+ if (!Thread.currentThread().isInterrupted) {
+ publish("liveChecker")
+ }
}
}
-}
class Implementer1 {
- fun getRunnable() : Runnable {
+ fun getRunnable(): Runnable {
return liveChecker
}
}
diff --git a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer2.kt b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer2.kt
index 034caca..fdb5282 100644
--- a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer2.kt
+++ b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/Implementer2.kt
@@ -11,7 +11,7 @@
}
class Implementer2 {
- fun getRunnable() : Runnable {
+ fun getRunnable(): Runnable {
return statusRunnable
}
}
diff --git a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer3.kt b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer3.kt
index b65cff6..a67ba14 100644
--- a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer3.kt
+++ b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer3.kt
@@ -12,11 +12,11 @@
}
}
-open class Implementer3(private val priority : Int) : Runnable {
+open class Implementer3(private val priority: Int) : Runnable {
override fun run() {
Thread.currentThread().priority = priority
innerRunnable.run()
}
}
-class Delegator3(priority: Int) : Implementer3(priority)
\ No newline at end of file
+class Delegator3(priority: Int) : Implementer3(priority)
diff --git a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer4.kt b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer4.kt
index 6e59424..3a9dced 100644
--- a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer4.kt
+++ b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/inner/Implementer4.kt
@@ -6,7 +6,7 @@
import lambdas_jstyle_runnable.publish
-private val reachableChecker : Runnable by lazy {
+private val reachableChecker: Runnable by lazy {
Runnable {
if (!Thread.currentThread().isInterrupted) {
publish("reachableChecker")
@@ -15,7 +15,7 @@
}
class Implementer4 {
- fun getRunnable() : Runnable {
+ fun getRunnable(): Runnable {
return reachableChecker
}
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/main.kt b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/main.kt
index ef5d5cf..ffd7687 100644
--- a/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/main.kt
+++ b/src/test/kotlinR8TestResources/lambdas_jstyle_runnable/main.kt
@@ -4,12 +4,12 @@
package lambdas_jstyle_runnable
-import lambdas_jstyle_runnable.inner.Delegator3
-import lambdas_jstyle_runnable.inner.Implementer4
import java.util.ArrayDeque
import java.util.Queue
+import lambdas_jstyle_runnable.inner.Delegator3
+import lambdas_jstyle_runnable.inner.Implementer4
-private val queue : Queue<String> = ArrayDeque<String>()
+private val queue: Queue<String> = ArrayDeque<String>()
fun publish(message: String) {
queue.add(message)
diff --git a/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/inner/inner.kt b/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/inner/inner.kt
index b0afcc3..80dc801 100644
--- a/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/inner/inner.kt
+++ b/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/inner/inner.kt
@@ -9,18 +9,21 @@
import lambdas_jstyle_trivial.nextInt
fun testInner() {
- testInner1(nextInt(), nextInt(), nextInt(), nextInt())
+ testInner1(nextInt(), nextInt(), nextInt(), nextInt())
}
private data class InnerLocal<out T>(val id: T)
private fun testInner1(c0: Int, c1: Int, c2: Int, c3: Int) {
- Lambdas.acceptIntConsumer({ println("{${next()}:$it}") }, 100)
- Lambdas.acceptStringConsumer({ println("${next()}:{$it}:{$c0}") }, next())
- Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}") }, next())
- Lambdas.acceptGenericConsumer(
- { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}") }, InnerLocal(next()))
- Lambdas.acceptGenericConsumer(
- { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}:{$c3") }, InnerLocal(InnerLocal(next())))
+ Lambdas.acceptIntConsumer({ println("{${next()}:$it}") }, 100)
+ Lambdas.acceptStringConsumer({ println("${next()}:{$it}:{$c0}") }, next())
+ Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}") }, next())
+ Lambdas.acceptGenericConsumer(
+ { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}") },
+ InnerLocal(next()),
+ )
+ Lambdas.acceptGenericConsumer(
+ { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}:{$c3") },
+ InnerLocal(InnerLocal(next())),
+ )
}
-
diff --git a/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/main.kt b/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/main.kt
index 7fd2d0c..0dd8518 100644
--- a/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/main.kt
+++ b/src/test/kotlinR8TestResources/lambdas_jstyle_trivial/main.kt
@@ -9,79 +9,91 @@
private var COUNT = 0
fun nextInt() = COUNT++
+
fun next() = "${nextInt()}".padStart(3, '0')
fun main(args: Array<String>) {
- test()
- testInner()
+ test()
+ testInner()
}
private fun test() {
- test1(nextInt(), nextInt(), nextInt(), nextInt())
- test2(next(), next(), next())
- test3a(next(), next(), next())
- test3a(next(), Local(next()), Local(Local(next())))
- test3b(next(), next(), next())
- test3b(next(), Local(next()), Local(next()))
+ test1(nextInt(), nextInt(), nextInt(), nextInt())
+ test2(next(), next(), next())
+ test3a(next(), next(), next())
+ test3a(next(), Local(next()), Local(Local(next())))
+ test3b(next(), next(), next())
+ test3b(next(), Local(next()), Local(next()))
}
private data class Local<out T>(val id: T)
private fun test1(c0: Int, c1: Int, c2: Int, c3: Int) {
- Lambdas.acceptIntConsumer({ println("{${next()}:$it}") }, nextInt())
- Lambdas.acceptIntConsumer({ println("{${next()}:$it}") }, nextInt())
+ Lambdas.acceptIntConsumer({ println("{${next()}:$it}") }, nextInt())
+ Lambdas.acceptIntConsumer({ println("{${next()}:$it}") }, nextInt())
- Lambdas.acceptStringConsumer({ println("${next()}:{$it}:{$c0}") }, next())
- Lambdas.acceptStringConsumer({ println("${next()}:{$it}:{$c0}") }, next())
+ Lambdas.acceptStringConsumer({ println("${next()}:{$it}:{$c0}") }, next())
+ Lambdas.acceptStringConsumer({ println("${next()}:{$it}:{$c0}") }, next())
- Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}") }, next())
- Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}") }, next())
+ Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}") }, next())
+ Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}") }, next())
- Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}:{$c2}") }, Local(next()))
- Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}:{$c2}") }, Local(next()))
+ Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}:{$c2}") }, Local(next()))
+ Lambdas.acceptGenericConsumer({ println("${next()}:{$it}:{$c0}:{$c1}:{$c2}") }, Local(next()))
- Lambdas.acceptGenericConsumer(
- { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}:{$c3}") }, Local(Local(next())))
- Lambdas.acceptGenericConsumer(
- { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}:{$c3}") }, Local(Local(next())))
+ Lambdas.acceptGenericConsumer(
+ { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}:{$c3}") },
+ Local(Local(next())),
+ )
+ Lambdas.acceptGenericConsumer(
+ { println("${next()}:{$it}:{$c0}:{$c1}:{$c2}:{$c3}") },
+ Local(Local(next())),
+ )
}
private fun test2(c0: String, c1: String, c2: String) {
- println(Lambdas.acceptIntSupplier { nextInt() })
- println(Lambdas.acceptIntSupplier { nextInt() })
+ println(Lambdas.acceptIntSupplier { nextInt() })
+ println(Lambdas.acceptIntSupplier { nextInt() })
- println(Lambdas.acceptStringSupplier { "${next()}:$c0" })
- println(Lambdas.acceptStringSupplier { "${next()}:$c0" })
+ println(Lambdas.acceptStringSupplier { "${next()}:$c0" })
+ println(Lambdas.acceptStringSupplier { "${next()}:$c0" })
- println(Lambdas.acceptGenericSupplier { "${next()}:$c0" })
- println(Lambdas.acceptGenericSupplier { "${next()}:$c0" })
+ println(Lambdas.acceptGenericSupplier { "${next()}:$c0" })
+ println(Lambdas.acceptGenericSupplier { "${next()}:$c0" })
- println(Lambdas.acceptGenericSupplier { "${Local(next())}:$c0:$c1" })
- println(Lambdas.acceptGenericSupplier { "${Local(next())}:$c0:$c1" })
+ println(Lambdas.acceptGenericSupplier { "${Local(next())}:$c0:$c1" })
+ println(Lambdas.acceptGenericSupplier { "${Local(next())}:$c0:$c1" })
- println(Lambdas.acceptGenericSupplier { "${Local(Local(next()))}:$c0:$c1:$c2" })
- println(Lambdas.acceptGenericSupplier { "${Local(Local(next()))}:$c0:$c1:$c2" })
+ println(Lambdas.acceptGenericSupplier { "${Local(Local(next()))}:$c0:$c1:$c2" })
+ println(Lambdas.acceptGenericSupplier { "${Local(Local(next()))}:$c0:$c1:$c2" })
}
private fun <P1, P2, P3> test3a(a: P1, b: P2, c: P3) {
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, b, c)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, c, a, b)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, b, c, a)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(a), b, c)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(b), a, c)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, Local(b), c)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, Local(c), b)
- Lambdas.acceptMultiFunction(
- { x, y, z -> "$x:$y:$z" }, Local(Local(a)), Local(Local(b)), Local(Local(c)))
- Lambdas.acceptMultiFunction(
- { x, y, z -> "$x:$y:$z" }, Local(Local(c)), Local(Local(a)), Local(Local(b)))
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, b, c)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, c, a, b)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, b, c, a)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(a), b, c)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(b), a, c)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, Local(b), c)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, Local(c), b)
+ Lambdas.acceptMultiFunction(
+ { x, y, z -> "$x:$y:$z" },
+ Local(Local(a)),
+ Local(Local(b)),
+ Local(Local(c)),
+ )
+ Lambdas.acceptMultiFunction(
+ { x, y, z -> "$x:$y:$z" },
+ Local(Local(c)),
+ Local(Local(a)),
+ Local(Local(b)),
+ )
}
private fun <P> test3b(a: P, b: P, c: P) {
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, b, c)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, c, a, b)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, b, c, a)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(a), b, c)
- Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(b), a, c)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, a, b, c)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, c, a, b)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, b, c, a)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(a), b, c)
+ Lambdas.acceptMultiFunction({ x, y, z -> "$x:$y:$z" }, Local(b), a, c)
}
-
diff --git a/src/test/kotlinR8TestResources/lambdas_kstyle_captures/main.kt b/src/test/kotlinR8TestResources/lambdas_kstyle_captures/main.kt
index 62727bd..79c87a8 100644
--- a/src/test/kotlinR8TestResources/lambdas_kstyle_captures/main.kt
+++ b/src/test/kotlinR8TestResources/lambdas_kstyle_captures/main.kt
@@ -7,59 +7,75 @@
fun consume(l: () -> String) = l()
fun main(args: Array<String>) {
- test()
+ test()
}
private fun test() {
- test1(1, 2, 3, "A", "B", "C", D("x"), D("y"), D("z"), 7, 8, 9)
- test2(true, 10, '*', 20, 30, 40, 50.0f, 60.0, D("D"), "S", null, 70)
+ test1(1, 2, 3, "A", "B", "C", D("x"), D("y"), D("z"), 7, 8, 9)
+ test2(true, 10, '*', 20, 30, 40, 50.0f, 60.0, D("D"), "S", null, 70)
}
data class D(val d: String)
private fun test1(
- i1: Int, i2: Int, i3: Int,
- s1: String, s2: String, s3: String,
- d1: D, d2: D, d3: D,
- o1: Int?, o2: Int?, o3: Int?
+ i1: Int,
+ i2: Int,
+ i3: Int,
+ s1: String,
+ s2: String,
+ s3: String,
+ d1: D,
+ d2: D,
+ d3: D,
+ o1: Int?,
+ o2: Int?,
+ o3: Int?,
) {
- println(consume { "a: $i1 $i2 $i3" })
- println(consume { "b: $i2 $i3 $i1" })
- println(consume { "c: $i3 $i1 $i2" })
+ println(consume { "a: $i1 $i2 $i3" })
+ println(consume { "b: $i2 $i3 $i1" })
+ println(consume { "c: $i3 $i1 $i2" })
- println(consume { "d: $i1 $s1 $d1" })
- println(consume { "e: $i2 $d2 $s2" })
- println(consume { "f: $i3 $d3 $d1" })
- println(consume { "g: $o1 $d3 $i3" })
- println(consume { "h: $o2 $o3 $i1" })
+ println(consume { "d: $i1 $s1 $d1" })
+ println(consume { "e: $i2 $d2 $s2" })
+ println(consume { "f: $i3 $d3 $d1" })
+ println(consume { "g: $o1 $d3 $i3" })
+ println(consume { "h: $o2 $o3 $i1" })
- println(consume { "i: $s1 $s2 $s3" })
- println(consume { "j: $d1 $d2 $d3" })
- println(consume { "k: $o1 $o2 $o3" })
- println(consume { "l: $s1 $d2 $o3" })
- println(consume { "n: $o1 $s2 $d3" })
- println(consume { "o: $d1 $o2 $s3" })
+ println(consume { "i: $s1 $s2 $s3" })
+ println(consume { "j: $d1 $d2 $d3" })
+ println(consume { "k: $o1 $o2 $o3" })
+ println(consume { "l: $s1 $d2 $o3" })
+ println(consume { "n: $o1 $s2 $d3" })
+ println(consume { "o: $d1 $o2 $s3" })
- println(consume { "p: $i1 $i2 $s3" })
+ println(consume { "p: $i1 $i2 $s3" })
}
private fun test2(
- z: Boolean, b: Byte, c: Char, s: Short,
- i: Int, l: Long, f: Float, d: Double,
- o1: D, o2: String, o3: Any?, o4: Byte?
+ z: Boolean,
+ b: Byte,
+ c: Char,
+ s: Short,
+ i: Int,
+ l: Long,
+ f: Float,
+ d: Double,
+ o1: D,
+ o2: String,
+ o3: Any?,
+ o4: Byte?,
) {
- println(consume { "a: $z $b $c $s $i $l $f $d $o1 $o2 $o3 $o4" })
- println(consume { "a: $z $b $o1 $o2 $c $s $i $l $f $d $o3 $o4" })
- println(consume { "a: $z $c $s $l $f $d $o2 $o3 $o4 $b $i $o1" })
- println(consume { "a: $o1 $o2 $o3 $o4 $z $b $c $s $i $l $f $d" })
+ println(consume { "a: $z $b $c $s $i $l $f $d $o1 $o2 $o3 $o4" })
+ println(consume { "a: $z $b $o1 $o2 $c $s $i $l $f $d $o3 $o4" })
+ println(consume { "a: $z $c $s $l $f $d $o2 $o3 $o4 $b $i $o1" })
+ println(consume { "a: $o1 $o2 $o3 $o4 $z $b $c $s $i $l $f $d" })
- println(consume { "a: $z $b $c $s $i $l $f $d $o1 $o2 \$o3 \$o4" })
- println(consume { "a: $z $b $c $s $i $l $f $d $o1 \$o2 \$o3 $o4" })
- println(consume { "a: $z $b $c $s $i $l $f $d \$o1 \$o2 $o3 $o4" })
- println(consume { "a: $z $b $c $s $i $l $f $d \$o1 $o2 $o3 \$o4" })
+ println(consume { "a: $z $b $c $s $i $l $f $d $o1 $o2 \$o3 \$o4" })
+ println(consume { "a: $z $b $c $s $i $l $f $d $o1 \$o2 \$o3 $o4" })
+ println(consume { "a: $z $b $c $s $i $l $f $d \$o1 \$o2 $o3 $o4" })
+ println(consume { "a: $z $b $c $s $i $l $f $d \$o1 $o2 $o3 \$o4" })
- println(consume { "x: $z $b $c $s $i $l $f $d $o1 $o2 \$o3 $o4" })
- println(consume { "y: $z $b $c $s $i $l \$f $d $o1 $o2 $o3 $o4" })
- println(consume { "z: $z $b $c \$s $i $l $f $d $o1 $o2 $o3 $o4" })
+ println(consume { "x: $z $b $c $s $i $l $f $d $o1 $o2 \$o3 $o4" })
+ println(consume { "y: $z $b $c $s $i $l \$f $d $o1 $o2 $o3 $o4" })
+ println(consume { "z: $z $b $c \$s $i $l $f $d $o1 $o2 $o3 $o4" })
}
-
diff --git a/src/test/kotlinR8TestResources/lambdas_kstyle_generics/main.kt b/src/test/kotlinR8TestResources/lambdas_kstyle_generics/main.kt
index e2d044d..f7d7f1b 100644
--- a/src/test/kotlinR8TestResources/lambdas_kstyle_generics/main.kt
+++ b/src/test/kotlinR8TestResources/lambdas_kstyle_generics/main.kt
@@ -17,44 +17,43 @@
fun <T> consume(t: T, l: (t: T) -> String) = l(t)
fun main(args: Array<String>) {
- println(consume(Any(), { "${Alpha()}" }))
- println(consume(Any(), { "${Beta()}" }))
- println(consume(Any(), { "${Gamma("{any}")}" }))
- println(consume(Alpha(), { "$it" }))
+ println(consume(Any(), { "${Alpha()}" }))
+ println(consume(Any(), { "${Beta()}" }))
+ println(consume(Any(), { "${Gamma("{any}")}" }))
+ println(consume(Alpha(), { "$it" }))
- testFirst(11)
- testSecond(22)
- testThird()
+ testFirst(11)
+ testSecond(22)
+ testThird()
}
private fun testFirst(sh: Short) {
- val prefix = "First"
- println(consume(Beta(), { "$prefix-1-$it" }))
- println(consume(Beta(), { "$prefix-2-$it" }))
- println(consume(Beta(), { "$prefix-3-$it" }))
- println(consume(Gamma(next()), { "$prefix-A-$it-$sh" }))
- println(consume(Gamma(next()), { "$prefix-B-$it-$sh" }))
- println(consume(Gamma(next()), { "$prefix-C-$it-$sh" }))
- println(consume(Gamma(COUNT++), { "$prefix-D-$it-$sh" }))
- println(consume(Gamma(COUNT++), { "$prefix-E-$it-$sh" }))
- println(consume(Gamma(COUNT++), { "$prefix-F-$it-$sh" }))
+ val prefix = "First"
+ println(consume(Beta(), { "$prefix-1-$it" }))
+ println(consume(Beta(), { "$prefix-2-$it" }))
+ println(consume(Beta(), { "$prefix-3-$it" }))
+ println(consume(Gamma(next()), { "$prefix-A-$it-$sh" }))
+ println(consume(Gamma(next()), { "$prefix-B-$it-$sh" }))
+ println(consume(Gamma(next()), { "$prefix-C-$it-$sh" }))
+ println(consume(Gamma(COUNT++), { "$prefix-D-$it-$sh" }))
+ println(consume(Gamma(COUNT++), { "$prefix-E-$it-$sh" }))
+ println(consume(Gamma(COUNT++), { "$prefix-F-$it-$sh" }))
}
private fun testSecond(sh: Short) {
- val prefix = "Second"
- println(consume(Beta(), { "$prefix-1-$it" }))
- println(consume(Beta(), { "$prefix-2-$it" }))
- println(consume(Beta(), { "$prefix-3-$it" }))
- println(consume(Gamma(next()), { "$prefix-A-$it-$sh" }))
- println(consume(Gamma(next()), { "$prefix-B-$it-$sh" }))
- println(consume(Gamma(next()), { "$prefix-C-$it-$sh" }))
- println(consume(Gamma(COUNT++), { "$prefix-D-$it-$sh" }))
- println(consume(Gamma(COUNT++), { "$prefix-E-$it-$sh" }))
- println(consume(Gamma(COUNT++), { "$prefix-F-$it-$sh" }))
+ val prefix = "Second"
+ println(consume(Beta(), { "$prefix-1-$it" }))
+ println(consume(Beta(), { "$prefix-2-$it" }))
+ println(consume(Beta(), { "$prefix-3-$it" }))
+ println(consume(Gamma(next()), { "$prefix-A-$it-$sh" }))
+ println(consume(Gamma(next()), { "$prefix-B-$it-$sh" }))
+ println(consume(Gamma(next()), { "$prefix-C-$it-$sh" }))
+ println(consume(Gamma(COUNT++), { "$prefix-D-$it-$sh" }))
+ println(consume(Gamma(COUNT++), { "$prefix-E-$it-$sh" }))
+ println(consume(Gamma(COUNT++), { "$prefix-F-$it-$sh" }))
}
private fun testThird() {
- println(consume(4321, { "$it ${next()} ${next()} ${next()}" }))
- println(consume(1234, { "$it ${Alpha()} ${Beta()} ${Gamma(next())}" }))
+ println(consume(4321, { "$it ${next()} ${next()} ${next()}" }))
+ println(consume(1234, { "$it ${Alpha()} ${Beta()} ${Gamma(next())}" }))
}
-
diff --git a/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/inner/inner.kt b/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/inner/inner.kt
index c22a3b8..963336d 100644
--- a/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/inner/inner.kt
+++ b/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/inner/inner.kt
@@ -9,18 +9,17 @@
import lambdas_kstyle_trivial.consumeTwo
fun testInner() {
- testInnerStateless()
+ testInnerStateless()
}
private fun testInnerStateless() {
- println(consumeEmpty { "first empty" })
- println(consumeEmpty { "second empty" })
+ println(consumeEmpty { "first empty" })
+ println(consumeEmpty { "second empty" })
- println(consumeOne { _ -> "first single" })
- println(consumeOne { _ -> "second single" })
- println(consumeOne { _ -> "third single" })
- println(consumeOne { x -> x })
+ println(consumeOne { _ -> "first single" })
+ println(consumeOne { _ -> "second single" })
+ println(consumeOne { _ -> "third single" })
+ println(consumeOne { x -> x })
- println(consumeTwo { x, y -> x + "-" + y })
+ println(consumeTwo { x, y -> x + "-" + y })
}
-
diff --git a/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/main.kt b/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/main.kt
index 42cce37..564c79a 100644
--- a/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/main.kt
+++ b/src/test/kotlinR8TestResources/lambdas_kstyle_trivial/main.kt
@@ -11,79 +11,172 @@
private fun next() = "${COUNT++}"
fun consumeEmpty(l: () -> String) = l()
+
fun consumeOne(l: (x: String) -> String): String = l(next())
+
fun consumeTwo(l: (x: String, y: String) -> String): String = l(next(), next())
+
fun consumeThree(l: (x: String, y: String, z: String) -> String) = l(next(), next(), next())
-fun consumeTwentyTwo(l: (v0: String, v1: String, v2: String, v3: String, v4: String,
- v5: String, v6: String, v7: String, v8: String, v9: String,
- v10: String, v11: String, v12: String, v13: String, v14: String,
- v15: String, v16: String, v17: String, v18: String, v19: String,
- v20: String, v21: String) -> String) = l(
- next(), next(), next(), next(), next(), next(), next(), next(), next(), next(), next(),
- next(), next(), next(), next(), next(), next(), next(), next(), next(), next(), next())
+
+fun consumeTwentyTwo(
+ l:
+ (
+ v0: String,
+ v1: String,
+ v2: String,
+ v3: String,
+ v4: String,
+ v5: String,
+ v6: String,
+ v7: String,
+ v8: String,
+ v9: String,
+ v10: String,
+ v11: String,
+ v12: String,
+ v13: String,
+ v14: String,
+ v15: String,
+ v16: String,
+ v17: String,
+ v18: String,
+ v19: String,
+ v20: String,
+ v21: String,
+ ) -> String
+) =
+ l(
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ next(),
+ )
fun main(args: Array<String>) {
- test()
- testInner()
- testPrimitive()
- testUnit()
+ test()
+ testInner()
+ testPrimitive()
+ testUnit()
}
private fun test() {
- testStateless()
+ testStateless()
}
private fun testStateless() {
- println(consumeEmpty { "first empty" })
- println(consumeEmpty { "second empty" })
+ println(consumeEmpty { "first empty" })
+ println(consumeEmpty { "second empty" })
- println(consumeOne { _ -> "first single" })
- println(consumeOne { _ -> "second single" })
- println(consumeOne { _ -> "third single" })
- println(consumeOne { x ->
- try {
- throw RuntimeException("exception#$x")
- } catch (e: RuntimeException) {
- "caught: ${e.message}"
- } catch (e: Exception) {
- "NEVER"
- }
- })
- println(consumeOne { x -> x })
+ println(consumeOne { _ -> "first single" })
+ println(consumeOne { _ -> "second single" })
+ println(consumeOne { _ -> "third single" })
+ println(
+ consumeOne { x ->
+ try {
+ throw RuntimeException("exception#$x")
+ } catch (e: RuntimeException) {
+ "caught: ${e.message}"
+ } catch (e: Exception) {
+ "NEVER"
+ }
+ }
+ )
+ println(consumeOne { x -> x })
- println(consumeTwo { x, y -> x + "-" + y })
+ println(consumeTwo { x, y -> x + "-" + y })
- println(consumeThree { x, y, z -> x + y + z })
- println(consumeThree { _, _, _ -> "one-two-three" })
+ println(consumeThree { x, y, z -> x + y + z })
+ println(consumeThree { _, _, _ -> "one-two-three" })
- println(consumeTwentyTwo { _, _, _, _, _, _, _, _, _, _, _,
- _, _, _, _, _, _, _, _, _, _, _ ->
- "one-two-...-twentythree"
- })
- println(consumeTwentyTwo { v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
- v12, v13, v14, v15, v16, v17, v18, v19, v20, v21 ->
- v0 + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8 + v9 + v10 + v11 +
- v12 + v13 + v14 + v15 + v16 + v17 + v18 + v19 + v20 + v21
- })
+ println(
+ consumeTwentyTwo { _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _ ->
+ "one-two-...-twentythree"
+ }
+ )
+ println(
+ consumeTwentyTwo {
+ v0,
+ v1,
+ v2,
+ v3,
+ v4,
+ v5,
+ v6,
+ v7,
+ v8,
+ v9,
+ v10,
+ v11,
+ v12,
+ v13,
+ v14,
+ v15,
+ v16,
+ v17,
+ v18,
+ v19,
+ v20,
+ v21 ->
+ v0 +
+ v1 +
+ v2 +
+ v3 +
+ v4 +
+ v5 +
+ v6 +
+ v7 +
+ v8 +
+ v9 +
+ v10 +
+ v11 +
+ v12 +
+ v13 +
+ v14 +
+ v15 +
+ v16 +
+ v17 +
+ v18 +
+ v19 +
+ v20 +
+ v21
+ }
+ )
}
private fun consumePrimitive(i: Int, l: (Int, Short) -> Int) = l(i, 5)
private fun testPrimitive() {
- println(consumePrimitive(1, { x, y -> x }))
- println(consumePrimitive(2, { x, y -> y.toInt() }))
- println(consumePrimitive(3, { x, y -> x + y }))
- println(consumePrimitive(4, { x, y -> x * y }))
- val l: (Int, Short) -> Int = { x, y -> x / y }
- println(l(100, 20))
+ println(consumePrimitive(1, { x, y -> x }))
+ println(consumePrimitive(2, { x, y -> y.toInt() }))
+ println(consumePrimitive(3, { x, y -> x + y }))
+ println(consumePrimitive(4, { x, y -> x * y }))
+ val l: (Int, Short) -> Int = { x, y -> x / y }
+ println(l(100, 20))
}
private fun consumeUnit(i: Int, l: (Int, Short) -> Unit) = l(i, 10)
private fun testUnit() {
- println(consumeUnit(11, { x, y -> println() }))
- println(consumeUnit(12, { x, y -> println(y) }))
- println(consumeUnit(13, { x, y -> println(x) }))
- println(consumeUnit(14, { x, y -> println("$x -- $y") }))
+ println(consumeUnit(11, { x, y -> println() }))
+ println(consumeUnit(12, { x, y -> println(y) }))
+ println(consumeUnit(13, { x, y -> println(x) }))
+ println(consumeUnit(14, { x, y -> println("$x -- $y") }))
}
-
diff --git a/src/test/kotlinR8TestResources/lambdas_singleton/main.kt b/src/test/kotlinR8TestResources/lambdas_singleton/main.kt
index f06904a..f2ae1f3 100644
--- a/src/test/kotlinR8TestResources/lambdas_singleton/main.kt
+++ b/src/test/kotlinR8TestResources/lambdas_singleton/main.kt
@@ -7,40 +7,40 @@
private var COUNT = 0
fun nextInt() = COUNT++
+
fun next() = "${nextInt()}".padStart(3, '0')
fun main(args: Array<String>) {
- test()
+ test()
}
private fun test() {
- test2(listOf(next(), next(), next(), next(), next(), next(), next(), next(), next(), next()))
+ test2(listOf(next(), next(), next(), next(), next(), next(), next(), next(), next(), next()))
}
private fun Collection<String>.flatten() =
- this.joinToString(prefix = "(*", postfix = "*)", separator = "*")
+ this.joinToString(prefix = "(*", postfix = "*)", separator = "*")
private fun Array<String>.flatten() =
- this.joinToString(prefix = "(*", postfix = "*)", separator = "*")
+ this.joinToString(prefix = "(*", postfix = "*)", separator = "*")
private fun test2(args: Collection<String>) {
- println(args.sortedByDescending { it.length }.flatten())
- println(args.sortedByDescending { -it.length }.flatten())
- process(::println)
- process(::println)
- val lambda: (Array<String>) -> Unit = {}
+ println(args.sortedByDescending { it.length }.flatten())
+ println(args.sortedByDescending { -it.length }.flatten())
+ process(::println)
+ process(::println)
+ val lambda: (Array<String>) -> Unit = {}
}
private inline fun process(crossinline f: (String) -> Unit) {
- feed2 { f(it.flatten()) }
- feed3 { f(it.flatten()) }
+ feed2 { f(it.flatten()) }
+ feed3 { f(it.flatten()) }
}
private fun feed3(f: (Array<String>) -> Unit) {
- f(arrayOf(next(), next(), next()))
+ f(arrayOf(next(), next(), next()))
}
private fun feed2(f: (Array<String>) -> Unit) {
- f(arrayOf(next(), next()))
+ f(arrayOf(next(), next()))
}
-
diff --git a/src/test/kotlinR8TestResources/loops/Loop.kt b/src/test/kotlinR8TestResources/loops/Loop.kt
index 928dec8..af644b3 100644
--- a/src/test/kotlinR8TestResources/loops/Loop.kt
+++ b/src/test/kotlinR8TestResources/loops/Loop.kt
@@ -11,4 +11,4 @@
fun main(args: Array<String>) {
loopOnArray(arrayOf(1, 2, 3, 4, 5))
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlinR8TestResources/minify_enum/main.kt b/src/test/kotlinR8TestResources/minify_enum/main.kt
index d35ecf5..19bd42e 100644
--- a/src/test/kotlinR8TestResources/minify_enum/main.kt
+++ b/src/test/kotlinR8TestResources/minify_enum/main.kt
@@ -3,11 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
package minify_enum
-enum class MinifyEnum(
- val nullableStr1: String?,
- val nullableStr2: String?,
- val number3: String
-) {
+enum class MinifyEnum(val nullableStr1: String?, val nullableStr2: String?, val number3: String) {
UNKNOWN(null, null, "")
}
diff --git a/src/test/kotlinR8TestResources/non_null/example1.kt b/src/test/kotlinR8TestResources/non_null/example1.kt
index 02a3fcf..0f210b6 100644
--- a/src/test/kotlinR8TestResources/non_null/example1.kt
+++ b/src/test/kotlinR8TestResources/non_null/example1.kt
@@ -4,26 +4,21 @@
package non_null
-data class Car(
- val make: String,
- val model: String,
- val year: Int,
- val plateNumber: String)
+data class Car(val make: String, val model: String, val year: Int, val plateNumber: String)
-fun Collection<Car>.forMakeAndModel(
- make: String, model: String, sinceYear: Int?
-) = this.asSequence()
- .filter { it.make == make }
- .filter { it.model == model }
- .filter { sinceYear != null && it.year >= sinceYear }
- .groupBy { it.year }
- .toSortedMap()
+fun Collection<Car>.forMakeAndModel(make: String, model: String, sinceYear: Int?) =
+ this.asSequence()
+ .filter { it.make == make }
+ .filter { it.model == model }
+ .filter { sinceYear != null && it.year >= sinceYear }
+ .groupBy { it.year }
+ .toSortedMap()
fun main(args: Array<String>) {
- val leaf = Car("Nissan", "Leaf", 2015, " LEAF ")
- val ms1 = Car("Tesla", "Model S", 2015, " LGTM1 ")
- val ms2 = Car("Tesla", "Model S", 2017, " LGTM2 ")
- val m3 = Car("Tesla", "Model 3", 2018, " LGTM3 ")
- val cars: List<Car> = mutableListOf(leaf, ms1, ms2, m3)
- println(cars.forMakeAndModel("Tesla", "Model S", null))
+ val leaf = Car("Nissan", "Leaf", 2015, " LEAF ")
+ val ms1 = Car("Tesla", "Model S", 2015, " LGTM1 ")
+ val ms2 = Car("Tesla", "Model S", 2017, " LGTM2 ")
+ val m3 = Car("Tesla", "Model 3", 2018, " LGTM3 ")
+ val cars: List<Car> = mutableListOf(leaf, ms1, ms2, m3)
+ println(cars.forMakeAndModel("Tesla", "Model S", null))
}
diff --git a/src/test/kotlinR8TestResources/non_null/example2.kt b/src/test/kotlinR8TestResources/non_null/example2.kt
index e35b2e8..3970ff0 100644
--- a/src/test/kotlinR8TestResources/non_null/example2.kt
+++ b/src/test/kotlinR8TestResources/non_null/example2.kt
@@ -5,10 +5,10 @@
package non_null
inline fun coalesce(a: String?, b: String?): String? = a ?: b
-fun aOrDefault(a: String?, default: String): String =
- coalesce(a, default) ?: throw AssertionError()
+
+fun aOrDefault(a: String?, default: String): String = coalesce(a, default) ?: throw AssertionError()
fun main(args: Array<String>) {
- println(aOrDefault(null, "null"))
- println(aOrDefault("null", "non-null"))
-}
\ No newline at end of file
+ println(aOrDefault(null, "null"))
+ println(aOrDefault("null", "non-null"))
+}
diff --git a/src/test/kotlinR8TestResources/non_null/example3.kt b/src/test/kotlinR8TestResources/non_null/example3.kt
index 9df7b20..899b502 100644
--- a/src/test/kotlinR8TestResources/non_null/example3.kt
+++ b/src/test/kotlinR8TestResources/non_null/example3.kt
@@ -5,6 +5,7 @@
class Foo(val tag: String) {
var bar: Bar? = null
+
fun foo() {
println("Foo::$tag")
}
diff --git a/src/test/kotlinR8TestResources/properties/CompanionLateInitProperties.kt b/src/test/kotlinR8TestResources/properties/CompanionLateInitProperties.kt
index d3db0f4..af6cb40 100644
--- a/src/test/kotlinR8TestResources/properties/CompanionLateInitProperties.kt
+++ b/src/test/kotlinR8TestResources/properties/CompanionLateInitProperties.kt
@@ -5,37 +5,37 @@
package properties
class CompanionLateInitProperties {
- companion object {
- private lateinit var privateLateInitProp: String
- internal lateinit var internalLateInitProp: String
- public lateinit var publicLateInitProp: String
+ companion object {
+ private lateinit var privateLateInitProp: String
+ internal lateinit var internalLateInitProp: String
+ public lateinit var publicLateInitProp: String
- fun callSetterPrivateProp(v: String) {
- privateLateInitProp = v
- }
-
- fun callGetterPrivateProp(): String {
- return privateLateInitProp
- }
+ fun callSetterPrivateProp(v: String) {
+ privateLateInitProp = v
}
+
+ fun callGetterPrivateProp(): String {
+ return privateLateInitProp
+ }
+ }
}
fun companionLateInitProperties_noUseOfProperties() {
- CompanionLateInitProperties()
- println("DONE")
+ CompanionLateInitProperties()
+ println("DONE")
}
fun companionLateInitProperties_usePrivateLateInitProp() {
- CompanionLateInitProperties.callSetterPrivateProp("foo")
- println(CompanionLateInitProperties.callGetterPrivateProp())
+ CompanionLateInitProperties.callSetterPrivateProp("foo")
+ println(CompanionLateInitProperties.callGetterPrivateProp())
}
fun companionLateInitProperties_useInternalLateInitProp() {
- CompanionLateInitProperties.internalLateInitProp = "foo"
- println(CompanionLateInitProperties.internalLateInitProp)
+ CompanionLateInitProperties.internalLateInitProp = "foo"
+ println(CompanionLateInitProperties.internalLateInitProp)
}
fun companionLateInitProperties_usePublicLateInitProp() {
- CompanionLateInitProperties.publicLateInitProp = "foo"
- println(CompanionLateInitProperties.publicLateInitProp)
+ CompanionLateInitProperties.publicLateInitProp = "foo"
+ println(CompanionLateInitProperties.publicLateInitProp)
}
diff --git a/src/test/kotlinR8TestResources/properties/CompanionProperties.kt b/src/test/kotlinR8TestResources/properties/CompanionProperties.kt
index d0e3082..5b82ddf 100644
--- a/src/test/kotlinR8TestResources/properties/CompanionProperties.kt
+++ b/src/test/kotlinR8TestResources/properties/CompanionProperties.kt
@@ -5,44 +5,44 @@
package properties
class CompanionProperties {
- companion object {
- private var privateProp: String = "privateProp"
- internal var internalProp: String = "internalProp"
- public var publicProp: String = "publicProp"
+ companion object {
+ private var privateProp: String = "privateProp"
+ internal var internalProp: String = "internalProp"
+ public var publicProp: String = "publicProp"
- public var primitiveProp: Int = Int.MAX_VALUE
+ public var primitiveProp: Int = Int.MAX_VALUE
- fun callSetterPrivateProp(v: String) {
- privateProp = v
- }
-
- fun callGetterPrivateProp(): String {
- return privateProp
- }
+ fun callSetterPrivateProp(v: String) {
+ privateProp = v
}
+
+ fun callGetterPrivateProp(): String {
+ return privateProp
+ }
+ }
}
fun companionProperties_noUseOfProperties() {
- CompanionProperties()
- println("DONE")
+ CompanionProperties()
+ println("DONE")
}
fun companionProperties_usePrivateProp() {
- CompanionProperties.callSetterPrivateProp("foo")
- println(CompanionProperties.callGetterPrivateProp())
+ CompanionProperties.callSetterPrivateProp("foo")
+ println(CompanionProperties.callGetterPrivateProp())
}
fun companionProperties_useInternalProp() {
- CompanionProperties.internalProp = "foo"
- println(CompanionProperties.internalProp)
+ CompanionProperties.internalProp = "foo"
+ println(CompanionProperties.internalProp)
}
fun companionProperties_usePublicProp() {
- CompanionProperties.publicProp = "foo"
- println(CompanionProperties.publicProp)
+ CompanionProperties.publicProp = "foo"
+ println(CompanionProperties.publicProp)
}
fun companionProperties_usePrimitiveProp() {
- CompanionProperties.primitiveProp = Int.MIN_VALUE
- println(CompanionProperties.primitiveProp)
+ CompanionProperties.primitiveProp = Int.MIN_VALUE
+ println(CompanionProperties.primitiveProp)
}
diff --git a/src/test/kotlinR8TestResources/properties/FileProperties.kt b/src/test/kotlinR8TestResources/properties/FileProperties.kt
index 4671189..72693b1 100644
--- a/src/test/kotlinR8TestResources/properties/FileProperties.kt
+++ b/src/test/kotlinR8TestResources/properties/FileProperties.kt
@@ -16,67 +16,88 @@
// Serves as intermediate to make sure the access to a property is done from a separate class.
private object Intermediate {
- fun readPrivateProp() = privateProp
- fun writePrivateProp(s: String) { privateProp = s }
+ fun readPrivateProp() = privateProp
- fun readInternalProp() = internalProp
- fun writeInternalProp(s: String) { internalProp = s }
+ fun writePrivateProp(s: String) {
+ privateProp = s
+ }
- fun readPublicProp() = publicProp
- fun writePublicProp(s: String) { publicProp = s }
+ fun readInternalProp() = internalProp
- fun readPrimitiveProp() = primitiveProp
- fun writePrimitiveProp(i: Int) { primitiveProp = i }
+ fun writeInternalProp(s: String) {
+ internalProp = s
+ }
- fun readLateInitPrivateProp() = privateLateInitProp
- fun writeLateInitPrivateProp(s: String) { privateLateInitProp = s }
+ fun readPublicProp() = publicProp
- fun readLateInitInternalProp() = internalLateInitProp
- fun writeLateInitInternalProp(s: String) { internalLateInitProp = s }
+ fun writePublicProp(s: String) {
+ publicProp = s
+ }
- fun readLateInitPublicProp() = publicLateInitProp
- fun writeLateInitPublicProp(s: String) { publicLateInitProp = s }
+ fun readPrimitiveProp() = primitiveProp
+
+ fun writePrimitiveProp(i: Int) {
+ primitiveProp = i
+ }
+
+ fun readLateInitPrivateProp() = privateLateInitProp
+
+ fun writeLateInitPrivateProp(s: String) {
+ privateLateInitProp = s
+ }
+
+ fun readLateInitInternalProp() = internalLateInitProp
+
+ fun writeLateInitInternalProp(s: String) {
+ internalLateInitProp = s
+ }
+
+ fun readLateInitPublicProp() = publicLateInitProp
+
+ fun writeLateInitPublicProp(s: String) {
+ publicLateInitProp = s
+ }
}
fun doNotUseProperties(): String {
- return "doNotUseProperties"
+ return "doNotUseProperties"
}
fun fileProperties_noUseOfProperties() {
- println(ObjectProperties.doNotUseProperties())
+ println(ObjectProperties.doNotUseProperties())
}
fun fileProperties_usePrivateProp() {
- Intermediate.writePrivateProp("foo")
- println(Intermediate.readPrivateProp())
+ Intermediate.writePrivateProp("foo")
+ println(Intermediate.readPrivateProp())
}
fun fileProperties_useInternalProp() {
- Intermediate.writeInternalProp("foo")
- println(Intermediate.readInternalProp())
+ Intermediate.writeInternalProp("foo")
+ println(Intermediate.readInternalProp())
}
fun fileProperties_usePublicProp() {
- Intermediate.writePublicProp("foo")
- println(Intermediate.readPublicProp())
+ Intermediate.writePublicProp("foo")
+ println(Intermediate.readPublicProp())
}
fun fileProperties_usePrimitiveProp() {
- Intermediate.writePrimitiveProp(Int.MIN_VALUE)
- println(Intermediate.readPrimitiveProp())
+ Intermediate.writePrimitiveProp(Int.MIN_VALUE)
+ println(Intermediate.readPrimitiveProp())
}
fun fileProperties_useLateInitPrivateProp() {
- Intermediate.writeLateInitPrivateProp("foo")
- println(Intermediate.readLateInitPrivateProp())
+ Intermediate.writeLateInitPrivateProp("foo")
+ println(Intermediate.readLateInitPrivateProp())
}
fun fileProperties_useLateInitInternalProp() {
- Intermediate.writeLateInitInternalProp( "foo")
- println(Intermediate.readLateInitInternalProp())
+ Intermediate.writeLateInitInternalProp("foo")
+ println(Intermediate.readLateInitInternalProp())
}
fun fileProperties_useLateInitPublicProp() {
- Intermediate.writeLateInitPublicProp("foo")
- println(Intermediate.readLateInitPublicProp())
+ Intermediate.writeLateInitPublicProp("foo")
+ println(Intermediate.readLateInitPublicProp())
}
diff --git a/src/test/kotlinR8TestResources/properties/LateInitProperty.kt b/src/test/kotlinR8TestResources/properties/LateInitProperty.kt
index 41c8ab2..b5a2b4e 100644
--- a/src/test/kotlinR8TestResources/properties/LateInitProperty.kt
+++ b/src/test/kotlinR8TestResources/properties/LateInitProperty.kt
@@ -4,55 +4,55 @@
package properties
open class LateInitProperty {
- private lateinit var privateLateInitProp: String
- protected lateinit var protectedLateInitProp: String
- internal lateinit var internalLateInitProp: String
- public lateinit var publicLateInitProp: String
+ private lateinit var privateLateInitProp: String
+ protected lateinit var protectedLateInitProp: String
+ internal lateinit var internalLateInitProp: String
+ public lateinit var publicLateInitProp: String
- fun callSetterPrivateLateInitProp(v: String) {
- privateLateInitProp = v
- }
+ fun callSetterPrivateLateInitProp(v: String) {
+ privateLateInitProp = v
+ }
- fun callGetterPrivateLateInitProp(): String {
- return privateLateInitProp
- }
+ fun callGetterPrivateLateInitProp(): String {
+ return privateLateInitProp
+ }
}
-class SubLateInitProperty: LateInitProperty() {
- fun callSetterProtectedLateInitProp(v: String) {
- protectedLateInitProp = v
- }
+class SubLateInitProperty : LateInitProperty() {
+ fun callSetterProtectedLateInitProp(v: String) {
+ protectedLateInitProp = v
+ }
- fun callGetterProtectedLateInitProp(): String {
- return protectedLateInitProp
- }
+ fun callGetterProtectedLateInitProp(): String {
+ return protectedLateInitProp
+ }
}
fun lateInitProperty_noUseOfProperties() {
- LateInitProperty()
- println("DONE")
+ LateInitProperty()
+ println("DONE")
}
fun lateInitProperty_usePrivateLateInitProp() {
- val obj = LateInitProperty()
- obj.callSetterPrivateLateInitProp("foo")
- println(obj.callGetterPrivateLateInitProp())
+ val obj = LateInitProperty()
+ obj.callSetterPrivateLateInitProp("foo")
+ println(obj.callGetterPrivateLateInitProp())
}
fun lateInitProperty_useProtectedLateInitProp() {
- val obj = SubLateInitProperty()
- obj.callSetterProtectedLateInitProp("foo")
- println(obj.callGetterProtectedLateInitProp())
+ val obj = SubLateInitProperty()
+ obj.callSetterProtectedLateInitProp("foo")
+ println(obj.callGetterProtectedLateInitProp())
}
fun lateInitProperty_useInternalLateInitProp() {
- val obj = LateInitProperty()
- obj.internalLateInitProp = "foo"
- println(obj.internalLateInitProp)
+ val obj = LateInitProperty()
+ obj.internalLateInitProp = "foo"
+ println(obj.internalLateInitProp)
}
fun lateInitProperty_usePublicLateInitProp() {
- val obj = LateInitProperty()
- obj.publicLateInitProp = "foo"
- println(obj.publicLateInitProp)
+ val obj = LateInitProperty()
+ obj.publicLateInitProp = "foo"
+ println(obj.publicLateInitProp)
}
diff --git a/src/test/kotlinR8TestResources/properties/MutableProperty.kt b/src/test/kotlinR8TestResources/properties/MutableProperty.kt
index ae945ff..9582685 100644
--- a/src/test/kotlinR8TestResources/properties/MutableProperty.kt
+++ b/src/test/kotlinR8TestResources/properties/MutableProperty.kt
@@ -4,63 +4,63 @@
package properties
open class MutableProperty {
- private var privateProp: String = "privateProp"
- protected var protectedProp: String = "protectedProp"
- internal var internalProp: String = "internalProp"
- public var publicProp: String = "publicProp"
+ private var privateProp: String = "privateProp"
+ protected var protectedProp: String = "protectedProp"
+ internal var internalProp: String = "internalProp"
+ public var publicProp: String = "publicProp"
- public var primitiveProp: Int = Int.MAX_VALUE
+ public var primitiveProp: Int = Int.MAX_VALUE
- fun callSetterPrivateProp(v: String) {
- privateProp = v
- }
+ fun callSetterPrivateProp(v: String) {
+ privateProp = v
+ }
- fun callGetterPrivateProp(): String {
- return privateProp
- }
+ fun callGetterPrivateProp(): String {
+ return privateProp
+ }
}
class SubMutableProperty : MutableProperty() {
- fun callSetterProtectedProp(v: String) {
- protectedProp = v
- }
+ fun callSetterProtectedProp(v: String) {
+ protectedProp = v
+ }
- fun callGetterProtectedProp(): String {
- return protectedProp
- }
+ fun callGetterProtectedProp(): String {
+ return protectedProp
+ }
}
fun mutableProperty_noUseOfProperties() {
- MutableProperty()
- println("DONE")
+ MutableProperty()
+ println("DONE")
}
fun mutableProperty_usePrivateProp() {
- val obj = MutableProperty()
- obj.callSetterPrivateProp("foo")
- println(obj.callGetterPrivateProp())
+ val obj = MutableProperty()
+ obj.callSetterPrivateProp("foo")
+ println(obj.callGetterPrivateProp())
}
fun mutableProperty_useProtectedProp() {
- val obj = SubMutableProperty()
- obj.callSetterProtectedProp("foo")
- println(obj.callGetterProtectedProp())
+ val obj = SubMutableProperty()
+ obj.callSetterProtectedProp("foo")
+ println(obj.callGetterProtectedProp())
}
fun mutableProperty_useInternalProp() {
- val obj = MutableProperty()
- obj.internalProp = "foo"
- println(obj.internalProp)
+ val obj = MutableProperty()
+ obj.internalProp = "foo"
+ println(obj.internalProp)
}
fun mutableProperty_usePublicProp() {
- val obj = MutableProperty()
- obj.publicProp = "foo"
- println(obj.publicProp)
+ val obj = MutableProperty()
+ obj.publicProp = "foo"
+ println(obj.publicProp)
}
fun mutableProperty_usePrimitiveProp() {
- val obj = MutableProperty()
- obj.primitiveProp = Int.MIN_VALUE
- println(obj.primitiveProp)
+ val obj = MutableProperty()
+ obj.primitiveProp = Int.MIN_VALUE
+ println(obj.primitiveProp)
}
diff --git a/src/test/kotlinR8TestResources/properties/ObjectProperties.kt b/src/test/kotlinR8TestResources/properties/ObjectProperties.kt
index d05e2a6..70d2bee 100644
--- a/src/test/kotlinR8TestResources/properties/ObjectProperties.kt
+++ b/src/test/kotlinR8TestResources/properties/ObjectProperties.kt
@@ -5,72 +5,72 @@
package properties
object ObjectProperties {
- private var privateProp: String = "privateProp"
- internal var internalProp: String = "internalProp"
- public var publicProp: String = "publicProp"
+ private var privateProp: String = "privateProp"
+ internal var internalProp: String = "internalProp"
+ public var publicProp: String = "publicProp"
- private lateinit var privateLateInitProp: String
- internal lateinit var internalLateInitProp: String
- public lateinit var publicLateInitProp: String
+ private lateinit var privateLateInitProp: String
+ internal lateinit var internalLateInitProp: String
+ public lateinit var publicLateInitProp: String
- public var primitiveProp: Int = Int.MAX_VALUE
+ public var primitiveProp: Int = Int.MAX_VALUE
- fun callSetterPrivateProp(v: String) {
- privateProp = v
- }
+ fun callSetterPrivateProp(v: String) {
+ privateProp = v
+ }
- fun callGetterPrivateProp(): String {
- return privateProp
- }
+ fun callGetterPrivateProp(): String {
+ return privateProp
+ }
- fun callSetterLateInitPrivateProp(v: String) {
- privateLateInitProp = v
- }
+ fun callSetterLateInitPrivateProp(v: String) {
+ privateLateInitProp = v
+ }
- fun callGetterLateInitPrivateProp(): String {
- return privateLateInitProp
- }
+ fun callGetterLateInitPrivateProp(): String {
+ return privateLateInitProp
+ }
- fun doNotUseProperties(): String {
- return "doNotUseProperties"
- }
+ fun doNotUseProperties(): String {
+ return "doNotUseProperties"
+ }
}
fun objectProperties_noUseOfProperties() {
- println(ObjectProperties.doNotUseProperties())
+ println(ObjectProperties.doNotUseProperties())
}
fun objectProperties_usePrivateProp() {
- ObjectProperties.callSetterPrivateProp("foo")
- println(ObjectProperties.callGetterPrivateProp())
+ ObjectProperties.callSetterPrivateProp("foo")
+ println(ObjectProperties.callGetterPrivateProp())
}
fun objectProperties_useInternalProp() {
- ObjectProperties.internalProp = "foo"
- println(ObjectProperties.internalProp)
+ ObjectProperties.internalProp = "foo"
+ println(ObjectProperties.internalProp)
}
fun objectProperties_usePublicProp() {
- ObjectProperties.publicProp = "foo"
- println(ObjectProperties.publicProp)
+ ObjectProperties.publicProp = "foo"
+ println(ObjectProperties.publicProp)
}
fun objectProperties_usePrimitiveProp() {
- ObjectProperties.primitiveProp = Int.MIN_VALUE
- println(ObjectProperties.primitiveProp)
+ ObjectProperties.primitiveProp = Int.MIN_VALUE
+ println(ObjectProperties.primitiveProp)
}
fun objectProperties_useLateInitPrivateProp() {
- ObjectProperties.callSetterLateInitPrivateProp("foo")
- println(ObjectProperties.callGetterLateInitPrivateProp())
+ ObjectProperties.callSetterLateInitPrivateProp("foo")
+ println(ObjectProperties.callGetterLateInitPrivateProp())
}
fun objectProperties_useLateInitInternalProp() {
- ObjectProperties.internalLateInitProp = "foo"
- println(ObjectProperties.internalLateInitProp)
+ ObjectProperties.internalLateInitProp = "foo"
+ println(ObjectProperties.internalLateInitProp)
}
fun objectProperties_useLateInitPublicProp() {
- ObjectProperties.publicLateInitProp = "foo"
- println(ObjectProperties.publicLateInitProp)
+ ObjectProperties.publicLateInitProp = "foo"
+ println(ObjectProperties.publicLateInitProp)
}
diff --git a/src/test/kotlinR8TestResources/properties/UserDefinedProperty.kt b/src/test/kotlinR8TestResources/properties/UserDefinedProperty.kt
index 5bc55e6..c92c149 100644
--- a/src/test/kotlinR8TestResources/properties/UserDefinedProperty.kt
+++ b/src/test/kotlinR8TestResources/properties/UserDefinedProperty.kt
@@ -4,19 +4,21 @@
package properties
class UserDefinedProperty() {
- public var durationInMilliSeconds: Int = 0
+ public var durationInMilliSeconds: Int = 0
- var durationInSeconds: Int
- get() = durationInMilliSeconds / 1000
- set(v) { durationInMilliSeconds = v * 1000 }
+ var durationInSeconds: Int
+ get() = durationInMilliSeconds / 1000
+ set(v) {
+ durationInMilliSeconds = v * 1000
+ }
}
fun userDefinedProperty_noUseOfProperties() {
- UserDefinedProperty()
+ UserDefinedProperty()
}
fun userDefinedProperty_useProperties() {
- val obj = UserDefinedProperty()
- obj.durationInSeconds = 5
- println(obj.durationInSeconds)
-}
\ No newline at end of file
+ val obj = UserDefinedProperty()
+ obj.durationInSeconds = 5
+ println(obj.durationInSeconds)
+}
diff --git a/src/test/kotlinR8TestResources/reprocess_merged_lambdas_kstyle/main.kt b/src/test/kotlinR8TestResources/reprocess_merged_lambdas_kstyle/main.kt
index a71b9af..c8375da 100644
--- a/src/test/kotlinR8TestResources/reprocess_merged_lambdas_kstyle/main.kt
+++ b/src/test/kotlinR8TestResources/reprocess_merged_lambdas_kstyle/main.kt
@@ -12,4 +12,4 @@
fun main(args: Array<String>) {
println(consumeOne { consumeOne { consumeOne { _ -> "A" } } })
println(consumeOne { consumeOne { consumeOne { _ -> "B" } } })
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlinR8TestResources/unused_arg_in_lambdas_jstyle/main.kt b/src/test/kotlinR8TestResources/unused_arg_in_lambdas_jstyle/main.kt
index 3302903..850dd67 100644
--- a/src/test/kotlinR8TestResources/unused_arg_in_lambdas_jstyle/main.kt
+++ b/src/test/kotlinR8TestResources/unused_arg_in_lambdas_jstyle/main.kt
@@ -6,20 +6,21 @@
private var COUNT = 0
fun nextInt() = COUNT++
+
fun next() = "${nextInt()}".padStart(3, '0')
fun main(args: Array<String>) {
- multiFunctionLambdaFactory(next(), next(), next())
+ multiFunctionLambdaFactory(next(), next(), next())
}
private data class Local<out T>(val id: T)
-private fun <P1, P2, P3> multiFunctionLambdaFactory(a: P1, b: P2, c:P3) {
- Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, a, b, c)
- Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, c, a, b)
- Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, b, c, a)
+private fun <P1, P2, P3> multiFunctionLambdaFactory(a: P1, b: P2, c: P3) {
+ Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, a, b, c)
+ Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, c, a, b)
+ Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, b, c, a)
- Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, Local(a), b, c)
- Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, Local(b), a, c)
- Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, Local(c), b, a)
+ Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, Local(a), b, c)
+ Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, Local(b), a, c)
+ Lambdas.acceptMultiFunction({ x, _, z -> "$x:unused:$z" }, Local(c), b, a)
}
diff --git a/src/test/kotlinR8TestResources/unused_arg_in_lambdas_kstyle/main.kt b/src/test/kotlinR8TestResources/unused_arg_in_lambdas_kstyle/main.kt
index 04f59b6..3a2c3af 100644
--- a/src/test/kotlinR8TestResources/unused_arg_in_lambdas_kstyle/main.kt
+++ b/src/test/kotlinR8TestResources/unused_arg_in_lambdas_kstyle/main.kt
@@ -9,7 +9,7 @@
private fun next() = "${COUNT++}"
-fun consumeTwo(l: ((x: Any?, unused: Any?) -> Any)) : Any {
+fun consumeTwo(l: ((x: Any?, unused: Any?) -> Any)): Any {
// This can be implicitly added by kotlinc
TypeIntrinsics.beforeCheckcastToFunctionOfArity(l, 2)
return l(next(), next())
diff --git a/src/test/kotlinR8TestResources/unused_singleton/main.kt b/src/test/kotlinR8TestResources/unused_singleton/main.kt
index 6c06b8c..a02789e 100644
--- a/src/test/kotlinR8TestResources/unused_singleton/main.kt
+++ b/src/test/kotlinR8TestResources/unused_singleton/main.kt
@@ -6,8 +6,7 @@
import unused_singleton.TestModule.provideGreeting
internal object TestModule {
- @JvmStatic
- fun provideGreeting() = "Hello"
+ @JvmStatic fun provideGreeting() = "Hello"
}
fun main(args: Array<String>?) {
