GH-1375: added ast node to signature of annotation completion providers to prepare for deeper analysis features

martinlippert · martinlippert · commit 2dffa3af0d10 · 2024-10-11T13:11:43.000+02:00
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProcessor.java
@@ -134,7 +134,7 @@ private void createCompletionProposals(IJavaProject project, TextDocument doc, A
 		AnnotationAttributeCompletionProvider completionProvider = this.completionProviders.get(attributeName);
 		if (completionProvider != null) {
 
-			Map<String, String> proposals = completionProvider.getCompletionCandidates(project);
+			Map<String, String> proposals = completionProvider.getCompletionCandidates(project, node);
 			Map<String, String> filteredProposals = proposals.entrySet().stream()
 					.filter(candidate -> candidate.getKey().toLowerCase().contains(filterPrefix.toLowerCase()))
 					.filter(candidate -> !alreadyMentionedValues.contains(candidate.getKey()))
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/annotations/AnnotationAttributeCompletionProvider.java
@@ -12,10 +12,11 @@
 
 import java.util.Map;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 
 public interface AnnotationAttributeCompletionProvider {
 	
-	Map<String, String> getCompletionCandidates(IJavaProject project);
+	Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node);
 
 }
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanNamesCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanNamesCompletionProcessor.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -32,7 +33,7 @@ public BeanNamesCompletionProcessor(SpringMetamodelIndex springIndex) {
     }
 
     @Override
-    public Map<String, String> getCompletionCandidates(IJavaProject project) {
+    public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
         Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
         return Arrays.stream(beans)
                 .map(Bean::getName)
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanTypesCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeanTypesCompletionProcessor.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.beans;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -32,7 +33,7 @@ public BeanTypesCompletionProcessor(SpringMetamodelIndex springIndex) {
     }
 
     @Override
-    public Map<String, String> getCompletionCandidates(IJavaProject project) {
+    public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
         Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
         return Arrays.stream(beans)
                 .map(Bean::getType)
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -237,7 +238,7 @@ public DependsOnCompletionProcessor(SpringMetamodelIndex springIndex) {
 //	}
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project) {
+	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
 		return Arrays.stream(this.springIndex.getBeansOfProject(project.getElementName()))
 				.map(bean -> bean.getName())
 				.distinct()
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/NamedCompletionProvider.java
@@ -16,6 +16,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
@@ -34,7 +35,7 @@ public NamedCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 	
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project) {
+	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ProfileCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ProfileCompletionProvider.java
@@ -16,6 +16,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
@@ -34,7 +35,7 @@ public ProfileCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 	
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project) {
+	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProvider.java
@@ -16,6 +16,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
@@ -34,7 +36,7 @@ public QualifierCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 	
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project) {
+	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ResourceCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ResourceCompletionProvider.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.index.SpringMetamodelIndex;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -32,7 +33,7 @@ public ResourceCompletionProvider(SpringMetamodelIndex springIndex) {
 	}
 	
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project) {
+	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
 
 		Bean[] beans = this.springIndex.getBeansOfProject(project.getElementName());
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionalonresource/ConditionalOnResourceCompletionProcessor.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.commons.java.IClasspathUtil;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -42,7 +43,7 @@ public int compare(String o1, String o2) {
     }
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project) {
+	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
 		return findResources(project);
 	}
 
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/cron/CronExpressionCompletionProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/cron/CronExpressionCompletionProvider.java
@@ -13,6 +13,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 
@@ -49,7 +50,7 @@ public class CronExpressionCompletionProvider implements AnnotationAttributeComp
 
 
     @Override
-    public Map<String, String> getCompletionCandidates(IJavaProject project) {
+    public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
         return CRON_EXPRESSIONS_MAP;
     }
 }
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/scope/ScopeCompletionProcessor.java
@@ -13,6 +13,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.eclipse.jdt.core.dom.ASTNode;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 
@@ -34,7 +35,7 @@ public class ScopeCompletionProcessor implements AnnotationAttributeCompletionPr
 	} 
 
 	@Override
-	public Map<String, String> getCompletionCandidates(IJavaProject project) {
+	public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {
 		return SCOPE_COMPLETIONS;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,11 @@`
`12`	`12`
`13`	`13`	`import java.util.Map;`
`14`	`14`
	`15`	`+import org.eclipse.jdt.core.dom.ASTNode;`
`15`	`16`	`import org.springframework.ide.vscode.commons.java.IJavaProject;`
`16`	`17`
`17`	`18`	`public interface AnnotationAttributeCompletionProvider {`
`18`	`19`
`19`		`- Map<String, String> getCompletionCandidates(IJavaProject project);`
	`20`	`+ Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node);`
`20`	`21`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`import java.util.Map;`
`17`	`17`	`import java.util.stream.Collectors;`
`18`	`18`
	`19`	`+import org.eclipse.jdt.core.dom.ASTNode;`
`19`	`20`	`import org.springframework.ide.vscode.boot.java.annotations.AnnotationAttributeCompletionProvider;`
`20`	`21`	`import org.springframework.ide.vscode.commons.java.IClasspathUtil;`
`21`	`22`	`import org.springframework.ide.vscode.commons.java.IJavaProject;`
`@@ -42,7 +43,7 @@ public int compare(String o1, String o2) {`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`@Override`
`45`		`- public Map<String, String> getCompletionCandidates(IJavaProject project) {`
	`46`	`+ public Map<String, String> getCompletionCandidates(IJavaProject project, ASTNode node) {`
`46`	`47`	`return findResources(project);`
`47`	`48`	`}`
`48`	`49`