remove redundant parse all spel expressions logic

Author: vudayani

headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/spel/SpelDefinitionProvider.java

@@ -96,64 +96,41 @@ public List<LocationLink> getDefinitions(CancelChecker cancelToken, IJavaProject
 		if (n instanceof StringLiteral) {
 			StringLiteral valueNode = (StringLiteral) n;
 			ASTNode parent = ASTUtils.getNearestAnnotationParent(valueNode);
-
 			if (parent != null && parent instanceof Annotation) {
+				List<LocationLink> locationLink = new ArrayList<>();
 				Annotation a = (Annotation) parent;
 				IAnnotationBinding binding = a.resolveAnnotationBinding();
 				if (binding != null && binding.getAnnotationType() != null
 						&& Annotations.VALUE.equals(binding.getAnnotationType().getQualifiedName())) {
-					return parseSpelAndFetchLocation(cancelToken, project, cu, offset);
+					Arrays.stream(spelExtractors).map(e -> {
+						if (a instanceof SingleMemberAnnotation)
+							return e.getSpelRegion((SingleMemberAnnotation) a);
+						else if (a instanceof NormalAnnotation)
+							return e.getSpelRegion((NormalAnnotation) a);
+						return Optional.<Snippet>empty();
+					}).filter(o -> o.isPresent()).map(o -> o.get())
+					.filter(snippet -> {
+						int tokenEndIndex = snippet.offset() + snippet.text().length();
+						return snippet.offset() <= (offset) && (offset) <= tokenEndIndex;
+					}).forEach(snippet -> {
+						List<TokenData> beanReferenceTokens = computeTokens(snippet, offset);
+						if (beanReferenceTokens != null && beanReferenceTokens.size() > 0) {
+							locationLink.addAll(findLocationLinksForBeanRef(project, offset, beanReferenceTokens));
+						}
+
+						Optional<Tuple2<String, String>> result = parseAndExtractMethodClassPairFromSpel(snippet,
+								offset);
+						result.ifPresent(tuple -> {
+							locationLink.addAll(findLocationLinksForMethodRef(tuple.getT1(), tuple.getT2(), project));
+						});
+					});
+					return locationLink;
 				}
 			}
 		}
 		return Collections.emptyList();
 	}
 
-	private List<LocationLink> parseSpelAndFetchLocation(CancelChecker cancelToken, IJavaProject project,
-			CompilationUnit cu, int offset) {
-		List<LocationLink> locationLink = new ArrayList<>();
-		cu.accept(new ASTVisitor() {
-			@Override
-			public boolean visit(SingleMemberAnnotation node) {
-				Arrays.stream(spelExtractors).map(e -> e.getSpelRegion(node)).filter(o -> o.isPresent())
-						.map(o -> o.get()).forEach(snippet -> {
-							List<TokenData> beanReferenceTokens = computeTokens(snippet, offset);
-							if (beanReferenceTokens != null && beanReferenceTokens.size() > 0) {
-								locationLink.addAll(findLocationLinksForBeanRef(project, offset, beanReferenceTokens));
-							}
-
-							Optional<Tuple2<String, String>> result = parseAndExtractMethodClassPairFromSpel(snippet,
-									offset);
-							result.ifPresent(tuple -> {
-								locationLink.addAll(findLocationLinksForMethodRef(tuple.getT1(), tuple.getT2(), project));
-							});
-						});
-				return super.visit(node);
-			}
-
-			@Override
-			public boolean visit(NormalAnnotation node) {
-				Arrays.stream(spelExtractors).map(e -> e.getSpelRegion(node)).filter(o -> o.isPresent())
-						.map(o -> o.get()).forEach(snippet -> {
-							List<TokenData> beanReferenceTokens = computeTokens(snippet, offset);
-							if (beanReferenceTokens != null && beanReferenceTokens.size() > 0) {
-								locationLink.addAll(findLocationLinksForBeanRef(project, offset, beanReferenceTokens));
-							}
-							parseAndExtractMethodClassPairFromSpel(snippet, offset);
-							Optional<Tuple2<String, String>> result = parseAndExtractMethodClassPairFromSpel(snippet,
-									offset);
-							result.ifPresent(tuple -> {
-								locationLink.addAll(findLocationLinksForMethodRef(tuple.getT1(), tuple.getT2(), project));
-							});
-						});
-
-				return super.visit(node);
-			}
-
-		});
-		return locationLink;
-	}
-
 	private List<LocationLink> findLocationLinksForBeanRef(IJavaProject project, int offset,
 			List<TokenData> beanReferenceTokens) {
 		return beanReferenceTokens.stream().flatMap(t -> findBeansWithName(project, t.text()).stream())
@@ -168,7 +145,6 @@ private List<LocationLink> findLocationLinksForMethodRef(String methodName, Stri
 				String classFqName = className.substring(2, className.length() - 1);
 				Optional<URL> sourceUrl = SourceLinks.source(project, classFqName);
 				if (sourceUrl.isPresent()) {
-
 					docUri = sourceUrl.get().toURI();
 				}
 			} else if (className.startsWith("@")) {

headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/spel/SpelDefinitionProviderTest.java

@@ -240,12 +240,9 @@ public static String concat(String str1, String str2) {
 				new Range(new Position(7, 23), new Position(7, 37)), new Range(new Position(7, 23), new Position(7, 37)), null);
 		LocationLink expectedLocation2 = new LocationLink(expectedDefinitionUriSpelClass,
 				new Range(new Position(37, 22), new Position(37, 28)), new Range(new Position(37, 22), new Position(37, 28)), null);
-//		LocationLink expectedLocation3 = new LocationLink(expectedDefinitionUriSpelClass,
-//				new Range(new Position(33, 22), new Position(33, 28)), new Range(new Position(33, 22), new Position(33, 28)), null);
 
 		editor.assertLinkTargets("isValidVersion", List.of(expectedLocation1));
 		editor.assertLinkTargets("concat", List.of(expectedLocation2));
-//		editor.assertLinkTargets("toUpperCase", List.of(expectedLocation3));
 	}
 
 }