diff options
Diffstat (limited to 'org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java')
-rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java index 5fea8a60ff..1ec743ee8b 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/Javadoc.java @@ -150,6 +150,27 @@ public class Javadoc extends ASTNode { } } } + } else if (expression instanceof JavadocModuleReference) { + JavadocModuleReference modRef = (JavadocModuleReference) expression; + if (modRef.typeReference != null) { + if (modRef.typeReference.sourceStart == start) { + return modRef.typeReference; + } + } + } else if (expression instanceof JavadocFieldReference) { + JavadocFieldReference fieldRef = (JavadocFieldReference) expression; + if (fieldRef.receiver instanceof JavadocModuleReference) { + JavadocModuleReference modRef = (JavadocModuleReference) fieldRef.receiver; + if (modRef.sourceStart == start) { + return modRef; + } else { + if (modRef.typeReference != null) { + if (modRef.typeReference.sourceStart == start) { + return modRef.typeReference; + } + } + } + } } } } @@ -487,8 +508,8 @@ public class Javadoc extends ASTNode { ref.resolve(scope); ModuleReference mRef = ref.getModuleReference(); if (mRef != null) { - ModuleBinding mType = mRef.binding; - if (verifyModuleReference(reference, reference, scope, source15, mType, mType.modifiers)) { + ModuleBinding mType = mRef.resolve(scope); + if (mType != null && verifyModuleReference(reference, reference, scope, source15, mType, mType.modifiers)) { TypeReference tRef= ref.getTypeReference(); if ((tRef instanceof JavadocSingleTypeReference || tRef instanceof JavadocQualifiedTypeReference) && tRef.resolvedType instanceof ReferenceBinding) { ReferenceBinding resolvedType = (ReferenceBinding) tRef.resolvedType; |