bugfix: fully resolve type before attempting to test operators

HaxeFoundation · Jul 15, 2024 · c35e3c7 · c35e3c7
1 parent 23c07eb
commit c35e3c7
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/model/type/HaxeOperatorResolver.java b/src/main/java/com/intellij/plugins/haxe/model/type/HaxeOperatorResolver.java
@@ -38,11 +38,14 @@ static public SpecificTypeReference getBinaryOperatorResult(
 
     // while normal abstracts should not be resolved to underlying type, there's an exception for Null<T>
     // in this case we just "unwrap"  without trying to resolve
-    if (left.isNullType()) {
-      left = ((SpecificHaxeClassReference)left).getSpecifics()[0].getType();
+
+    if (left instanceof SpecificHaxeClassReference classReference && (classReference.isTypeDef()|| classReference.isNullType() )) {
+      SpecificTypeReference resolved = classReference.fullyResolveTypeDefAndUnwrapNullTypeReference();
+      if (resolved != null) left = resolved;
     }
-    if (right.isNullType()) {
-      right = ((SpecificHaxeClassReference)right).getSpecifics()[0].getType();
+    if (right instanceof SpecificHaxeClassReference classReference && (classReference.isTypeDef()|| classReference.isNullType() )) {
+      SpecificTypeReference resolved = classReference.fullyResolveTypeDefAndUnwrapNullTypeReference();
+      if (resolved != null) right = resolved;
     }
 
     SpecificHaxeClassReference intRef = SpecificHaxeClassReference.getInt(elementContext);