tweaking how we resolves return type from SpecificFunctionReferences

HaxeFoundation · Jun 5, 2023 · d49381a · d49381a
1 parent a6be7d7
commit d49381a
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/model/type/HaxeExpressionEvaluator.java b/src/main/java/com/intellij/plugins/haxe/model/type/HaxeExpressionEvaluator.java
@@ -431,11 +431,36 @@ else if (subelement instanceof AbstractHaxeNamedComponent) {
         parameterExpressions = Collections.emptyList();
       }
 
-      if (functionType instanceof SpecificFunctionReference) {
-        SpecificFunctionReference ftype = (SpecificFunctionReference)functionType;
+      if (functionType instanceof SpecificFunctionReference ftype) {
         HaxeExpressionEvaluator.checkParameters(callelement, ftype, parameterExpressions, context, resolver);
 
-        return ftype.getReturnType().duplicate();
+        ResultHolder returnType = ftype.getReturnType();
+        if(returnType.isUnknown() || returnType.isDynamic() || returnType.isVoid()) {
+          return returnType.duplicate();
+        }
+
+        if(returnType.isFunctionType()){
+          return returnType.getFunctionType().createHolder();
+        }
+
+        if(returnType.isClassType() || returnType.isEnumValueType()) {
+          HaxeClassModel model = returnType.getClassType().getHaxeClassModel();
+          if(model == null) {
+            // should not happen but might for literals? (Int?) see UpdateUnknownInGenerics test
+            // this is a fallback to the previous solution for functionTypes
+            return returnType.duplicate();
+          }
+          HaxeClassReference reference = new HaxeClassReference(model, element);
+          if(model.getGenericParams().isEmpty()) {
+            SpecificHaxeClassReference classReference = SpecificHaxeClassReference.withoutGenerics(reference);
+            return new ResultHolder(classReference);
+          } else {
+            SpecificHaxeClassReference classReference = SpecificHaxeClassReference.withGenerics(reference, resolver.getSpecifics());
+            return new ResultHolder(classReference);
+          }
+
+        }
+
       }
 
       if (functionType.isDynamic()) {