"hack" to get generic resolver from call expression when trying to re…

…solve parameter type
HaxeFoundation · Mar 25, 2024 · 417c798 · 417c798
1 parent be185ab
commit 417c798
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 ## 1.4.47
 * Fixed: attempt at fixing incorrect sorting of Project roots
-* 
+* Improvement: Better type resolve for parameters without type tag in functionLiterals
 
 
 ## 1.4.46

diff --git a/src/main/java/com/intellij/plugins/haxe/lang/psi/impl/HaxeReferenceImpl.java b/src/main/java/com/intellij/plugins/haxe/lang/psi/impl/HaxeReferenceImpl.java
@@ -939,8 +939,21 @@ public static ResultHolder tryToFindTypeFromCallExpression(HaxeFunctionLiteral l
             int parameterMappedToArgument = parameterList.getParameterList().indexOf(parameter);
             List<SpecificFunctionReference.Argument> arguments = functionType.getArguments();
             SpecificFunctionReference.Argument argument = arguments.get(parameterMappedToArgument);
-
-            HaxeGenericResolver parentExpResolver = getGenericResolverFromParentExpression(callExpression);
+            // this is an ugly hack to get a resolver from callexpression without causing a stack overflow as this parameter could be
+            // a type parameter that the resolver needs to resolve, if we notice that we are resolving multiple times we try to only use
+            //  parent genericResolver values or allow this second pass to return unknown so that any other parameters can populate
+            //  the generic resolver
+            HaxeGenericResolver parentExpResolver = null;
+            try {
+              if (genericResolverHelper.get() == callExpression) {
+                parentExpResolver = getGenericResolverFromParentExpression(callExpression);
+              }else {
+                genericResolverHelper.set(callExpression);
+                parentExpResolver = HaxeGenericResolverUtil.generateResolverFromScopeParents(callExpression);
+              }
+            }finally{
+              genericResolverHelper.remove();
+            }
             ResultHolder resolved = parentExpResolver.resolve(argument.getType());
             if (resolved != null && !resolved.isUnknown()) return resolved.getType().createHolder();
 
@@ -950,6 +963,7 @@ public static ResultHolder tryToFindTypeFromCallExpression(HaxeFunctionLiteral l
     }
     return null;
   }
+  private static ThreadLocal<HaxeCallExpression> genericResolverHelper = new ThreadLocal<>();
 
   private static HaxeGenericResolver getGenericResolverFromParentExpression(HaxeCallExpression callExpression) {
     @NotNull PsiElement[] children = callExpression.getChildren();