diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:06:44 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 01:06:44 +0000 |
commit | 528201492371d0e43dc1ceaa0cad22c0ae690d36 (patch) | |
tree | 0baa92251e9c2c2d2522d953021138893ae84133 /java/com/google/turbine/type/Type.java | |
parent | f8ef2ae5e79b3ca6ed5f1bcae0550ff0491b9933 (diff) | |
parent | d4be1f10b831f4c3774091c74e4b904ec6450c9a (diff) | |
download | turbine-aml_wif_341410080.tar.gz |
Snap for 10447354 from d4be1f10b831f4c3774091c74e4b904ec6450c9a to mainline-wifi-releaseaml_wif_341711020aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010android14-mainline-wifi-release
Change-Id: I99a8d37bfdd2a99732d853191173908eb094c683
Diffstat (limited to 'java/com/google/turbine/type/Type.java')
-rw-r--r-- | java/com/google/turbine/type/Type.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/java/com/google/turbine/type/Type.java b/java/com/google/turbine/type/Type.java index 085346a..5fbf1b1 100644 --- a/java/com/google/turbine/type/Type.java +++ b/java/com/google/turbine/type/Type.java @@ -17,6 +17,7 @@ package com.google.turbine.type; import static com.google.common.collect.Iterables.getLast; +import static java.lang.Math.max; import static java.util.Objects.requireNonNull; import com.google.auto.value.AutoValue; @@ -144,15 +145,23 @@ public interface Type { StringBuilder sb = new StringBuilder(); boolean first = true; for (SimpleClassTy c : classes()) { - for (AnnoInfo anno : c.annos()) { - sb.append(anno); - sb.append(' '); - } + String binaryName = c.sym().binaryName(); if (!first) { + for (AnnoInfo anno : c.annos()) { + sb.append(anno); + sb.append(' '); + } sb.append('.'); - sb.append(c.sym().binaryName().substring(c.sym().binaryName().lastIndexOf('$') + 1)); + sb.append(binaryName, binaryName.lastIndexOf('$') + 1, binaryName.length()); } else { - sb.append(c.sym().binaryName().replace('/', '.').replace('$', '.')); + int idx = max(binaryName.lastIndexOf('/'), binaryName.lastIndexOf('$')) + 1; + String name = binaryName.replace('/', '.').replace('$', '.'); + sb.append(name, 0, idx); + for (AnnoInfo anno : c.annos()) { + sb.append(anno); + sb.append(' '); + } + sb.append(name, idx, name.length()); } if (!c.targs().isEmpty()) { sb.append('<'); |