Skip to content

Commit cb1d4b7

Browse files
committed
Fix NPE when a resolving a class that didn't have a specialization. (See issue #936.)
1 parent bb158c5 commit cb1d4b7

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/common/com/intellij/plugins/haxe/lang/psi/HaxeResolver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,9 @@ private static List<? extends PsiElement> resolveByClassAndSymbol(@Nullable Haxe
430430
if (leftClass.isAbstract()) {
431431
HaxeAbstractClassModel model = (HaxeAbstractClassModel)leftClass.getModel();
432432
if (model.isForwarded(reference.getReferenceName())) {
433-
final HaxeClass underlyingClass = model.getUnderlyingClass(reference.getSpecialization().toGenericResolver(leftClass));
433+
HaxeGenericSpecialization specialization = reference.getSpecialization();
434+
HaxeGenericResolver resolver = specialization != null ? specialization.toGenericResolver(leftClass) : null;
435+
final HaxeClass underlyingClass = model.getUnderlyingClass(resolver);
434436
if (underlyingClass != null) {
435437
member = underlyingClass.getModel().getMember(reference.getReferenceName());
436438
if (member != null) {

0 commit comments

Comments
 (0)