commit b0c201baa0c6e28ae312d933511c7caf6e3ac340
author Sebastien Hertz <shertz@google.com> Mon Feb 12 12:51:13 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 12 12:51:13 2018 +0000
tree fafda3bd7536acb871bb118ca1759e00a58e35ee
parent 4be2c525f29d9dc53283864a774e7481a6cb83c7
parent 791f201c9707926ad7eaf9ea1c8f9e4fbba1ee3b

Merge "Fix Kotlin getter name in tests"

src/test/java/com/android/tools/r8/kotlin/KotlinClass.java

diff --git a/src/test/java/com/android/tools/r8/kotlin/KotlinClass.java b/src/test/java/com/android/tools/r8/kotlin/KotlinClass.java
index 602c992..87ffcef 100644
--- a/src/test/java/com/android/tools/r8/kotlin/KotlinClass.java
+++ b/src/test/java/com/android/tools/r8/kotlin/KotlinClass.java
@@ -63,7 +63,15 @@
 
   public MemberNaming.MethodSignature getGetterForProperty(String name) {
     String type = getProperty(name).type;
-    String getterName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
+    String getterName;
+    if (name.length() > 2 && name.startsWith("is")
+        && (name.charAt(2) == '_' || Character.isUpperCase(name.charAt(2)))) {
+      // Getter for property "isAbc" is "isAbc".
+      getterName = name;
+    } else {
+      // Getter for property "abc" is "getAbc".
+      getterName = "get" + Character.toUpperCase(name.charAt(0)) + name.substring(1);
+    }
     return new MemberNaming.MethodSignature(getterName, type, Collections.emptyList());
   }
 }