avoid NPE for searchReferencesForTypeParameters when type is not Clas…

…sReference
HaxeFoundation · Sep 15, 2024 · ed3d3f2 · ed3d3f2
1 parent 1c6b08e
commit ed3d3f2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/com/intellij/plugins/haxe/model/evaluator/HaxeExpressionUsageUtil.java b/src/main/java/com/intellij/plugins/haxe/model/evaluator/HaxeExpressionUsageUtil.java
@@ -92,8 +92,9 @@ public static ResultHolder searchReferencesForTypeParameters(final HaxeComponent
                                                                final HaxeExpressionEvaluatorContext context,
                                                                final HaxeGenericResolver resolver, ResultHolder resultHolder, int continueFrom) {
     resultHolder = resultHolder.duplicate();
-    SpecificHaxeClassReference type = resultHolder.getClassType();
-    SpecificHaxeClassReference classType = type;
+    SpecificHaxeClassReference classType = resultHolder.getClassType();
+    // TODO should we support functions here ?
+    if (classType == null) return resultHolder;
 
     HaxeGenericResolver classResolver = classType.getGenericResolver();
     PsiSearchHelper searchHelper = PsiSearchHelper.getInstance(componentName.getProject());
@@ -128,11 +129,11 @@ public static ResultHolder searchReferencesForTypeParameters(final HaxeComponent
         }
 
         if (parent instanceof HaxeArrayAccessExpression arrayAccessExpression) {
-          tryUpdateTypeParamFromArrayAccess(context, resolver, arrayAccessExpression, classType, classResolver, type);
+          tryUpdateTypeParamFromArrayAccess(context, resolver, arrayAccessExpression, classType, classResolver, classType);
         }
 
         if (parent instanceof HaxeObjectLiteralElement literalElement) {
-          tryUpdateTypePAramFromOjbectLiteral(context, resolver, literalElement, type);
+          tryUpdateTypePAramFromOjbectLiteral(context, resolver, literalElement, classType);
         }
       }
       isFirst = false;