Skip to content

Fix fragile use of TypeMirror#toString in SpecElementTypeDeterminator #1084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cushon wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −3
Open

Fix fragile use of TypeMirror#toString in SpecElementTypeDeterminator #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d2239d
Fix fragile use of TypeMirror#toString in SpecElementTypeDeterminator
cushon Apr 9, 2026
f63c820
Fix Companion class test
cushon Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...-it/src/test/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

import com.facebook.litho.specmodels.model.SpecElementType;
import com.google.testing.compile.CompilationRule;
import javax.annotation.Nullable;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand All @@ -38,7 +38,7 @@ public class SpecElementTypeDeterminatorTest {
* for.
*/
public static class FakeKotlinSingleton {
@Nullable public static final FakeKotlinSingleton INSTANCE = null;
@NotNull public static final FakeKotlinSingleton INSTANCE = null;
}

@Test
Expand Down
7 changes: 6 additions & 1 deletion ...or/src/main/java/com/facebook/litho/specmodels/processor/SpecElementTypeDeterminator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;

public class SpecElementTypeDeterminator {
static boolean isKotlinSingleton(TypeElement element) {
Expand Down Expand Up @@ -72,6 +75,8 @@ static boolean isPublicStaticFinalElement(Element e) {
}

static boolean isElementWithTypeName(Element e, String name) {
return e.asType().toString().equals(name);
TypeMirror type = e.asType();
return type.getKind() == TypeKind.DECLARED
&& ((TypeElement) ((DeclaredType) type).asElement()).getQualifiedName().contentEquals(name);
}
}
Loading