NPE fix + update changelog

HaxeFoundation · Jan 7, 2024 · e3e2d44 · e3e2d44
1 parent 820805d
commit e3e2d44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 1.4.22
 * Added: Support for resolving & completion for typeParameters with anonymous structures.
+* Added: Check argument types in call expressions for functionTypes from typeParameters.
 * Improvement: better handling of import statements with aliases. 
 * Misc NPE fixes.
 

diff --git a/src/main/java/com/intellij/plugins/haxe/lang/psi/HaxeResolveResult.java b/src/main/java/com/intellij/plugins/haxe/lang/psi/HaxeResolveResult.java
@@ -471,6 +471,7 @@ public void specializeByParameters(@Nullable List<PsiElement> typeList) {
       final PsiElement specializedType = typeList.get(i);
 
       if (genericParamName == null) continue;
+      if (specializedType == null) continue;
 
       final HaxeResolveResult specializedTypeResult = HaxeResolveUtil.getHaxeClassResolveResult(specializedType, specialization);
       if(specializedTypeResult.getHaxeClass() != null) {
@@ -479,10 +480,10 @@ public void specializeByParameters(@Nullable List<PsiElement> typeList) {
       else if(specializedTypeResult.getFunctionType() != null) {
         specialization.put(haxeClass, genericParamName, specializedTypeResult);
       }else {
-        //TODO: Experimental (adding fake haxeClass for generic types that are not connected to nay type yet)
-        HaxeClassWrapperForTypeParameter aClass = new HaxeClassWrapperForTypeParameter(specializedType.getNode(), List.of());
-        HaxeResolveResult result = HaxeResolveResult.create(aClass, new HaxeGenericSpecialization());
-        specialization.put(haxeClass, genericParamName, result);
+          //TODO: Experimental (adding fake haxeClass for generic types that are not connected to any type yet)
+          HaxeClassWrapperForTypeParameter aClass = new HaxeClassWrapperForTypeParameter(specializedType.getNode(), List.of());
+          HaxeResolveResult result = HaxeResolveResult.create(aClass, new HaxeGenericSpecialization());
+          specialization.put(haxeClass, genericParamName, result);
       }
 
     }