#1477 refinements after PR

immutables · Aug 27, 2023 · c643bef · c643bef
1 parent 27850d8
commit c643bef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/value-fixture/src-java-11/org/immutables/fixture/module/subpackage/HasModuleField.java b/value-fixture/src-java-11/org/immutables/fixture/module/subpackage/HasModuleField.java
@@ -3,9 +3,8 @@
 import org.immutables.fixture.module.Module;
 import org.immutables.value.Value;
 
-
 @Value.Immutable
 @Value.Style(headerComments = true)
 public interface HasModuleField {
-        Module getModule();
+  Module getModule();
 }
diff --git a/value-processor/src/org/immutables/value/processor/meta/TypeStringProvider.java b/value-processor/src/org/immutables/value/processor/meta/TypeStringProvider.java
@@ -174,13 +174,19 @@ private void appendResolved(DeclaredType type) {
       }
 
       hasMaybeUnresolvedYetAfter |= importsResolver.unresolved;
-    } else if (typeName.equals("java.lang." + typeElement.getSimpleName())) {
-      // Because java.lang is automatically imported, you can have type names that are "resolved,"
+    } else if (typeName.startsWith("java.lang.")) {// saves on concat & other ops
+      // Because java.lang is automatically imported,
+      // you can have type names that are "resolved,"
       // but aren't the names that are actually imported in the source file
-      String simpleName = type.asElement().getSimpleName().toString();
-      String guessedName = importsResolver.apply(simpleName);
-      if (!importsResolver.unresolved) {
-        typeName = guessedName;
+      String simpleName = typeElement.getSimpleName().toString();
+      // The only problem I might worry about is
+      // if we have java.lang.Something.Inner.InThere, however unlikely,
+      // and my brain is unable to understand if that is relevant or not for this case
+      if (typeName.equals("java.lang." + simpleName)) {
+        String guessedName = importsResolver.apply(simpleName);
+        if (!importsResolver.unresolved) {
+          typeName = guessedName;
+        }
       }
     }