From 1fb2c3a04b38b2baa4297aad8b4fd5f63a1a0240 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Tue, 2 Jan 2018 15:04:59 +0100
Subject: [PATCH] removed the @Bean marker for class-based functions

---
 .../vscode/boot/java/beans/BeansSymbolProvider.java   | 11 +++++++----
 .../beans/test/SpringIndexerFunctionBeansTest.java    |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java
index 2058ae07e..23170d694 100644
--- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java
+++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/BeansSymbolProvider.java
@@ -60,7 +60,7 @@ public class BeansSymbolProvider implements SymbolProvider {
 		for (Tuple2<String, DocumentRegion> nameAndRegion : getBeanNames(node, doc)) {
 			try {
 				symbols.add(new SymbolInformation(
-						beanLabel(isFunction, nameAndRegion.getT1(), beanType),
+						beanLabel(isFunction, nameAndRegion.getT1(), beanType, "@Bean"),
 						SymbolKind.Interface,
 						new Location(doc.getUri(), doc.toRange(nameAndRegion.getT2()))
 				));
@@ -78,7 +78,7 @@ public class BeansSymbolProvider implements SymbolProvider {
 		if (functionBean != null) {
 			try {
 				SymbolInformation symbol = new SymbolInformation(
-						beanLabel(true, functionBean.getT1(), functionBean.getT2()),
+						beanLabel(true, functionBean.getT1(), functionBean.getT2(), null),
 						SymbolKind.Interface,
 						new Location(doc.getUri(), doc.toRange(functionBean.getT3())));
 				return ImmutableList.of(symbol);
@@ -161,7 +161,7 @@ public class BeansSymbolProvider implements SymbolProvider {
 		}
 	}
 
-	protected String beanLabel(boolean isFunctionBean, String beanName, String beanType) {
+	protected String beanLabel(boolean isFunctionBean, String beanName, String beanType, String markerString) {
 		StringBuilder symbolLabel = new StringBuilder();
 		symbolLabel.append('@');
 		symbolLabel.append(isFunctionBean ? '>' : '+');
@@ -169,7 +169,10 @@ public class BeansSymbolProvider implements SymbolProvider {
 		symbolLabel.append('\'');
 		symbolLabel.append(beanName);
 		symbolLabel.append('\'');
-		symbolLabel.append(" (@Bean) ");
+
+		markerString = markerString != null && markerString.length() > 0 ? " (" + markerString + ") " : " ";
+		symbolLabel.append(markerString);
+
 		symbolLabel.append(beanType);
 		return symbolLabel.toString();
 	}
diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java
index a560746ed..03d038c66 100644
--- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java
+++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/SpringIndexerFunctionBeansTest.java
@@ -65,7 +65,7 @@ public class SpringIndexerFunctionBeansTest {
 
 		String uriPrefix = "file://" + directory.getAbsolutePath();
 		indexer.assertDocumentSymbols(uriPrefix + "/src/main/java/org/test/ScannedFunctionClass.java",
-				symbol("ScannedFunctionClass", "@> 'scannedFunctionClass' (@Bean) Function<String,String>")
+				symbol("ScannedFunctionClass", "@> 'scannedFunctionClass' Function<String,String>")
 		);
 	}
 
@@ -77,7 +77,7 @@ public class SpringIndexerFunctionBeansTest {
 
 		String uriPrefix = "file://" + directory.getAbsolutePath();
 		indexer.assertDocumentSymbols(uriPrefix + "/src/main/java/org/test/FunctionFromSpecializedClass.java",
-				symbol("FunctionFromSpecializedClass", "@> 'functionFromSpecializedClass' (@Bean) Function<String,String>")
+				symbol("FunctionFromSpecializedClass", "@> 'functionFromSpecializedClass' Function<String,String>")
 		);
 	}
 
@@ -89,7 +89,7 @@ public class SpringIndexerFunctionBeansTest {
 
 		String uriPrefix = "file://" + directory.getAbsolutePath();
 		indexer.assertDocumentSymbols(uriPrefix + "/src/main/java/org/test/FunctionFromSpecializedInterface.java",
-				symbol("FunctionFromSpecializedInterface", "@> 'functionFromSpecializedInterface' (@Bean) Function<String,String>")
+				symbol("FunctionFromSpecializedInterface", "@> 'functionFromSpecializedInterface' Function<String,String>")
 		);
 	}