Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:spring-projects/sts4

Browse Source
This commit is contained in:
Kris De Volder
2017-10-24 16:18:32 -07:00
parent cd5c4af94a d4ce6c444d
commit 7d44293ea9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
View File

@@ -121,7 +121,10 @@ public class ConditionalsLiveHoverProvider implements HoverProvider {
String autoConfigRecord = app.getAutoConfigReport();
if (autoConfigRecord != null) {
JSONObject autoConfigJson = new JSONObject(autoConfigRecord);
return Optional.of(getConditionFromPositiveMatches(annotation, autoConfigJson));
List<RunningAppConditional> conditionalsFromPositiveMatches = getConditionals(annotation, autoConfigJson);
if(!conditionalsFromPositiveMatches.isEmpty()) {
return Optional.of(conditionalsFromPositiveMatches);
}
}
}
} catch (Exception e) {
@@ -137,7 +140,7 @@ public class ConditionalsLiveHoverProvider implements HoverProvider {
* @return non-null list of conditionals parsed from an autoconfig report. List
* may be empty.
*/
private List<RunningAppConditional> getConditionFromPositiveMatches(Annotation annotation,
private List<RunningAppConditional> getConditionals(Annotation annotation,
JSONObject autoConfigJson) {
List<RunningAppConditional> conditions = new ArrayList<>();