Merge pull request #1082 from m0rkeulv/feature/1081-resolver-fix

Dont try to resolve generics for classes that dont have generics.
HaxeFoundation · Feb 27, 2021 · be81f2b · be81f2b
2 parents acbe1b2 + 0b32853
commit be81f2b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/common/com/intellij/plugins/haxe/lang/psi/HaxeClassResolveResult.java b/src/common/com/intellij/plugins/haxe/lang/psi/HaxeClassResolveResult.java
@@ -290,10 +290,13 @@ public SpecificHaxeClassReference getSpecificClassReference(@NotNull PsiElement
     HaxeClassReference classReference = null != clazz ? new HaxeClassReference(clazz, context)
                                         : new HaxeClassReference(SpecificHaxeClassReference.UNKNOWN, context);
     HaxeClass clazzPsi = null != clazz ? clazz.getPsi() : null;
-
     softMerge(HaxeGenericSpecialization.fromGenericResolver(clazzPsi, resolver));
-    HaxeGenericResolver newResolver = getGenericResolver();
-    return SpecificHaxeClassReference.withGenerics(classReference, newResolver.getSpecificsFor(clazzPsi));
+    if(classReference.getHaxeClass().isGeneric()) {
+      HaxeGenericResolver newResolver = getGenericResolver();
+      return SpecificHaxeClassReference.withGenerics(classReference, newResolver.getSpecificsFor(clazzPsi));
+    }else {
+      return SpecificHaxeClassReference.withoutGenerics(classReference);
+    }
   }
 
   public void specialize(@Nullable PsiElement element) {