From 967ef9f05e2ad811ca57300859a9fdcc2eeedbe7 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 25 Apr 2017 15:22:50 +0300 Subject: [PATCH] javac ast indices: do not add a reference to index when qualifier type is not resolved --- .../src/org/jetbrains/jps/javac/ast/api/JavacRef.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java index ded777e6799d..7847c43a7234 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java @@ -19,6 +19,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.lang.model.element.*; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; import java.util.Set; public interface JavacRef { @@ -149,6 +151,12 @@ public interface JavacRef { @Nullable public static JavacElementRefBase fromElement(Element element, Element qualifier, JavacNameTable nameTableCache) { + if (qualifier != null) { + TypeMirror type = qualifier.asType(); + if (type == null || type.getKind() == TypeKind.NONE) { + return null; + } + } if (element instanceof TypeElement) { return new JavacElementClassImpl(element, qualifier, nameTableCache); }