Skip to content

Commit

Permalink
Fix NPE when a resolving a class that didn't have a specialization. (…
Browse files Browse the repository at this point in the history
…See issue HaxeFoundation#936.)
  • Loading branch information
EricBishton committed Jul 17, 2019
1 parent c022130 commit c56c778
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,9 @@ private static List<? extends PsiElement> resolveByClassAndSymbol(@Nullable Haxe
if (leftClass.isAbstract()) {
HaxeAbstractClassModel model = (HaxeAbstractClassModel)leftClass.getModel();
if (model.isForwarded(reference.getReferenceName())) {
final HaxeClass underlyingClass = model.getUnderlyingClass(reference.getSpecialization().toGenericResolver(leftClass));
HaxeGenericSpecialization specialization = reference.getSpecialization();
HaxeGenericResolver resolver = specialization != null ? specialization.toGenericResolver(leftClass) : null;
final HaxeClass underlyingClass = model.getUnderlyingClass(resolver);
if (underlyingClass != null) {
member = underlyingClass.getModel().getMember(reference.getReferenceName());
if (member != null) {
Expand Down

0 comments on commit c56c778

Please sign in to comment.