Add deprecated modifier when indexing from DOM

Author: mickaelistria

org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/indexing/DOMToIndexVisitor.java

@@ -56,13 +56,13 @@ public boolean visit(TypeDeclaration type) {
 				.map(String::toCharArray)
 				.toArray(char[][]::new);
 		if (type.isInterface()) {
-			this.sourceIndexer.addInterfaceDeclaration(type.getModifiers(), this.packageName, simpleName(type.getName()), enclosing, ((List<Type>)type.superInterfaceTypes()).stream().map(this::name).toArray(char[][]::new), parameterTypeSignatures, isSecondary(type));
+			this.sourceIndexer.addInterfaceDeclaration(type.getModifiers() | maybeDeprecated(type), this.packageName, simpleName(type.getName()), enclosing, ((List<Type>)type.superInterfaceTypes()).stream().map(this::name).toArray(char[][]::new), parameterTypeSignatures, isSecondary(type));
 		} else {
-			this.sourceIndexer.addClassDeclaration(type.getModifiers(), this.packageName, simpleName(type.getName()), enclosing, type.getSuperclassType() == null ? null : name(type.getSuperclassType()),
+			this.sourceIndexer.addClassDeclaration(type.getModifiers() | maybeDeprecated(type), this.packageName, simpleName(type.getName()), enclosing, type.getSuperclassType() == null ? null : name(type.getSuperclassType()),
 				((List<Type>)type.superInterfaceTypes()).stream().map(this::name).toArray(char[][]::new), parameterTypeSignatures, isSecondary(type));
 			if (type.bodyDeclarations().stream().noneMatch(member -> member instanceof MethodDeclaration method && method.isConstructor())) {
 				this.sourceIndexer.addDefaultConstructorDeclaration(type.getName().getIdentifier().toCharArray(),
-						this.packageName, type.getModifiers(), 0);
+						this.packageName, type.getModifiers() | maybeDeprecated(type), 0);
 			}
 			if (type.getSuperclassType() != null) {
 				this.sourceIndexer.addConstructorReference(name(type.getSuperclassType()), 0);
@@ -80,7 +80,7 @@ public void endVisit(TypeDeclaration type) {
 	@Override
 	public boolean visit(EnumDeclaration type) {
 		char[][] enclosing = this.enclosingTypes.stream().map(AbstractTypeDeclaration::getName).map(SimpleName::getIdentifier).map(String::toCharArray).toArray(char[][]::new);
-		this.sourceIndexer.addEnumDeclaration(type.getModifiers(), this.packageName, type.getName().getIdentifier().toCharArray(), enclosing, Enum.class.getName().toCharArray(), ((List<Type>)type.superInterfaceTypes()).stream().map(this::name).toArray(char[][]::new), isSecondary(type));
+		this.sourceIndexer.addEnumDeclaration(type.getModifiers() | maybeDeprecated(type), this.packageName, type.getName().getIdentifier().toCharArray(), enclosing, Enum.class.getName().toCharArray(), ((List<Type>)type.superInterfaceTypes()).stream().map(this::name).toArray(char[][]::new), isSecondary(type));
 		this.enclosingTypes.add(type);
 		return true;
 	}
@@ -98,7 +98,7 @@ public boolean visit(EnumConstantDeclaration enumConstant) {
 	@Override
 	public boolean visit(AnnotationTypeDeclaration type) {
 		char[][] enclosing = this.enclosingTypes.stream().map(AbstractTypeDeclaration::getName).map(SimpleName::getIdentifier).map(String::toCharArray).toArray(char[][]::new);
-		this.sourceIndexer.addAnnotationTypeDeclaration(type.getModifiers(), this.packageName, type.getName().getIdentifier().toCharArray(), enclosing, isSecondary(type));
+		this.sourceIndexer.addAnnotationTypeDeclaration(type.getModifiers() | maybeDeprecated(type), this.packageName, type.getName().getIdentifier().toCharArray(), enclosing, isSecondary(type));
 		this.enclosingTypes.add(type);
 		return true;
 	}
@@ -116,7 +116,7 @@ private boolean isSecondary(AbstractTypeDeclaration type) {
 	public boolean visit(RecordDeclaration recordDecl) {
 		this.enclosingTypes.add(recordDecl);
 		// copied processing of TypeDeclaration
-		this.sourceIndexer.addClassDeclaration(recordDecl.getModifiers(), this.packageName, recordDecl.getName().getIdentifier().toCharArray(), null, null,
+		this.sourceIndexer.addClassDeclaration(recordDecl.getModifiers() | maybeDeprecated(recordDecl), this.packageName, recordDecl.getName().getIdentifier().toCharArray(), null, null,
 				((List<Type>)recordDecl.superInterfaceTypes()).stream().map(this::name).toArray(char[][]::new), null, false);
 		return true;
 	}
@@ -155,7 +155,7 @@ public boolean visit(MethodDeclaration method) {
 					parameterTypes,
 					parameterNames,
 					returnType,
-					method.getModifiers(),
+					method.getModifiers() | maybeDeprecated(method),
 					this.packageName,
 					0 /* TODO What to put here? */,
 					exceptionTypes,
@@ -164,7 +164,7 @@ public boolean visit(MethodDeclaration method) {
 		} else {
 			this.sourceIndexer.addConstructorDeclaration(method.getName().getFullyQualifiedName().toCharArray(),
 					method.parameters().size(),
-					null, parameterTypes, parameterNames, method.getModifiers(), this.packageName, currentType().getModifiers(), exceptionTypes, 0);
+					null, parameterTypes, parameterNames, method.getModifiers() | maybeDeprecated(method), this.packageName, currentType().getModifiers(), exceptionTypes, 0);
 		}
 		return true;
 	}
@@ -339,7 +339,6 @@ public boolean visit(SimpleName name) {
 	// TODO (cf SourceIndexer and SourceIndexerRequestor)
 	// * Lambda: addIndexEntry/addClassDeclaration
 	// * FieldReference
-	// * Deprecated
 
 	@Override
 	public boolean visit(MethodRef methodRef) {
@@ -423,4 +422,28 @@ public boolean visit(OpensDirective node) {
 		return true;
 	}
 
+	private int maybeDeprecated(BodyDeclaration declaration) {
+		return hasDeprecated(declaration.modifiers()) || hasDeprecated(declaration.getJavadoc()) ? org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants.AccDeprecated : 0;
+	}
+	private boolean hasDeprecated(List<?> modifiers) {
+		if (modifiers == null) {
+			return false;
+		}
+		return modifiers.stream()
+				.filter(Annotation.class::isInstance)
+				.map(Annotation.class::cast)
+				.map(Annotation::getTypeName)
+				.map(Name::getFullyQualifiedName)
+				.anyMatch("Deprecated"::equals);
+	}
+	private boolean hasDeprecated(Javadoc javadoc) {
+		if (javadoc == null) {
+			return false;
+		}
+		return ((List<?>)javadoc.tags()).stream()
+				.filter(TagElement.class::isInstance)
+				.map(TagElement.class::cast)
+				.map(TagElement::getTagName)
+				.anyMatch(TagElement.TAG_DEPRECATED::equals);
+	}
 }