treating assign to Expr as if it was dynamic

HaxeFoundation · Feb 22, 2024 · 3ee78dc · 3ee78dc
1 parent c25fab0
commit 3ee78dc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/model/type/HaxeTypeCompatible.java b/src/main/java/com/intellij/plugins/haxe/model/type/HaxeTypeCompatible.java
@@ -159,6 +159,8 @@ static public boolean canAssignToFrom(
         from = classReference.fullyResolveTypeDefAndUnwrapNullTypeReference();
       }
     }
+    // We allow any expression to be assign to Expr and treating it kinda like Dynamic as we currently dont have any real way of type compare.
+    if (to.isExpr())return true;
     if (to.isAny()) return true;
     if (to.isDynamic() || from.isDynamic()) return true;
     if (to.isEnumValueClass() && isEnum(from)) return true;

diff --git a/src/main/java/com/intellij/plugins/haxe/model/type/SpecificHaxeClassReference.java b/src/main/java/com/intellij/plugins/haxe/model/type/SpecificHaxeClassReference.java
@@ -290,8 +290,6 @@ public ResultHolder access(String name, HaxeExpressionEvaluatorContext context,
     return null;
   }
 
-  public void isExprOf() {
-  }
 
   public enum Compatibility {
     ASSIGNABLE_TO,   // Assignable via @:to or "to <Type>" on an abstract.

diff --git a/src/main/java/com/intellij/plugins/haxe/model/type/SpecificTypeReference.java b/src/main/java/com/intellij/plugins/haxe/model/type/SpecificTypeReference.java
@@ -613,4 +613,11 @@ private static boolean hasSameQualifiedInfo(HaxeClassModel thisModel, HaxeClassM
   }
 
 
+  public boolean isExpr() {
+     if (this instanceof SpecificHaxeClassReference classReference) {
+       HaxeClass aClass = classReference.getHaxeClass();
+       return aClass != null && aClass.getQualifiedName().equalsIgnoreCase("haxe.macro.Expr");
+     }
+    return false;
+  }
 }