Bugfixes: allow logical operators for enumValues (to support pattern …

…matching with EnumValue.match()) and fixing bug with canAssign for abstract enums
HaxeFoundation · Jul 15, 2024 · c03a406 · c03a406
1 parent 5805cf2
commit c03a406
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
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
@@ -69,6 +69,11 @@ static public SpecificTypeReference getBinaryOperatorResult(
       if (operator.equals("/")) result = SpecificHaxeClassReference.getFloat( elementContext);
     }
 
+    // avoid marking Enum Patterns as errors (EnumValue.match accepts these inputs)
+    boolean bothAreEnumValues = left.isEnumValue() && right.isEnumValue();
+    if (bothAreEnumValues && (operator.equals("&") || operator.equals("|"))) {
+     return SpecificHaxeClassReference.getDynamic(elementContext);
+    }
 
     if (canAssignLeftToInt && canAssignRightToInt) {
       if (operator.equals("<<")

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
@@ -232,7 +232,9 @@ static public boolean canAssignToFrom(
             PsiElement commonParent = PsiTreeUtil.findCommonParent(reference.context, haxeClass);
             if (commonParent == haxeClass) {
               SpecificTypeReference underlyingType = haxeClass.getModel().getUnderlyingType();
-              return canAssignToFrom(underlyingType, from);
+              boolean canAssignToUnderlying = canAssignToFrom(underlyingType, from);
+              // we only return true when allowed,  we continue checks below if not as the assign might be Enum to Enum (and not underlying to enum)
+              if (canAssignToUnderlying) return true;
             }
           }
         }