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

2018-08-01 15:24:19 -07:00
parent 0b1b5cdf2a 819ae52acf
commit c48b465cb8
35 changed files with 1735 additions and 518 deletions
--- a/atom-extensions/atom-spring-boot/styles/hints.atom-text-editor.less
+++ b/atom-extensions/atom-spring-boot/styles/hints.atom-text-editor.less
@@ -1,7 +1,11 @@
 .boot-hint .region {
-  border-color: #32BA56;
-  border-style: dotted;
-  border-width: 1px;
+  background-color: rgba(109,179,63,0.25);
+  border-color: rgba(109,179,63,0.25);
+  border-radius: 4px;
+  border-spacing: 4px;
+  //border-color: #32BA56;
+  //border-style: dotted;
+  //border-width: 1px;
 }

 atom-text-editor.editor {
--- a/eclipse-distribution/common/html/nightly-distributions.html
+++ b/eclipse-distribution/common/html/nightly-distributions.html
@@ -23,7 +23,8 @@

 	<p><b>STS4 Distribution:</b>
 		<ul>
-			<li>for Eclipse Photon (4.8): <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.8">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.8</a></li>
+			<li>for Eclipse 2018-09 (4.9): <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.9">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.9</a></li>
+			<li>for Eclipse Photon (4.8) - no longer updated: <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.8">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.8</a></li>
 			<li>for Eclipse Neon (4.7) - no longer updated: <a href="http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.7">http://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.7</a></li>
 		</ul>
 	</p>
@@ -48,10 +49,10 @@
 				
 	<h2>Eclipse-based Distribution Builds</h2>

-	<h3>Spring Tool Suite 4 - based on Eclipse Photon Milestone Builds (4.8.0 Mx)</h3>
-	<div id="e48"></div>
+	<h3>Spring Tool Suite 4 - based on Eclipse 2018-09 Milestone Builds (4.9.0) - and beyond</h3>
+	<div id="e49"></div>
 	<script type="text/javascript">
-	$('#e48').load('sts4-nightly-e4.8.html');
+	$('#e49').load('sts4-nightly-e4.9.html');
 	</script>
 	
 	<h2>Spring Tools 4 - Visual Studio Code Extensions</h2>
@@ -68,13 +69,6 @@
 	$('#atom').load('atom-packages/atom-packages-snippet.html');
 	</script>

-	<h2>No longer updated...</h2>
-	<h3>Spring Tool Suite 4 - based on Eclipse Oxygen.2 (4.7.2)</h3>
-	<div id="e47"></div>
-	<script type="text/javascript">
-	$('#e47').load('sts4-nightly-e4.7.html');
-	</script>
-	
 </div>
 </body>
 </html>
--- a/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+<product name="Spring Tool Suite 4" id="org.springframework.boot.ide.branding.sts4" uid="org.springframework.boot.ide.branding.sts4" application="org.eclipse.ui.ide.workbench" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-product org.springframework.boot.ide.branding.sts4
+--launcher.defaultAction
+openFile</programArgs>
+      <vmArgs>-Dosgi.requiredJavaVersion=1.8
+--add-modules=ALL-SYSTEM
+-Xms40m</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/sts4.icns
+         <argsX86_64>-Xmx1200m</argsX86_64>
+      </vmArgsMac>
+      <vmArgsWin>
+         <argsX86_64>-Xmx1200m</argsX86_64>
+      </vmArgsWin>
+      <vmArgsLin>
+         <argsX86_64>-Xmx1200m</argsX86_64>
+      </vmArgsLin>
+   </launcherArgs>
+
+   <windowImages i16="/org.springframework.boot.ide.branding/sts4-16.png" i32="/org.springframework.boot.ide.branding/sts4-32.png" i48="/orgorg.springframework.boot.ide.branding/sts4-48.png" i64="/org.springframework.boot.ide.branding/sts4-64.png" i128="/org.springframework.boot.ide.branding/sts4-128.png"/>
+
+   <splash
+      startupProgressRect="0,225,455,15"
+      startupMessageRect="7,220,441,20"
+      startupForegroundColor="c1d72e" />
+
+   <launcher name="SpringToolSuite4">
+      <macosx icon="../org.springframework.boot.ide.branding/sts4.icns"/>
+      <solaris/>
+      <win useIco="true">
+         <ico path="../org.springframework.boot.ide.branding/sts4.ico"/>
+         <bmp/>
+      </win>
+      <linux icon="../org.springframework.boot.ide.branding/sts4.xpm"/>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <features>
+      <feature id="org.eclipse.platform" installMode="root"/>
+      <feature id="org.eclipse.pde" installMode="root"/>
+
+      <feature id="org.eclipse.buildship" installMode="root"/>
+      <feature id="org.eclipse.egit" installMode="root"/>
+      <feature id="org.eclipse.egit.gitflow.feature" installMode="root"/>
+
+      <feature id="org.eclipse.equinox.p2.user.ui" installMode="root"/>
+      <feature id="org.eclipse.help" installMode="root"/>
+
+      <feature id="org.eclipse.jdt" installMode="root"/>
+      <feature id="org.eclipse.jgit" installMode="root"/>
+      <feature id="org.eclipse.jgit.lfs" installMode="root"/>
+
+      <feature id="org.eclipse.m2e.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
+
+      <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.json_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.jsdt.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.jsdt.chromium.debug.feature" installMode="root"/>
+      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.epp.mpc" installMode="root"/>
+
+      <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/>
+      <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/>
+      <feature id="org.sonatype.m2e.egit.feature" installMode="root"/>
+      <feature id="org.jboss.tools.m2e.wro4j.feature" installMode="root"/>
+      <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/>
+
+      <feature id="net.mihai-nita.ansicon" installMode="root"/>
+
+      <feature id="org.springsource.ide.eclipse.commons.quicksearch.feature" installMode="root"/>
+      <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
+
+      <feature id="org.springframework.boot.ide.branding.feature" installMode="root"/>
+      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
+
+      <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
+
+      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" installMode="root"/>
+      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
+
+      <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
+      <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
+
+   </features>
+
+   <configurations>
+   	  <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}"/>
+   	  <property name="osgi.instance.area.default" value="@user.home/Documents/workspace-spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}"/>
+   	  <property name="osgi.splashPath" value="platform:/base/plugins/org.springframework.boot.ide.branding"/>
+   	  
+   	  <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+   	  <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+   	  <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+   	  <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   	  <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+   	  <plugin id="org.eclipse.update.configurator" autoStart="false" startLevel="4" />
+   </configurations>
+
+</product>
--- a/eclipse-distribution/org.springframework.boot.ide.product.e49/p2.inf
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/p2.inf
@@ -0,0 +1,23 @@
+instructions.configure=\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-09,name:2018-09);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest,name:Spring Tool Suite 4);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations,name:Spring Tools 4 Language Servers for Eclipse);
+
+instructions.unconfigure=\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/2018-09);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/2018-09);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4/update/latest);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-server-integrations);
+
+ # Bug 530093: make sure we have latest version of a.jre.javase included with product
+ requires.3.namespace=org.eclipse.equinox.p2.iu
+ requires.3.name=a.jre.javase
+ requires.3.range=[9.0.0,9.0.0]
+ requires.4.namespace=org.eclipse.equinox.p2.iu
+ requires.4.name=config.a.jre.javase
+ requires.4.range=[9.0.0,9.0.0]
--- a/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/pom.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>org.springframework.boot.ide.product</artifactId>
+
+	<packaging>eclipse-repository</packaging>
+
+	<properties>
+		<dist.accessKey>${accessKey}</dist.accessKey>
+		<dist.secretKey>${secretKey}</dist.secretKey>
+	</properties>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-install</id>
+						<phase>none</phase>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includeAllDependencies>false</includeAllDependencies>
+				</configuration>
+			</plugin>
+			  
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-publisher-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<publishArtifacts>true</publishArtifacts>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<executionEnvironment>JavaSE-9</executionEnvironment>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>materialize-products</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+						<phase>package</phase>
+					</execution>
+					<execution>
+						<id>archive-products</id>
+						<goals>
+							<goal>archive-products</goal>
+						</goals>
+						<phase>verify</phase>
+					</execution>
+				</executions>
+				<configuration>
+					<products>
+						<product>
+							<id>org.springframework.boot.ide.branding.sts4</id>
+							<rootFolder>sts-${unqualifiedVersion}.${p2.qualifier}</rootFolder>
+							<rootFolders>
+								<macosx>SpringToolSuite4.app</macosx>
+							</rootFolders>
+							<archiveFileName>spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}</archiveFileName>
+						</product>
+					</products>
+					<formats>
+						<linux>tar.gz</linux>
+						<macosx>tar.gz</macosx>
+					</formats>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+
+					<execution>
+						<id>osx-app-signing</id>
+						<phase>package</phase>
+						<configuration>
+							<skip>${skip.osx.signing}</skip>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+								<exec executable="codesign" failonerror="true">
+									<arg value="--verbose"/>
+								    <arg value="--keychain"/>
+								    <arg value="${env.KEYCHAIN}"/>
+								    <arg value="-s"/>
+								    <arg value="Developer ID Application: Trevor Marshall"/>
+								    <arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app"/>
+								</exec>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>osx-dmg-creation</id>
+						<phase>verify</phase>
+						<configuration>
+							<target>
+
+								<exec executable="/usr/local/bin/appdmg" failonerror="true">
+									<arg value="${project.build.directory}/../spring-tool-suite-4-dmg-config-${dist.target.major}.json"/>
+									<arg value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg"/>
+								</exec>
+
+								<delete file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.tar.gz"/>
+								
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>osx-dmg-signing</id>
+						<phase>verify</phase>
+						<configuration>
+							<skip>${skip.osx.signing}</skip>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
+								<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
+
+								<exec executable="codesign" failonerror="true">
+									<arg value="--verbose"/>
+								    <arg value="--keychain"/>
+								    <arg value="${env.KEYCHAIN}"/>
+								    <arg value="-s"/>
+								    <arg value="Developer ID Application: Trevor Marshall"/>
+								    <arg value="${dmgName}"/>
+								</exec>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>upload-product-bundles</id>
+						<phase>deploy</phase>
+						<configuration>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
+
+								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+
+									<delete bucketName="${dist.bucket}">
+										<fileset dir="${dist.path.product}">
+											<include name="spring-tool-suite-4*.zip" />
+											<include name="spring-tool-suite-4*.zip.md5" />
+											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz" />
+											<include name="spring-tool-suite-4*.tar.gz.md5" />
+											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.dmg" />
+											<include name="spring-tool-suite-4*.dmg.md5" />
+											<include name="spring-tool-suite-4*.dmg.sha1" />
+										</fileset>
+									</delete>
+
+									<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
+										publicRead="true">
+										<fileset dir="${project.build.directory}/products">
+											<include name="spring-tool-suite-4*.zip" />
+											<include name="spring-tool-suite-4*.zip.md5" />
+											<include name="spring-tool-suite-4*.zip.sha1" />
+											<include name="spring-tool-suite-4*.tar.gz" />
+											<include name="spring-tool-suite-4*.tar.gz.md5" />
+											<include name="spring-tool-suite-4*.tar.gz.sha1" />
+											<include name="spring-tool-suite-4*.dmg" />
+											<include name="spring-tool-suite-4*.dmg.md5" />
+											<include name="spring-tool-suite-4*.dmg.sha1" />
+										</fileset>
+									</upload>
+
+								</s3>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>update-nightly-downloads</id>
+						<phase>deploy</phase>
+						<configuration>
+							<skip>${skip.update-nightly-download-page}</skip>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet.html" tofile="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"/>
+		
+								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
+								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@TARGET@" value="${dist.target}" summary="yes" />
+								<replace file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html" token="@MAJOR-TARGET@" value="${dist.target.major}" summary="yes" />
+
+								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+									<upload bucketName="${dist.bucket}" file="${project.build.directory}/../../common/html/sts4-nightly-${dist.target.major}.html"
+										toFile="snapshot/STS4/sts4-nightly-${dist.target.major}.html" publicRead="true">
+									</upload>
+								</s3>
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.springframework.build</groupId>
+						<artifactId>org.springframework.build.aws.ant</artifactId>
+						<version>3.1.0.RELEASE</version>
+					</dependency>
+					<dependency>
+						<groupId>net.java.dev.jets3t</groupId>
+						<artifactId>jets3t</artifactId>
+						<version>0.8.1</version>
+					</dependency>
+					<dependency>
+						<groupId>ant-contrib</groupId>
+						<artifactId>ant-contrib</artifactId>
+						<version>20020829</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+		</plugins>
+
+	</build>
+</project>
--- a/eclipse-distribution/org.springframework.boot.ide.product.e49/spring-tool-suite-4-dmg-config-e4.9.json
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/spring-tool-suite-4-dmg-config-e4.9.json
@@ -0,0 +1,10 @@
+{
+  "title": "Spring Tool Suite 4",
+  "icon": "../org.springframework.boot.ide.branding/sts4.icns",
+  "contents": [
+    { "x": 192, "y": 100, "type": "file", "path": "target/products/org.springframework.boot.ide.branding.sts4/macosx/cocoa/x86_64/SpringToolSuite4.app" },
+    { "x": 448, "y": 100, "type": "link", "path": "/Applications" },
+    { "x": 1000, "y": 2000, "type": "file", "path": "../org.springframework.boot.ide.branding/sts4.icns", "name": ".VolumeIcon.icns" }
+  ],
+  "format": "UDZO"
+}
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e49/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e49/category.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site pack200="true">
+	<description url="http://spring.io/tools">
+		Spring Tool Suite 4
+	</description>
+
+	<!-- Eclipse Integration Commons -->
+	<category-def name="Uncategorized" label="Uncategorized"/>
+	<category-def name="Core / Eclipse Integration Commons" label="Core / Eclipse Integration Commons"/>
+	<category-def name="Resources / Eclipse Integration Commons" label="Resources / Eclipse Integration Commons"/>
+
+	<feature
+		id="org.springsource.ide.eclipse.commons.quicksearch.feature"
+		version="0.0.0">
+		<category name="Core / Eclipse Integration Commons" />
+	</feature>
+	
+	<!-- STS4 branding and custom features -->
+	<category-def name="Spring Tool Suite 4 Distribution" label="Spring Tool Suite 4 Distribution" />
+
+	<feature
+		id="org.springframework.boot.ide.main.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Distribution" />
+	</feature>
+
+	<feature
+		id="org.springframework.boot.ide.branding.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Distribution" />
+	</feature>
+
+	<!-- Spring IDE -->
+	<category-def name="Core / Spring IDE" label="Core / Spring IDE" />
+	<category-def name="Extensions / Spring IDE" label="Extensions / Spring IDE" />
+	<category-def name="Extensions (Incubation) / Spring IDE" label="Extensions (Incubation) / Spring IDE" />
+	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
+	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
+
+<!--	<feature
+		id="org.springframework.ide.eclipse.boot.feature" version="0.0.0">
+		<category name="Extensions / Spring IDE" />
+	</feature> -->
+
+	<feature
+		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
+		<category name="Extensions / Spring IDE" />
+	</feature>
+
+<!--	<feature
+		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature> -->
+
+<!--	<feature
+		id="org.springframework.ide.eclipse.boot.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature> -->
+
+	<feature
+		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature>
+
+	<!-- Language Server -->
+	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+
+	<feature
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.boot.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.bosh.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.tooling.concourse.ls.feature" version="0.0.0">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
+	</feature>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.commons">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.jdt.ls.commons">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	</bundle>
+
+	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.core">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.ui">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.completions">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.core">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.frameworks.ui">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+
+	<bundle id="org.springsource.ide.eclipse.commons.livexp">
+		<category name="Core / Eclipse Integration Commons"/>
+	</bundle>
+<!--
+	<bundle id="io.projectreactor.reactor-core">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.reactivestreams.reactive-streams">
+		<category name="Uncategorized"/>
+	</bundle>
+-->
+	<bundle id="org.dadacoalition.yedit">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.yaml.snakeyaml">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<feature id="tm-feature">
+		<category name="Uncategorized"/>
+	</feature>
+
+	<bundle id="org.eclipse.lsp4e">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.lsp4j">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.lsp4j.jsonrpc">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.eclipse.xtext.xbase.lib">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="com.google.gson">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.jcodings">
+		<category name="Uncategorized"/>
+	</bundle>
+
+	<bundle id="org.joni">
+		<category name="Uncategorized"/>
+	</bundle>
+
+    <bundle id="bcpkix" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="bcpkix.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="bcprov" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="bcprov.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.hierynomus.sshj" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.hierynomus.sshj.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.jcraft.jzlib" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="com.jcraft.jzlib.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="net.i2p.crypto.eddsa" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+    <bundle id="net.i2p.crypto.eddsa.source" version="0.0.0">
+		<category name="Uncategorized"/>
+	</bundle>
+
+</site>
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e49/pom.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>org.springframework.boot.ide.repository</artifactId>
+
+	<packaging>eclipse-repository</packaging>
+
+	<properties>
+		<dist.accessKey>${accessKey}</dist.accessKey>
+		<dist.secretKey>${secretKey}</dist.secretKey>
+	</properties>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-install</id>
+						<phase>none</phase>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>default-install</id>
+						<phase>none</phase>
+					</execution>
+				</executions>
+			</plugin>
+			
+			
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
+				<executions>
+
+					<execution>
+						<id>zip-sts-repository</id>
+						<phase>install</phase>
+						<configuration>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
+								<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
+
+								<zip zipfile="${project.build.directory}/repository/${dist.file.name}" filesonly="true">
+									<zipfileset
+										dir="${project.build.directory}/repository">
+										<exclude name="*.zip" />
+										<exclude name="**/*.gz" />
+									</zipfileset>
+								</zip>
+
+								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA1" fileext=".sha1" />
+								<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="MD5" fileext=".md5" />
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+					<execution>
+						<id>upload-sts-repository</id>
+						<phase>deploy</phase>
+						<configuration>
+							<target>
+
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
+
+								<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+
+									<delete bucketName="${dist.bucket}">
+										<fileset dir="${dist.path.repo}">
+											<include name="p2.index" />
+											<include name="site.xml" />
+											<include name="content.jar" />
+											<include name="artifacts.xml.xz" />
+											<include name="content.jar" />
+											<include name="content.xml.xz" />
+											<include name="plugins/**" />
+											<include name="features/**" />
+											<include name="binary/**" />
+											<include name="*.zip" />
+											<include name="*.sha1" />
+											<include name="*.md5" />
+										</fileset>
+									</delete>
+
+									<upload bucketName="${dist.bucket}" toDir="${dist.path.repo}" publicRead="true">
+										<fileset
+											dir="${project.build.directory}/repository">
+											<include name="**/*" />
+											<include name="**" />
+										</fileset>
+									</upload>
+
+								</s3>
+
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.springframework.build</groupId>
+						<artifactId>org.springframework.build.aws.ant</artifactId>
+						<version>3.1.0.RELEASE</version>
+					</dependency>
+					<dependency>
+						<groupId>net.java.dev.jets3t</groupId>
+						<artifactId>jets3t</artifactId>
+						<version>0.8.1</version>
+					</dependency>
+					<dependency>
+						<groupId>ant-contrib</groupId>
+						<artifactId>ant-contrib</artifactId>
+						<version>20020829</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+
+		</plugins>
+
+	</build>
+</project>
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -294,6 +294,90 @@
 			</modules>
 		</profile>

+		<profile>
+			<id>e49</id>
+			<properties>
+				<dist.target>e4.9.0</dist.target>
+				<dist.target.major>e4.9</dist.target.major>
+				<dist.platform.name>2018-09</dist.platform.name>
+				<dist.platform.name.long>2018-09 (4.9.0)</dist.platform.name.long>
+				<dist.platform.id>2018-09</dist.platform.id>
+				<dist.platform.version>4.9</dist.platform.version>
+				<package.qualifierPrefix>e49</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>photon</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/releases/2018-09/</url>
+				</repository>
+				<repository>
+					<id>staging</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/staging/2018-09/</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20180710163057/repository</url>
+				</repository>
+				<repository>
+					<id>latest-m2e</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/technology/m2e/releases/1.8</url>
+				</repository>
+				<repository>
+					<id>maven-extras-mirror</id>
+					<layout>p2</layout>
+					<url>http://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/</url>
+				</repository>
+				<repository>
+					<id>maven-egit</id>
+					<layout>p2</layout>
+					<url>http://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST</url>
+				</repository>
+				<repository>
+					<id>maven-wro4j</id>
+					<layout>p2</layout>
+					<url>http://download.jboss.org/jbosstools/updates/m2e-wro4j/</url>
+				</repository>
+				<repository>
+					<id>maven-devtools</id>
+					<layout>p2</layout>
+					<url>http://dist.springsource.com/release/TOOLS/mavendevtools/</url>
+				</repository>
+				<repository>
+					<id>maven-dependency-support</id>
+					<layout>p2</layout>
+					<url>http://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
+				</repository>
+				<repository>
+					<id>ansi-console</id>
+					<layout>p2</layout>
+					<url>http://www.mihai-nita.net/eclipse</url>
+				</repository>
+				<repository>
+					<id>xtext-base</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
+				</repository>
+				<repository>
+					<id>lsp4e</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
+				</repository>
+<!--				<repository>
+					<id>lsp4j</id>
+					<layout>p2</layout>
+					<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastSuccessfulBuild/artifact/build/p2-repository/</url>
+				</repository> -->
+			</repositories>
+			<modules>
+				<module>org.springframework.boot.ide.product.e49</module>
+				<module>org.springframework.boot.ide.repository.e49</module>
+			</modules>
+		</profile>
+
 		<profile>
 			<id>build.springsource.com</id>
 			<activation>
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/icons/boot.png
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/icons/boot.png
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/plugin.xml
@@ -2,28 +2,27 @@
 <?eclipse version="3.4"?>
 <plugin>
   <extension point="org.eclipse.ui.editors.annotationTypes">
-      <type name="org.springframework.tooling.bootinfo"></type>
+      <type
+            name="org.springframework.tooling.bootinfo"></type>
   </extension>
   <extension point="org.eclipse.ui.editors.markerAnnotationSpecification">
      <specification
-        annotationType="org.springframework.tooling.bootinfo"
-        colorPreferenceKey="STS4BootMarkerIndicationColor"
-        colorPreferenceValue="23,104,17"
-        contributesToHeader="false"
-        highlightPreferenceKey="STS4BootMarkerHighlighting"
-        highlightPreferenceValue="false"
-        icon="icons/boot-icon.png"
-        label="Boot Dynamic Info"
-        overviewRulerPreferenceKey="STS4BootMarkerIndicationInOverviewRuler"
-        overviewRulerPreferenceValue="true"
-        presentationLayer="4"
-        showInNextPrevDropdownToolbarAction="false"
-        textPreferenceKey="STS4BootMarkerIndication"
-        textPreferenceValue="true"
-        textStylePreferenceKey="STS4BootMarkerTextStyle"
-        textStylePreferenceValue="DASHED_BOX"
-        verticalRulerPreferenceKey="STS4BootMarkerIndicationInVerticalRuler"
-        verticalRulerPreferenceValue="true">
+            annotationType="org.springframework.tooling.bootinfo"
+            colorPreferenceKey="STS4BootMarkerIndicationColor"
+            colorPreferenceValue="219,236,207"
+            contributesToHeader="false"
+            highlightPreferenceKey="STS4BootMarkerHighlighting"
+            highlightPreferenceValue="true"
+            label="Boot Dynamic Info"
+            overviewRulerPreferenceKey="STS4BootMarkerIndicationInOverviewRuler"
+            overviewRulerPreferenceValue="true"
+            presentationLayer="4"
+            showInNextPrevDropdownToolbarAction="false"
+            textPreferenceKey="STS4BootMarkerIndication"
+            textPreferenceValue="true"
+            textStylePreferenceKey="STS4BootMarkerTextStyle"
+            verticalRulerPreferenceKey="STS4BootMarkerIndicationInVerticalRuler"
+            verticalRulerPreferenceValue="true">
      </specification>
   </extension>
   <extension
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/BootInlineAnnotation.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/BootInlineAnnotation.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Pivotal, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Pivotal, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.tooling.ls.eclipse.commons;
+
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.inlined.LineContentAnnotation;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Rectangle;
+
+/**
+ * Boot icon inlined annotation
+ *
+ * @author Alex Boyko
+ *
+ */
+public class BootInlineAnnotation extends LineContentAnnotation {
+
+	private static final int SPACING = 2;
+
+	public BootInlineAnnotation(Position pos, ISourceViewer viewer) {
+		super(pos, viewer);
+	}
+
+	@Override
+	protected int drawAndComputeWidth(GC gc, StyledText textWidget, int offset, int length, Color color, int x, int y) {
+		FontMetrics fontMetrics = gc.getFontMetrics();
+		int height = fontMetrics.getHeight();
+
+		Image bootImage = LanguageServerCommonsActivator.getInstance().getImageRegistry().get(LanguageServerCommonsActivator.BOOT_KEY);
+		Rectangle bootImgBounds = bootImage.getBounds();
+		int width = (int) Math.round(bootImgBounds.width / (double) bootImgBounds.height * height);
+
+		Rectangle backgroundRect = new Rectangle(x, y, width + SPACING, fontMetrics.getHeight());
+		gc.setBackground(textWidget.getBackground());
+		gc.fillRectangle(backgroundRect);
+
+		gc.drawImage(bootImage, bootImgBounds.x, bootImgBounds.y, bootImgBounds.width, bootImgBounds.height, x, y, width, height);
+
+		return backgroundRect.width;
+	}
+
+}
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/LanguageServerCommonsActivator.java
@@ -26,6 +26,8 @@ public class LanguageServerCommonsActivator extends AbstractUIPlugin {

 	public static final String PLUGIN_ID = "org.springframework.tooling.ls.eclipse.commons";

+	public static final String BOOT_KEY = "boot-key";
+
 	private static LanguageServerCommonsActivator instance;

 	public LanguageServerCommonsActivator() {
@@ -35,6 +37,7 @@ public class LanguageServerCommonsActivator extends AbstractUIPlugin {
 	public void start(BundleContext context) throws Exception {
 		instance = this;
 		super.start(context);
+		getImageRegistry().put(BOOT_KEY, getImageDescriptor("icons/boot.png"));
 	}

 	public final static ImageDescriptor getImageDescriptor(String path) {
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
@@ -14,8 +14,11 @@ import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
 import java.util.concurrent.CompletableFuture;

 import org.eclipse.core.runtime.IProgressMonitor;
@@ -24,11 +27,16 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.ITextViewerExtension2;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.AnnotationPainter;
+import org.eclipse.jface.text.source.IAnnotationAccess;
 import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.jface.text.source.IAnnotationModelExtension;
 import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.jface.text.source.inlined.AbstractInlinedAnnotation;
+import org.eclipse.jface.text.source.inlined.InlinedAnnotationSupport;
 import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4e.LanguageClientImpl;
 import org.eclipse.lsp4e.LanguageServiceAccessor;
@@ -114,7 +122,7 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
 							IDocument doc = sourceViewer.getDocument();
 							if (sourceViewer!=null) {
 								if (doc!=null && annotationModel instanceof IAnnotationModelExtension) {
-									updateAnnotations(target, doc, (IAnnotationModelExtension) annotationModel);
+									updateAnnotations(target, sourceViewer, (IAnnotationModelExtension) annotationModel);
 								}
 							}
 						}
@@ -137,8 +145,11 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
 	 */
 	private Map<String, Annotation[]> currentAnnotations = new HashMap<>();

-	private synchronized void updateAnnotations(String target, IDocument doc, IAnnotationModelExtension annotationModel) {
+	private Map<ISourceViewer, InlinedAnnotationSupport> viewerInlinedAnnotationSupport = new WeakHashMap<>();
+
+	private synchronized void updateAnnotations(String target, ISourceViewer sourceViewer, IAnnotationModelExtension annotationModel) {
 		if (target!=null) {
+			IDocument doc = sourceViewer.getDocument();
 			Collection<LSPDocumentInfo> infos = LanguageServiceAccessor.getLSPDocumentInfosFor(doc, (x) -> true);
 			for (LSPDocumentInfo docInfo : infos) {
 				URI uri = docInfo.getFileUri();
@@ -147,14 +158,73 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
 					if (toRemove==null) {
 						toRemove = new Annotation[0];
 					}
-					Map<Annotation, Position> newAnnotations = createAnnotations(doc, currentHighlights.get(target));
+					List<Range> highlights = currentHighlights.get(target);
+					Map<Annotation, Position> newAnnotations = createAnnotations(doc, highlights);
 					annotationModel.replaceAnnotations(toRemove, newAnnotations);
 					currentAnnotations.put(target, newAnnotations.keySet().toArray(new Annotation[newAnnotations.size()]));
+					updateInlinedAnnotations(sourceViewer, highlights);
 				}
 			}
 		}
 	}

+	private void updateInlinedAnnotations(final ISourceViewer sourceViewer, List<Range> highlights) {
+		InlinedAnnotationSupport support = viewerInlinedAnnotationSupport.get(sourceViewer);
+		if (support == null) {
+			final InlinedAnnotationSupport inlinedSupport = new InlinedAnnotationSupport();
+			inlinedSupport.install(sourceViewer, createAnnotationPainter(sourceViewer));
+			viewerInlinedAnnotationSupport.put(sourceViewer, inlinedSupport);
+			sourceViewer.getTextWidget().addDisposeListener((e) -> {
+				inlinedSupport.uninstall();
+				viewerInlinedAnnotationSupport.remove(sourceViewer);
+			});
+			support = inlinedSupport;
+		}
+		Set<AbstractInlinedAnnotation> annotations = new HashSet<>();
+		if (highlights==null) {
+			highlights = ImmutableList.of();
+		}
+		IDocument doc = sourceViewer.getDocument();
+		for (Range rng : highlights) {
+			try {
+				int start = LSPEclipseUtils.toOffset(rng.getStart(), doc);
+				int end = LSPEclipseUtils.toOffset(rng.getEnd(), doc);
+				Position colorPos = new Position(start, end - start);
+				BootInlineAnnotation colorAnnotation = support.findExistingAnnotation(colorPos);
+				if (colorAnnotation == null) {
+					colorAnnotation = new BootInlineAnnotation(colorPos, sourceViewer);
+				}
+				annotations.add(colorAnnotation);
+			} catch (BadLocationException e) {
+				//ignore invalid highlights
+			}
+		}
+		support.updateAnnotations(annotations);
+	}
+
+	private static AnnotationPainter createAnnotationPainter(ISourceViewer viewer) {
+		IAnnotationAccess annotationAccess = new IAnnotationAccess() {
+			@Override
+			public Object getType(Annotation annotation) {
+				return annotation.getType();
+			}
+
+			@Override
+			public boolean isMultiLine(Annotation annotation) {
+				return true;
+			}
+
+			@Override
+			public boolean isTemporary(Annotation annotation) {
+				return true;
+			}
+
+		};
+		AnnotationPainter painter = new AnnotationPainter(viewer, annotationAccess);
+		((ITextViewerExtension2) viewer).addPainter(painter);
+		return painter;
+	}
+
 	private Map<Annotation, Position> createAnnotations(IDocument doc, List<Range> highlights) {
 		ImmutableMap.Builder<Annotation, Position> annotations = ImmutableMap.builder();
 		if (highlights==null) {
--- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java
+++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Pivotal, Inc.
+ * Copyright (c) 2017, 2018 Pivotal, Inc.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -103,9 +103,6 @@ public class LiveBean {
 					type = type.substring(0, chop);
 				}
 			}
-
-			// convert inner classes from $ to . notation
-			type = type.replace('$', '.');
 		}

 		return type;
--- a/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
+++ b/headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/Editor.java
@@ -600,18 +600,26 @@ public class Editor {
 	}

 	public void assertTrimmedHover(String hoverOver, String expectedHover) throws Exception {
-		int hoverPosition = getHoverPosition(hoverOver,1);
+		assertTrimmedHover(hoverOver, 1, expectedHover);
+	}
+
+	public void assertTrimmedHover(String hoverOver, int occurence, String expectedHover) throws Exception {
+		int hoverPosition = getHoverPosition(hoverOver,occurence);
 		Hover hover = harness.getHover(doc, doc.toPosition(hoverPosition));
 		assertEquals(expectedHover.trim(), hoverString(hover).trim());
 	}

-	public void assertNoHover(String hoverOver) throws Exception {
-		int hoverPosition = getRawText().indexOf(hoverOver) + hoverOver.length() / 2;
+	public void assertNoHover(String hoverOver, int occurence) throws Exception {
+		int hoverPosition = getHoverPosition(hoverOver,occurence);
 		Hover hover = harness.getHover(doc, doc.toPosition(hoverPosition));
 		List<Either<String, MarkedString>> contents = hover.getContents().getLeft();
 		assertTrue(contents.toString(), contents.isEmpty());
 	}

+	public void assertNoHover(String hoverOver) throws Exception {
+		assertNoHover(hoverOver, 1);
+	}
+
 	/**
 	 * Verifies an expected textSnippet is contained in the hover text that is
 	 * computed when hovering mouse at position at the end of first occurrence of
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.FieldDeclaration;
 import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.MarkerAnnotation;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
@@ -40,6 +41,7 @@ import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean;
 import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.java.IType;
+import org.springframework.ide.vscode.commons.util.BadLocationException;
 import org.springframework.ide.vscode.commons.util.StringUtil;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;

@@ -53,7 +55,7 @@ public class AutowiredHoverProvider implements HoverProvider {

 	final static Logger log = LoggerFactory.getLogger(AutowiredHoverProvider.class);

-	private static final int MAX_INLINE_BEANS_STRING_LENGTH = 50;
+	private static final int MAX_INLINE_BEANS_STRING_LENGTH = 60;
 	private static final String INLINE_BEANS_STRING_SEPARATOR = " ";

 	private BootJavaLanguageServerComponents server;
@@ -63,34 +65,31 @@ public class AutowiredHoverProvider implements HoverProvider {
 	}

 	@Override
-	public Collection<Range> getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
-		try {
-			LiveBean definedBean = getDefinedBean(annotation);
-			if (definedBean != null) {
-				for (SpringBootApp app : runningApps) {
-					try {
-						List<LiveBean> relevantBeans = LiveHoverUtils.findRelevantBeans(app, definedBean).collect(Collectors.toList());
+	public Collection<Range> getLiveHoverHints(IJavaProject project, Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
+		if (runningApps.length > 0) {
+			LiveBean definedBean = getDefinedBeanForTypeDeclaration(ASTUtils.findDeclaringType(annotation));
+			// Annotation is MarkerNode, parent is some field, method, variable declaration node.
+			ASTNode declarationNode = annotation.getParent();
+			try {
+				Range hoverRange = doc.toRange(annotation.getStartPosition(), annotation.getLength());
+				return getLiveHoverHints(project, declarationNode, hoverRange, runningApps, definedBean);
+			} catch (BadLocationException e) {
+				log.error("", e);
+			}
+		}
+		return null;
+	}

-						if (!relevantBeans.isEmpty()) {
-							for (LiveBean bean : relevantBeans) {
-								String[] dependencies = bean.getDependencies();
-								if (dependencies != null && dependencies.length > 0) {
-									Range hoverRange = doc.toRange(annotation.getStartPosition(), annotation.getLength());
-									return ImmutableList.of(hoverRange);
-								}
-							}
-						}
-					}
-					catch (Exception e) {
-						log.error("", e);
-					}
+	private Collection<Range> getLiveHoverHints(IJavaProject project, ASTNode declarationNode, Range range,
+			SpringBootApp[] runningApps, LiveBean definedBean) {
+		if (declarationNode != null && definedBean != null) {
+			for (SpringBootApp app : runningApps) {
+				List<LiveBean> relevantBeans = getRelevantAutowiredBeans(project, declarationNode, app, definedBean);
+				if (!relevantBeans.isEmpty()) {
+					return ImmutableList.of(range);
 				}
 			}
 		}
-		catch (Exception e) {
-			log.error("", e);
-		}
-
 		return null;
 	}

@@ -98,74 +97,94 @@ public class AutowiredHoverProvider implements HoverProvider {
 	public Hover provideHover(ASTNode node, Annotation annotation, ITypeBinding type, int offset,
 			TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
 		if (runningApps.length > 0) {
+			LiveBean definedBean = getDefinedBeanForTypeDeclaration(ASTUtils.findDeclaringType(annotation));
+			// Annotation is MarkerNode, parent is some field, method, variable declaration node.
+			ASTNode declarationNode = annotation.getParent();
+			return provideHover(definedBean, declarationNode, offset, doc, project, runningApps);
+		}
+		return null;
+	}
+
+	private Hover provideHover(LiveBean definedBean, ASTNode declarationNode, int offset, TextDocument doc,
+			IJavaProject project, SpringBootApp[] runningApps) {
+		if (definedBean != null) {

 			StringBuilder hover = new StringBuilder();

-			LiveBean definedBean = getDefinedBean(annotation);
-			if (definedBean != null) {
+			boolean hasContent = false;

-				boolean hasContent = false;
+			for (SpringBootApp app : runningApps) {

-				for (SpringBootApp app : runningApps) {
-					LiveBeansModel beans = app.getBeans();
-					List<LiveBean> relevantBeans = LiveHoverUtils.findRelevantBeans(app, definedBean).collect(Collectors.toList());
+				List<LiveBean> autowiredBeans = getRelevantAutowiredBeans(project, declarationNode, app, definedBean);

-					if (!relevantBeans.isEmpty()) {
-						List<LiveBean> allDependencyBeans = relevantBeans.stream()
-								.flatMap(b -> Arrays.stream(b.getDependencies()))
-								.distinct()
-								.flatMap(d -> beans.getBeansOfName(d).stream())
-								.collect(Collectors.toList());
-
-						if (!allDependencyBeans.isEmpty()) {
-
-							// parent is marker node, grandparent is some field, method, variable declaration node.
-							ASTNode declarationNode = node.getParent().getParent();
-							List<LiveBean> autowiredBeans = findAutowiredBeans(project, declarationNode, allDependencyBeans);
-							if (autowiredBeans.isEmpty()) {
-								// Show all relevant dependency beans
-								autowiredBeans = allDependencyBeans;
-							}
-
-							if (!autowiredBeans.isEmpty()) {
-								if (!hasContent) {
-									hasContent = true;
-								} else {
-									hover.append("  \n  \n");
-								}
-								hover.append("**Autowired &rarr; ");
-								if (LiveHoverUtils.doBeansFitInline(autowiredBeans, MAX_INLINE_BEANS_STRING_LENGTH, INLINE_BEANS_STRING_SEPARATOR)) {
-									hover.append(autowiredBeans.stream().map(b -> LiveHoverUtils.showBeanInline(server, project, b)).collect(Collectors.joining(INLINE_BEANS_STRING_SEPARATOR)));
-									hover.append("**\n");
-								} else {
-									hover.append(autowiredBeans.size());
-									hover.append(" beans**\n");
-								}
+				if (!autowiredBeans.isEmpty()) {
+					if (!hasContent) {
+						hasContent = true;
+					} else {
+						hover.append("  \n  \n");
+					}
+					hover.append("**Autowired `");
+					hover.append(definedBean.getId());
+					hover.append("` &rarr; ");
+					if (LiveHoverUtils.doBeansFitInline(autowiredBeans, MAX_INLINE_BEANS_STRING_LENGTH - definedBean.getId().length(),
+							INLINE_BEANS_STRING_SEPARATOR)) {
+						hover.append(autowiredBeans.stream().map(b -> LiveHoverUtils.showBeanInline(server, project, b))
+								.collect(Collectors.joining(INLINE_BEANS_STRING_SEPARATOR)));
+						hover.append("**\n");
+					} else {
+						hover.append(autowiredBeans.size());
+						hover.append(" bean");
+						if (autowiredBeans.size() > 1) {
+							hover.append('s');
+						}
+						hover.append("**\n");
+					}
 //								if (autowiredBeans.size() == 1) {
 //									hover.append(LiveHoverUtils.showBeanIdAndTypeInline(server, project, autowiredBeans.get(0)));
 //								} else {
 //									hover.append(autowiredBeans.size());
 //									hover.append(" beans**\n");
 //								}
-								hover.append(autowiredBeans.stream()
-										.map(b -> "- " + LiveHoverUtils.showBeanWithResource(server, b, "  ", project))
-										.collect(Collectors.joining("\n"))
-								);
-								hover.append("\n  \n");
-								hover.append(LiveHoverUtils.niceAppName(app));
-							}
-						}
-					}
+					hover.append(autowiredBeans.stream()
+							.map(b -> "- " + LiveHoverUtils.showBeanWithResource(server, b, "  ", project))
+							.collect(Collectors.joining("\n")));
+					hover.append("\n  \n");
+					hover.append(LiveHoverUtils.niceAppName(app));
+				}

-				}
-				if (hasContent) {
-					return new Hover(ImmutableList.of(Either.forLeft(hover.toString())));
-				}
+			}
+			if (hasContent) {
+				return new Hover(ImmutableList.of(Either.forLeft(hover.toString())));
 			}
 		}
 		return null;
 	}

+	private List<LiveBean> getRelevantAutowiredBeans(IJavaProject project, ASTNode declarationNode, SpringBootApp app, LiveBean definedBean) {
+		LiveBeansModel beans = app.getBeans();
+		List<LiveBean> relevantBeans = LiveHoverUtils.findRelevantBeans(app, definedBean);
+
+		if (!relevantBeans.isEmpty()) {
+			List<LiveBean> allDependencyBeans = relevantBeans.stream()
+					.flatMap(b -> Arrays.stream(b.getDependencies())).distinct()
+					.flatMap(d -> beans.getBeansOfName(d).stream()).collect(Collectors.toList());
+
+			if (!allDependencyBeans.isEmpty()) {
+
+				List<LiveBean> autowiredBeans = findAutowiredBeans(project, declarationNode,
+						allDependencyBeans);
+				if (autowiredBeans.isEmpty()) {
+					// Show all relevant dependency beans
+					autowiredBeans = allDependencyBeans;
+				} else {
+					return autowiredBeans;
+				}
+			}
+		}
+
+		return Collections.emptyList();
+	}
+
 	@SuppressWarnings("unchecked")
 	private List<LiveBean> findAutowiredBeans(IJavaProject project, ASTNode declarationNode, Collection<LiveBean> beans) {
 		if (declarationNode instanceof MethodDeclaration) {
@@ -190,14 +209,17 @@ public class AutowiredHoverProvider implements HoverProvider {
 		if (type != null) {
 			String fqName = type.getQualifiedName();
 			if (fqName != null) {
-				relevant = matchBeans(project, beans, fqName);
+				relevant = matchBeans(project, beans, fqName, true);
 				if (relevant.isEmpty()) {
 					IType indexType = project.findType(fqName);
 					if (indexType != null) {
 						relevant = project.allSubtypesOf(indexType)
-							.map(subType -> matchBeans(project, beans, subType.getFullyQualifiedName()))
+							.map(subType -> matchBeans(project, beans, subType.getFullyQualifiedName(), false))
 							.filter(relevantBeans -> !relevantBeans.isEmpty())
 							.blockFirst();
+						if (relevant == null) {
+							relevant = Collections.emptyList();
+						}
 					}
 				}
 			}
@@ -205,48 +227,83 @@ public class AutowiredHoverProvider implements HoverProvider {
 		return relevant;
 	}

-	private List<LiveBean> matchBeans(IJavaProject project, Collection<LiveBean> beans, String fqName) {
+	private List<LiveBean> matchBeans(IJavaProject project, Collection<LiveBean> beans, String fqName, boolean allDots) {
 		if (fqName != null) {
-			return beans.stream().filter(b -> fqName.equals(b.getType(true))).collect(Collectors.toList());
+			if (allDots) {
+				return beans.stream().filter(b -> fqName.equals(b.getType(true).replace('$', '.'))).collect(Collectors.toList());
+			} else {
+				return beans.stream().filter(b -> fqName.equals(b.getType(true))).collect(Collectors.toList());
+			}
 		} else {
 			return Collections.emptyList();
 		}
 	}

-	private LiveBean getDefinedBean(Annotation autowiredAnnotation) {
-		TypeDeclaration declaringType = ASTUtils.findDeclaringType(autowiredAnnotation);
+	private LiveBean getDefinedBeanForTypeDeclaration(TypeDeclaration declaringType) {
 		if (declaringType != null) {
 			for (Annotation annotation : ASTUtils.getAnnotations(declaringType)) {
 				if (AnnotationHierarchies.isSubtypeOf(annotation, Annotations.COMPONENT)) {
 					return ComponentInjectionsHoverProvider.getDefinedBeanForComponent(annotation);
 				}
 			}
-			//TODO: handler below is an attempt to do something that may work in many cases, but is probably
-			// missing logics for special cases where annotation attributes on the declaring type matter.
+			// TODO: handler below is an attempt to do something that may work in many
+			// cases, but is probably
+			// missing logics for special cases where annotation attributes on the declaring
+			// type matter.
 			ITypeBinding beanType = declaringType.resolveBinding();
-			if (beanType!=null) {
+			if (beanType != null) {
 				String beanTypeName = beanType.getName();
 				if (StringUtil.hasText(beanTypeName)) {
 					return LiveBean.builder()
 							.id(Character.toLowerCase(beanTypeName.charAt(0)) + beanTypeName.substring(1))
-							.type(beanTypeName)
-							.build();
+							.type(beanTypeName).build();
 				}
 			}
-			return null;
 		}
 		return null;
 	}

 	@Override
-	public Hover provideHover(ASTNode node, TypeDeclaration typeDeclaration, ITypeBinding type, int offset,
-			TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
-		return null;
+	public Hover provideHover(MethodDeclaration methodDeclaration, int offset, TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
+		LiveBean definedBean = getDefinedBeanForImplicitAutowiredConstructor(methodDeclaration);
+		return provideHover(definedBean, methodDeclaration, offset, doc, project, runningApps);
 	}

 	@Override
-	public Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc, SpringBootApp[] runningApps) {
+	public Collection<Range> getLiveHoverHints(IJavaProject project, MethodDeclaration methodDeclaration, TextDocument doc,
+			SpringBootApp[] runningApps) {
+		LiveBean definedBean = getDefinedBeanForImplicitAutowiredConstructor(methodDeclaration);
+		try {
+			Range hoverRange = doc.toRange(methodDeclaration.getName().getStartPosition(), methodDeclaration.getName().getLength());
+			return getLiveHoverHints(project, methodDeclaration, hoverRange, runningApps, definedBean);
+		} catch (BadLocationException e) {
+			log.error("", e);
+		}
 		return null;
 	}

+	private LiveBean getDefinedBeanForImplicitAutowiredConstructor(MethodDeclaration methodDeclaration) {
+		if (methodDeclaration.isConstructor() && !methodDeclaration.parameters().isEmpty()) {
+			TypeDeclaration typeDeclaration = ASTUtils.findDeclaringType(methodDeclaration);
+			if (typeDeclaration != null && ASTUtils.hasExactlyOneConstructor(typeDeclaration) && !hasAutowiredAnnotation(methodDeclaration)) {
+				return getDefinedBeanForTypeDeclaration(typeDeclaration);
+			}
+		}
+		return null;
+	}
+
+	private boolean hasAutowiredAnnotation(MethodDeclaration constructor) {
+		List<?> modifiers = constructor.modifiers();
+		for (Object modifier : modifiers) {
+			if (modifier instanceof MarkerAnnotation) {
+				ITypeBinding typeBinding = ((MarkerAnnotation) modifier).resolveTypeBinding();
+				if (typeBinding != null) {
+					String fqName = typeBinding.getQualifiedName();
+					return Annotations.AUTOWIRED.equals(fqName) || Annotations.INJECT.equals(fqName);
+				}
+			}
+		}
+		return false;
+	}
+
 }
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java
@@ -28,7 +28,6 @@ import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.springframework.ide.vscode.boot.java.handlers.HoverProvider;
 import org.springframework.ide.vscode.boot.java.livehover.LiveHoverUtils;
 import org.springframework.ide.vscode.commons.boot.app.cli.LiveConditional;
-import org.springframework.ide.vscode.commons.boot.app.cli.LocalSpringBootApp;
 import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
 import org.springframework.ide.vscode.commons.util.Log;
@@ -50,7 +49,7 @@ public class ConditionalsLiveHoverProvider implements HoverProvider {
 	}

 	@Override
-	public Collection<Range> getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
+	public Collection<Range> getLiveHoverHints(IJavaProject project, Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
 		try {
 			Optional<List<LiveConditional>> val = getMatchedLiveConditionals(annotation, runningApps);
 			if (val.isPresent()) {
@@ -156,16 +155,4 @@ public class ConditionalsLiveHoverProvider implements HoverProvider {
 		return false;
 	}

-	@Override
-	public Hover provideHover(ASTNode node, TypeDeclaration typeDeclaration, ITypeBinding type, int offset,
-			TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
-		return null;
-	}
-
-	@Override
-	public Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc,
-			SpringBootApp[] runningApps) {
-		return null;
-	}
-
 }
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/BootJavaHoverProvider.java
@@ -19,6 +19,7 @@ import org.eclipse.jdt.core.dom.ASTVisitor;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MarkerAnnotation;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.NodeFinder;
 import org.eclipse.jdt.core.dom.NormalAnnotation;
 import org.eclipse.jdt.core.dom.SimpleName;
@@ -140,6 +141,19 @@ public class BootJavaHoverProvider implements HoverHandler {

 							return super.visit(node);
 						}
+
+						@Override
+						public boolean visit(MethodDeclaration node) {
+							try {
+								extractLiveHintsForMethod(node, document, runningBootApps, result);
+							} catch (Exception e) {
+								Log.log(e);
+							}
+
+							return super.visit(node);
+						}
+
+
 					});
 				}
 			} catch (Exception e) {
@@ -149,13 +163,33 @@ public class BootJavaHoverProvider implements HoverHandler {
 		});
 	}

+	protected void extractLiveHintsForMethod(MethodDeclaration methodDeclaration, TextDocument doc,
+			SpringBootApp[] runningApps, Collection<Range> result) {
+		Collection<HoverProvider> providers = this.hoverProviders.getAll();
+		if (!providers.isEmpty()) {
+			for (HoverProvider provider : providers) {
+				getProject(doc).ifPresent(project -> {
+					if (hasActuatorDependency(project)) {
+						Collection<Range> hints = provider.getLiveHoverHints(project, methodDeclaration, doc, runningApps);
+						if (hints!=null) {
+							result.addAll(hints);
+						}
+					} else {
+						//Do nothing... we don't want a highlight for the 'no actuator warning'
+						//ASTUtils.nameRange(doc, annotation).ifPresent(result::add);
+					}
+				});
+			}
+		}
+	}
+
 	protected void extractLiveHintsForType(TypeDeclaration typeDeclaration, TextDocument doc, SpringBootApp[] runningApps, Collection<Range> result) {
 		Collection<HoverProvider> providers = this.hoverProviders.getAll();
 		if (!providers.isEmpty()) {
 			for (HoverProvider provider : providers) {
 				getProject(doc).ifPresent(project -> {
 					if (hasActuatorDependency(project)) {
-						Collection<Range> hints = provider.getLiveHoverHints(typeDeclaration, doc, runningApps);
+						Collection<Range> hints = provider.getLiveHoverHints(project, typeDeclaration, doc, runningApps);
 						if (hints!=null) {
 							result.addAll(hints);
 						}
@@ -175,7 +209,7 @@ public class BootJavaHoverProvider implements HoverHandler {
 				for (HoverProvider provider : this.hoverProviders.get(type)) {
 					getProject(doc).ifPresent(project -> {
 						if (hasActuatorDependency(project)) {
-							Collection<Range> hints = provider.getLiveHoverHints(annotation, doc, runningApps);
+							Collection<Range> hints = provider.getLiveHoverHints(project, annotation, doc, runningApps);
 							if (hints!=null) {
 								result.addAll(hints);
 							}
@@ -215,10 +249,29 @@ public class BootJavaHoverProvider implements HoverHandler {
 		}

 		// then do additional AST node coverage
-		if (node instanceof SimpleName && node.getParent() instanceof TypeDeclaration) {
-			return provideHoverForTypeDeclaration(node, (TypeDeclaration) node.getParent(), offset, doc, project);
+		if (node instanceof SimpleName) {
+			ASTNode parent = node.getParent();
+			if (parent instanceof TypeDeclaration) {
+				return provideHoverForTypeDeclaration(node, (TypeDeclaration) parent, offset, doc, project);
+			} else if (parent instanceof MethodDeclaration) {
+				return provideHoverForMethodDeclaration((MethodDeclaration) parent, offset, doc, project);
+			}
 		}
+		return null;
+	}

+	private Hover provideHoverForMethodDeclaration(MethodDeclaration methodDeclaration, int offset, TextDocument doc,
+			IJavaProject project) {
+		SpringBootApp[] runningApps = getRunningSpringApps(project);
+		if (runningApps.length > 0) {
+			for (HoverProvider provider : this.hoverProviders.getAll()) {
+				Hover hover = provider.provideHover(methodDeclaration, offset, doc, project, runningApps);
+				if (hover!=null) {
+					//TODO: compose multiple hovers somehow instead of just returning the first one?
+					return hover;
+				}
+			}
+		}
 		return null;
 	}

--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/HoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/HoverProvider.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.Range;
@@ -27,10 +28,24 @@ import org.springframework.ide.vscode.commons.util.text.TextDocument;
 */
 public interface HoverProvider {

-	Hover provideHover(ASTNode node, Annotation annotation, ITypeBinding type, int offset, TextDocument doc, IJavaProject project, SpringBootApp[] runningApps);
-	Hover provideHover(ASTNode node, TypeDeclaration typeDeclaration, ITypeBinding type, int offset, TextDocument doc, IJavaProject project, SpringBootApp[] runningApps);
+	default Hover provideHover(ASTNode node, Annotation annotation, ITypeBinding type, int offset, TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
+		return null;
+	}
+	default Hover provideHover(ASTNode node, TypeDeclaration typeDeclaration, ITypeBinding type, int offset, TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
+		return null;
+	}
+	default Hover provideHover(MethodDeclaration methodDeclaration, int offset, TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
+		return null;
+	}

-	Collection<Range> getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps);
-	Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc, SpringBootApp[] runningApps);
+	default Collection<Range> getLiveHoverHints(IJavaProject project, Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
+		return null;
+	}
+	default Collection<Range> getLiveHoverHints(IJavaProject project,TypeDeclaration typeDeclaration, TextDocument doc, SpringBootApp[] runningApps) {
+		return null;
+	}
+	default Collection<Range> getLiveHoverHints(IJavaProject project, MethodDeclaration methodDeclaration, TextDocument doc, SpringBootApp[] runningApps) {
+		return null;
+	}

 }
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppMatcher.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/handlers/RunningAppMatcher.java
@@ -33,19 +33,26 @@ public class RunningAppMatcher  {
 				return RunningAppMatcher.doesProjectMatch(app, project);
 			}).collect(CollectorUtil.toImmutableList());

-			if (matchedProjects.size() > 0) {
-				return matchedProjects;
-			}
+			return matchedProjects;
 		}
 		return apps;
 	}

 	private static boolean doesProjectMatch(SpringBootApp app, IJavaProject project) {
-		if (doesProjectNameMatch(app, project)) return true;
-		if (doesProjectThinJarWrapperMatch(app, project)) return true;
-		if (doesClasspathMatch(app, project)) return true;
+		if (hasProjectName(app, project)) {
+			return doesProjectNameMatch(app, project);
+		}
+		return true;
+	}

-		return false;
+	public static boolean hasProjectName(SpringBootApp app, IJavaProject project) {
+		try {
+			String projectName = app.getSystemProperty("spring.boot.project.name");
+			return projectName != null && projectName.trim().length() > 0;
+		}
+		catch (Exception e) {
+			return false;
+		}
 	}

 	public static boolean doesProjectNameMatch(SpringBootApp app, IJavaProject project) {
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/AbstractInjectedIntoHoverProvider.java
@@ -11,6 +11,7 @@
 package org.springframework.ide.vscode.boot.java.livehover;

 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -22,6 +23,8 @@ import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents;
 import org.springframework.ide.vscode.boot.java.handlers.HoverProvider;
 import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
@@ -29,14 +32,17 @@ import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp;
 import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean;
 import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
-import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
-import org.springframework.ide.vscode.commons.util.Log;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;

 import com.google.common.collect.ImmutableList;

 public abstract class AbstractInjectedIntoHoverProvider implements HoverProvider {

+	private static Logger LOG = LoggerFactory.getLogger(AbstractInjectedIntoHoverProvider.class);
+
+	private static final int MAX_INLINE_BEANS_STRING_LENGTH = 60;
+	private static final String INLINE_BEANS_STRING_SEPARATOR = " ";
+
 	protected BootJavaLanguageServerComponents server;

 	public AbstractInjectedIntoHoverProvider(BootJavaLanguageServerComponents server) {
@@ -44,7 +50,7 @@ public abstract class AbstractInjectedIntoHoverProvider implements HoverProvider
 	}

 	@Override
-	public Collection<Range> getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
+	public Collection<Range> getLiveHoverHints(IJavaProject project, Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
 		// Highlight if any running app contains an instance of this component
 		try {
 			if (runningApps.length > 0) {
@@ -59,7 +65,7 @@ public abstract class AbstractInjectedIntoHoverProvider implements HoverProvider
 				}
 			}
 		} catch (Exception e) {
-			Log.log(e);
+			LOG.error("", e);
 		}
 		return ImmutableList.of();
 	}
@@ -71,59 +77,80 @@ public abstract class AbstractInjectedIntoHoverProvider implements HoverProvider

 			LiveBean definedBean = getDefinedBean(annotation);
 			if (definedBean != null) {
-				StringBuilder hover = new StringBuilder();
-				hover.append("**Injection report for " + LiveHoverUtils.showBean(definedBean) + "**\n\n");
-
-				boolean hasInterestingApp = false;
-				for (SpringBootApp app : runningApps) {
-					LiveBeansModel beans = app.getBeans();
-					List<LiveBean> relevantBeans = LiveHoverUtils.findRelevantBeans(app, definedBean).collect(Collectors.toList());
-
-					if (!relevantBeans.isEmpty()) {
-						if (!hasInterestingApp) {
-							hasInterestingApp = true;
-						} else {
-							hover.append("\n\n");
-						}
-						hover.append(LiveHoverUtils.niceAppName(app) + ":");
-
-						for (LiveBean bean : relevantBeans) {
-							addInjectedInto(definedBean, hover, beans, bean, project);
-							addAutomaticallyWiredContructor(hover, annotation, beans, bean, project);
-						}
-					}
-				}
-				if (hasInterestingApp) {
-					return new Hover(ImmutableList.of(Either.forLeft(hover.toString())));
-				}
+				return assembleHover(project, runningApps, definedBean);
 			}
 		}
 		return null;
 	}

+	protected Hover assembleHover(IJavaProject project, SpringBootApp[] runningApps, LiveBean definedBean) {
+		StringBuilder hover = new StringBuilder();
+
+		boolean hasContent = false;
+
+		for (SpringBootApp app : runningApps) {
+
+			List<LiveBean> relevantBeans = LiveHoverUtils.findRelevantBeans(app, definedBean);
+
+			if (!relevantBeans.isEmpty()) {
+				List<LiveBean> injectedBeans = getRelevantInjectedIntoBeans(project, app, definedBean, relevantBeans);
+
+				if (!hasContent) {
+					hasContent = true;
+				} else {
+					hover.append("  \n  \n");
+				}
+
+				if (injectedBeans.isEmpty()) {
+					hover.append("**Injected `");
+					hover.append(definedBean.getId());
+					hover.append("` &rarr; _not injected anywhere_**  \n");
+				} else {
+					hover.append("**Injected `");
+					hover.append(definedBean.getId());
+					hover.append("` &rarr; ");
+					if (LiveHoverUtils.doBeansFitInline(injectedBeans, MAX_INLINE_BEANS_STRING_LENGTH - definedBean.getId().length(),
+							INLINE_BEANS_STRING_SEPARATOR)) {
+						hover.append(injectedBeans.stream().map(b -> LiveHoverUtils.showBeanInline(server, project, b))
+								.collect(Collectors.joining(INLINE_BEANS_STRING_SEPARATOR)));
+						hover.append("**\n");
+					} else {
+						hover.append(injectedBeans.size());
+						hover.append(" bean");
+						if (injectedBeans.size() > 1) {
+							hover.append('s');
+						}
+						hover.append("**\n");
+					}
+					hover.append(injectedBeans.stream()
+							.map(b -> "- " + LiveHoverUtils.showBeanWithResource(server, b, "  ", project))
+							.collect(Collectors.joining("\n")));
+					hover.append("\n  \n");
+				}
+				hover.append(LiveHoverUtils.niceAppName(app));
+			}
+
+		}
+		if (hasContent) {
+			return new Hover(ImmutableList.of(Either.forLeft(hover.toString())));
+		} else {
+			return null;
+		}
+
+	}
+
+	protected List<LiveBean> getRelevantInjectedIntoBeans(IJavaProject project, SpringBootApp app, LiveBean definedBean, List<LiveBean> relevantBeans) {
+		LiveBeansModel beans = app.getBeans();
+		if (relevantBeans != null) {
+			return relevantBeans.stream()
+					.flatMap(b -> beans.getBeansDependingOn(b.getId()).stream())
+					.distinct()
+					.collect(Collectors.toList());
+
+		}
+		return Collections.emptyList();
+	}
+
 	protected abstract LiveBean getDefinedBean(Annotation annotation);

-	protected void addAutomaticallyWiredContructor(StringBuilder hover, Annotation annotation, LiveBeansModel beans, LiveBean bean, IJavaProject project) {
-		//This doesn't really belong here, but it accomodates Martin's additional logic to handle implicitly
-		//@Autowired constructor.
-		//This does nothing by default as its really only relevant to @Component annotation report.
-	}
-
-	protected void addInjectedInto(LiveBean definedBean, StringBuilder hover, LiveBeansModel beans, LiveBean bean, IJavaProject project) {
-		hover.append("\n\n");
-		List<LiveBean> dependers = beans.getBeansDependingOn(bean.getId());
-		if (dependers.isEmpty()) {
-			hover.append(LiveHoverUtils.showBean(bean) + " exists but is **Not injected anywhere**\n");
-		} else {
-			hover.append(LiveHoverUtils.showBean(bean) + " injected into:\n\n");
-			boolean firstDependency = true;
-			for (LiveBean dependingBean : dependers) {
-				if (!firstDependency) {
-					hover.append("\n");
-				}
-				hover.append("- " + LiveHoverUtils.showBeanWithResource(server, dependingBean, "  ", project));
-				firstDependency = false;
-			}
-		}
-	}
 }
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ActiveProfilesProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.jdt.core.dom.ASTVisitor;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
@@ -81,7 +80,7 @@ public class ActiveProfilesProvider implements HoverProvider {
 	}

 	@Override
-	public Collection<Range> getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
+	public Collection<Range> getLiveHoverHints(IJavaProject project, Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
 		if (runningApps.length > 0) {
 			Builder<Range> ranges = ImmutableList.builder();
 			nameRange(doc, annotation).ifPresent(ranges::add);
@@ -130,16 +129,4 @@ public class ActiveProfilesProvider implements HoverProvider {
 		}
 	}

-	@Override
-	public Hover provideHover(ASTNode node, TypeDeclaration typeDeclaration, ITypeBinding type, int offset,
-			TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
-		return null;
-	}
-
-	@Override
-	public Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc,
-			SpringBootApp[] runningApps) {
-		return null;
-	}
-
 }
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/BeanInjectedIntoHoverProvider.java
@@ -10,24 +10,14 @@
 *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.livehover;

-import java.util.Collection;
 import java.util.Optional;

-import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.lsp4j.Hover;
-import org.eclipse.lsp4j.Range;
 import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents;
 import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
-import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp;
 import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean;
-import org.springframework.ide.vscode.commons.java.IJavaProject;
-import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
 import org.springframework.ide.vscode.commons.util.Optionals;
-import org.springframework.ide.vscode.commons.util.text.TextDocument;

 public class BeanInjectedIntoHoverProvider extends AbstractInjectedIntoHoverProvider {

@@ -76,16 +66,4 @@ public class BeanInjectedIntoHoverProvider extends AbstractInjectedIntoHoverProv
 		);
 	}

-	@Override
-	public Hover provideHover(ASTNode node, TypeDeclaration typeDeclaration, ITypeBinding type, int offset,
-			TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
-		return null;
-	}
-
-	@Override
-	public Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc,
-			SpringBootApp[] runningApps) {
-		return null;
-	}
-
 }
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/ComponentInjectionsHoverProvider.java
@@ -14,27 +14,23 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;

 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.Range;
-import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.ide.vscode.boot.java.Annotations;
 import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents;
 import org.springframework.ide.vscode.boot.java.annotations.AnnotationHierarchies;
 import org.springframework.ide.vscode.boot.java.utils.ASTUtils;
 import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp;
 import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean;
-import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel;
 import org.springframework.ide.vscode.commons.java.IJavaProject;
-import org.springframework.ide.vscode.commons.util.Log;
 import org.springframework.ide.vscode.commons.util.StringUtil;
 import org.springframework.ide.vscode.commons.util.text.TextDocument;

@@ -42,53 +38,12 @@ import com.google.common.collect.ImmutableList;

 public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverProvider {

+	private static Logger LOG = LoggerFactory.getLogger(ComponentInjectionsHoverProvider.class);
+
 	public ComponentInjectionsHoverProvider(BootJavaLanguageServerComponents server) {
 		super(server);
 	}

-	@Override
-	protected void addAutomaticallyWiredContructor(StringBuilder hover, Annotation annotation, LiveBeansModel beans, LiveBean bean, IJavaProject project) {
-		TypeDeclaration typeDecl = ASTUtils.findDeclaringType(annotation);
-		if (typeDecl != null) {
-			MethodDeclaration[] constructors = ASTUtils.findConstructors(typeDecl);
-
-			if (constructors != null && constructors.length == 1 && !hasAutowiredAnnotation(constructors[0])) {
-				String[] dependencies = bean.getDependencies();
-
-				if (dependencies != null && dependencies.length > 0) {
-					hover.append("\n\n");
-					hover.append(LiveHoverUtils.showBean(bean) + " got autowired with:\n\n");
-
-					boolean firstDependency = true;
-					for (String injectedBean : dependencies) {
-						if (!firstDependency) {
-							hover.append("\n");
-						}
-						List<LiveBean> dependencyBeans = beans.getBeansOfName(injectedBean);
-						for (LiveBean dependencyBean : dependencyBeans) {
-							hover.append("- " + LiveHoverUtils.showBeanWithResource(server, dependencyBean, "  ", project));
-						}
-						firstDependency = false;
-					}
-				}
-			}
-		}
-	}
-
-	private boolean hasAutowiredAnnotation(MethodDeclaration constructor) {
-		List<?> modifiers = constructor.modifiers();
-		for (Object modifier : modifiers) {
-			if (modifier instanceof MarkerAnnotation) {
-				ITypeBinding typeBinding = ((MarkerAnnotation) modifier).resolveTypeBinding();
-				if (typeBinding != null) {
-					String fqName = typeBinding.getQualifiedName();
-					return Annotations.AUTOWIRED.equals(fqName) || Annotations.INJECT.equals(fqName);
-				}
-			}
-		}
-		return false;
-	}
-
 	@Override
 	protected LiveBean getDefinedBean(Annotation annotation) {
 		return getDefinedBeanForComponent(annotation);
@@ -106,7 +61,7 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP
 			if (beanType != null) {
 				String id = getBeanId(annotation, beanType);
 				if (StringUtil.hasText(id)) {
-					return LiveBean.builder().id(id).type(beanType.getQualifiedName()).build();
+					return LiveBean.builder().id(id).type(getBeanType(beanType).toString()).build();
 				}
 			}
 		}
@@ -119,9 +74,8 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP
 			String typeName = beanType.getName();

 			ITypeBinding declaringClass = beanType.getDeclaringClass();
-			while (declaringClass != null) {
-				typeName = declaringClass.getName() + "." + typeName;
-				declaringClass = declaringClass.getDeclaringClass();
+			if (declaringClass != null) {
+				return getBeanType(beanType).toString();
 			}

 			if (StringUtil.hasText(typeName)) {
@@ -131,8 +85,20 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP
 		});
 	}

+	private static StringBuilder getBeanType(ITypeBinding beanType) {
+		ITypeBinding declaringClass = beanType.getDeclaringClass();
+		if (declaringClass == null) {
+			return new StringBuilder(beanType.getQualifiedName());
+		} else {
+			StringBuilder sb = getBeanType(declaringClass);
+			sb.append('$');
+			sb.append(beanType.getName());
+			return sb;
+		}
+	}
+
 	@Override
-	public Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc,
+	public Collection<Range> getLiveHoverHints(IJavaProject project, TypeDeclaration typeDeclaration, TextDocument doc,
 			SpringBootApp[] runningApps) {
 		if (runningApps.length > 0 && !isComponentAnnotatedType(typeDeclaration)) {
 			try {
@@ -146,7 +112,7 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP
 					}
 				}
 			} catch (Exception e) {
-				Log.log(e);
+				LOG.error("", e);
 			}
 		}
 		return ImmutableList.of();
@@ -160,30 +126,7 @@ public class ComponentInjectionsHoverProvider extends AbstractInjectedIntoHoverP

 			LiveBean definedBean = getDefinedBeanForType(typeDeclaration, null);
 			if (definedBean != null) {
-				StringBuilder hover = new StringBuilder();
-				hover.append("**Injection report for " + LiveHoverUtils.showBean(definedBean) + "**\n\n");
-
-				boolean hasInterestingApp = false;
-				for (SpringBootApp app : runningApps) {
-					LiveBeansModel beans = app.getBeans();
-					List<LiveBean> relevantBeans = LiveHoverUtils.findRelevantBeans(app, definedBean).collect(Collectors.toList());
-
-					if (!relevantBeans.isEmpty()) {
-						if (!hasInterestingApp) {
-							hasInterestingApp = true;
-						} else {
-							hover.append("\n\n");
-						}
-						hover.append(LiveHoverUtils.niceAppName(app) + ":");
-
-						for (LiveBean bean : relevantBeans) {
-							addInjectedInto(definedBean, hover, beans, bean, project);
-						}
-					}
-				}
-				if (hasInterestingApp) {
-					return new Hover(ImmutableList.of(Either.forLeft(hover.toString())));
-				}
+				return assembleHover(project, runningApps, definedBean);
 			}
 		}
 		return null;
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/LiveHoverUtils.java
@@ -11,8 +11,10 @@
 package org.springframework.ide.vscode.boot.java.livehover;

 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
+import java.util.stream.Collectors;

 import org.springframework.ide.vscode.boot.java.BootJavaLanguageServerComponents;
 import org.springframework.ide.vscode.boot.java.links.SourceLinkFactory;
@@ -131,20 +133,25 @@ public class LiveHoverUtils {
 	}

 	public static boolean hasRelevantBeans(SpringBootApp app, LiveBean definedBean) {
-		return findRelevantBeans(app, definedBean).findAny().isPresent();
+		return findRelevantBeans(app, definedBean).stream().findAny().isPresent();
 	}

-	public static Stream<LiveBean> findRelevantBeans(SpringBootApp app, LiveBean definedBean) {
+	public static List<LiveBean> findRelevantBeans(SpringBootApp app, LiveBean definedBean) {
 		LiveBeansModel beansModel = app.getBeans();
 		if (beansModel != null) {
-			Stream<LiveBean> relevantBeans = beansModel.getBeansOfName(definedBean.getId()).stream();
+			List<LiveBean> relevantBeans = beansModel.getBeansOfName(definedBean.getId());
 			String type = definedBean.getType();
 			if (type != null) {
-				relevantBeans = relevantBeans.filter(bean -> type.equals(bean.getType(true)));
+				// TODO: check if we should check for bean type rather than id that we build ourselves based on type
+//				if (relevantBeans.isEmpty()) {
+//					relevantBeans = beansModel.getBeansOfType(type);
+//				} else {
+					relevantBeans = relevantBeans.stream().filter(bean -> type.equals(bean.getType(true))).collect(Collectors.toList());
+//				}
 			}
 			return relevantBeans;
 		}
-		return Stream.empty();
+		return Collections.emptyList();
 	}

 	public static String niceAppName(SpringBootApp app) {
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
@@ -22,7 +22,6 @@ import org.eclipse.jdt.core.dom.Annotation;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.MarkedString;
 import org.eclipse.lsp4j.Range;
@@ -55,7 +54,7 @@ public class RequestMappingHoverProvider implements HoverProvider {
 	}

 	@Override
-	public Collection<Range> getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
+	public Collection<Range> getLiveHoverHints(IJavaProject project, Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
 		try {
 			if (runningApps.length > 0) {
 				List<Tuple2<RequestMapping, SpringBootApp>> val = getRequestMappingMethodFromRunningApp(annotation, runningApps);
@@ -173,16 +172,4 @@ public class RequestMappingHoverProvider implements HoverProvider {
 		}
 	}

-	@Override
-	public Hover provideHover(ASTNode node, TypeDeclaration typeDeclaration, ITypeBinding type, int offset,
-			TextDocument doc, IJavaProject project, SpringBootApp[] runningApps) {
-		return null;
-	}
-
-	@Override
-	public Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc,
-			SpringBootApp[] runningApps) {
-		return null;
-	}
-
 }
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/ASTUtils.java
@@ -10,7 +10,6 @@
 *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.utils;

-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
@@ -128,8 +127,7 @@ public class ASTUtils {
 		return Optional.empty();
 	}

-	public static TypeDeclaration findDeclaringType(Annotation annotation) {
-		ASTNode node = annotation;
+	public static TypeDeclaration findDeclaringType(ASTNode node) {
 		while (node != null && !(node instanceof TypeDeclaration)) {
 			node = node.getParent();
 		}
@@ -137,20 +135,21 @@ public class ASTUtils {
 		return node != null ? (TypeDeclaration) node : null;
 	}

-	public static MethodDeclaration[] findConstructors(TypeDeclaration typeDecl) {
-		List<MethodDeclaration> constructors = new ArrayList<>();
-
+	public static boolean hasExactlyOneConstructor(TypeDeclaration typeDecl) {
+		boolean oneFound = false;
 		MethodDeclaration[] methods = typeDecl.getMethods();
 		for (MethodDeclaration methodDeclaration : methods) {
 			if (methodDeclaration.isConstructor()) {
-				constructors.add(methodDeclaration);
+				if (oneFound) {
+					return false;
+				} else {
+					oneFound = true;
+				}
 			}
 		}
-
-		return constructors.toArray(new MethodDeclaration[constructors.size()]);
+		return oneFound;
 	}

-
 	public static MethodDeclaration getAnnotatedMethod(Annotation annotation) {
 		ASTNode parent = annotation.getParent();
 		if (parent instanceof MethodDeclaration) {
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/value/ValueHoverProvider.java
@@ -10,7 +10,6 @@
 *******************************************************************************/
 package org.springframework.ide.vscode.boot.java.value;

-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -67,11 +66,6 @@ public class ValueHoverProvider implements HoverProvider {
 		return null;
 	}

-	@Override
-	public Collection<Range> getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) {
-		return null;
-	}
-
 	private Hover provideHover(String value, int offset, int nodeStartOffset, TextDocument doc, SpringBootApp[] runningApps) {

 		try {
@@ -206,10 +200,4 @@ public class ValueHoverProvider implements HoverProvider {
 		return null;
 	}

-	@Override
-	public Collection<Range> getLiveHoverHints(TypeDeclaration typeDeclaration, TextDocument doc,
-			SpringBootApp[] runningApps) {
-		return null;
-	}
-
 }
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java
@@ -14,6 +14,8 @@ import static org.junit.Assert.assertTrue;

 import java.nio.file.Paths;
 import java.time.Duration;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;

 import org.junit.Before;
 import org.junit.Test;
@@ -84,6 +86,34 @@ public class AutowiredHoverProviderTest {
 				"}\n"
 		);

+		p.createType("com.example.RuntimeBeanFactory",
+			Stream.of(
+				"package com.example;",
+				"public interface RuntimeBeanFactory {",
+				"void createRuntimeBean(String info);",
+				"}"
+			).collect(Collectors.joining("\n"))
+		);
+
+		p.createType("com.example.SomeComponent",
+				Stream.of("package com.example;",
+					"",
+					"import org.springframework.context.annotation.Bean;",
+					"",
+//					"@Component",
+					"public class SomeComponent {",
+					"",
+					"@Bean",
+					"public RuntimeBeanFactory getBeanFactory() {",
+					"\treturn new RuntimeBeanFactory() {",
+					"\t\tpublic void createRuntimeBean(String info){}",
+					"\t};",
+					"}",
+					"",
+					"}"
+				).collect(Collectors.joining("\n"))
+		);
+
 		p.createType("com.example.FooImplementation", FOO_IMPL_CONTENTS);
 	};

@@ -146,7 +176,7 @@ public class AutowiredHoverProviderTest {

 		editor.assertHighlights("@Component", "@Inject");
 		editor.assertTrimmedHover("@Inject",
-				"**Autowired &rarr; `dependencyA`**\n" +
+				"**Autowired `autowiredClass` &rarr; `dependencyA`**\n" +
 				"- Bean: `dependencyA`  \n" +
 				"  Type: `com.example.DependencyA`  \n" +
 				"  Resource: `" + Paths.get("com/example/DependencyA.class") + "`\n" +
@@ -201,7 +231,7 @@ public class AutowiredHoverProviderTest {

 		editor.assertHighlights("@Component", "@Autowired");
 		editor.assertTrimmedHover("@Autowired",
-				"**Autowired &rarr; `dependencyA` `dependencyB`**\n" +
+				"**Autowired `autowiredClass` &rarr; `dependencyA` `dependencyB`**\n" +
 				"- Bean: `dependencyA`  \n" +
 				"  Type: `com.example.DependencyA`  \n" +
 				"  Resource: `" + Paths.get("com/example/DependencyA.class") + "`\n" +
@@ -352,11 +382,11 @@ public class AutowiredHoverProviderTest {
 		Editor editor = harness.newEditor(LanguageId.JAVA, FOO_IMPL_CONTENTS);
 		editor.assertHighlights("@Component", "@Autowired", "@Autowired");
 		editor.assertHoverContains("@Autowired", 1,
-				"**Autowired &rarr; `superBean`**\n" +
+				"**Autowired `defaultFoo` &rarr; `superBean`**\n" +
 				"- Bean: `superBean`  \n" +
 				"  Type: `com.example.FooImplementation`");
 		editor.assertHoverContains("@Autowired", 2,
-				"**Autowired &rarr; `scheduler`**\n" +
+				"**Autowired `defaultFoo` &rarr; `scheduler`**\n" +
 				"- Bean: `scheduler`  \n" +
 				"  Type: `org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler`");
 	}
@@ -406,13 +436,220 @@ public class AutowiredHoverProviderTest {
 		);
 		editor.assertHighlights("@Controller", "@Autowired");
 		editor.assertHoverContains("@Autowired",
-				"**Autowired &rarr; `restTemplate`**\n" +
+				"**Autowired `myController` &rarr; `restTemplate`**\n" +
 				"- Bean: `restTemplate`  \n" +
 				"  Type: `org.springframework.web.client.RestTemplate`"
 		);
 		editor.assertHoverContains("@Controller",
-				"**Injection report for Bean [id: myController, type: `com.example.MyController`]**"
+				"**Injected `myController` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

+	@Test
+	public void implicitAutowiringSingleConstructor() throws Exception {
+		LiveBeansModel beans = LiveBeansModel.builder()
+				.add(LiveBean.builder()
+						.id("someComponent")
+						.type("com.example.SomeComponent")
+						.dependencies("dependencyA", "dependencyB")
+						.build()
+				)
+				.add(LiveBean.builder()
+						.id("dependencyA")
+						.type("com.example.DependencyA")
+						.build()
+				)
+				.add(LiveBean.builder()
+						.id("dependencyB")
+						.type("com.example.DependencyB")
+						.build()
+				)
+				.build();
+		mockAppProvider.builder()
+			.isSpringBootApp(true)
+			.processId("111")
+			.processName("the-app")
+			.beans(beans)
+			.build();
+
+		Editor editor = harness.newEditor(LanguageId.JAVA,
+				"package com.example;\n" +
+				"\n" +
+				"import org.springframework.stereotype.Component;\n" +
+				"\n" +
+				"@Component\n" +
+				"public class SomeComponent {\n" +
+				"\n" +
+				"   private DepedencyA depA;\n" +
+				"   private DepedencyB depB;\n" +
+				"\n" +
+				"	public SomeComponent(DependencyA depA, DependencyB depB) {\n" +
+				"		this.depA = depA;\n" +
+				"		this.depB = depB;\n" +
+				"	}\n" +
+				"}\n"
+		);
+
+		editor.assertHighlights("@Component", "SomeComponent");
+
+		editor.assertTrimmedHover("SomeComponent", 2,
+				"**Autowired `someComponent` &rarr; `dependencyA` `dependencyB`**\n" +
+				"- Bean: `dependencyA`  \n" +
+				"  Type: `com.example.DependencyA`\n" +
+				"- Bean: `dependencyB`  \n" +
+				"  Type: `com.example.DependencyB`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]\n"
+		);
+	}
+
+	@Test
+	public void noImplicitAutowiringForConstructorFromNonBean() throws Exception {
+		LiveBeansModel beans = LiveBeansModel.builder()
+				.add(LiveBean.builder()
+						.id("someOtherComponent")
+						.type("com.example.SomeOtherComponent")
+						.dependencies("dependencyA", "dependencyB")
+						.build()
+				)
+				.add(LiveBean.builder()
+						.id("dependencyA")
+						.type("com.example.DependencyA")
+						.build()
+				)
+				.add(LiveBean.builder()
+						.id("dependencyB")
+						.type("com.example.DependencyB")
+						.build()
+				)
+				.build();
+		mockAppProvider.builder()
+			.isSpringBootApp(true)
+			.processId("111")
+			.processName("the-app")
+			.beans(beans)
+			.build();
+
+		Editor editor = harness.newEditor(LanguageId.JAVA,
+				"package com.example;\n" +
+				"\n" +
+				"public class SomeComponent {\n" +
+				"\n" +
+				"   private DepedencyA depA;\n" +
+				"   private DepedencyB depB;\n" +
+				"\n" +
+				"	public SomeComponent(DependencyA depA, DependencyB depB) {\n" +
+				"		this.depA = depA;\n" +
+				"		this.depB = depB;\n" +
+				"	}\n" +
+				"}\n"
+		);
+
+		editor.assertHighlights();
+
+		for (int i = 1; i < 2; i++) {
+			editor.assertNoHover("SomeComponent", i);
+		}
+	}
+
+	@Test
+	public void noImplicitAutowiringForMultipleConstructors() throws Exception {
+		LiveBeansModel beans = LiveBeansModel.builder()
+				.add(LiveBean.builder()
+						.id("someComponent")
+						.type("com.example.SomeComponent")
+						.dependencies("dependencyA", "dependencyB")
+						.build()
+				)
+				.add(LiveBean.builder()
+						.id("dependencyA")
+						.type("com.example.DependencyA")
+						.build()
+				)
+				.add(LiveBean.builder()
+						.id("dependencyB")
+						.type("com.example.DependencyB")
+						.build()
+				)
+				.build();
+		mockAppProvider.builder()
+			.isSpringBootApp(true)
+			.processId("111")
+			.processName("the-app")
+			.beans(beans)
+			.build();
+
+		Editor editor = harness.newEditor(LanguageId.JAVA,
+				"package com.example;\n" +
+				"\n" +
+				"import org.springframework.stereotype.Component;\n" +
+				"\n" +
+				"@Component\n" +
+				"public class SomeComponent {\n" +
+				"\n" +
+				"   private DepedencyA depA;\n" +
+				"   private DepedencyB depB;\n" +
+				"\n" +
+				"	public SomeComponent() {\n" +
+				"	}\n" +
+				"\n" +
+				"	public SomeComponent(DependencyA depA, DependencyB depB) {\n" +
+				"		this.depA = depA;\n" +
+				"		this.depB = depB;\n" +
+				"	}\n" +
+				"}\n"
+		);
+
+		editor.assertHighlights("@Component");
+		for (int i = 1; i < 3; i++) {
+			editor.assertNoHover("SomeComponent", i);
+		}
+	}
+
+	@Test
+	public void anonymousInnerClassBeanWiring() throws Exception {
+		LiveBeansModel beans = LiveBeansModel.builder()
+				.add(LiveBean.builder()
+						.id("anotherComponent")
+						.type("com.example.AnotherComponent")
+						.dependencies("anonymousBeanFactory")
+						.build()
+				)
+				.add(LiveBean.builder()
+						.id("anonymousBeanFactory")
+						.type("com.example.SomeComponent$1")
+						.build()
+				)
+				.build();
+		mockAppProvider.builder()
+			.isSpringBootApp(true)
+			.processId("111")
+			.processName("the-app")
+			.beans(beans)
+			.build();
+
+		Editor editor = harness.newEditor(LanguageId.JAVA,
+				"package com.example;\n" +
+				"\n" +
+				"import org.springframework.beans.factory.annotation.Autowired;\n" +
+				"import org.springframework.stereotype.Component;\n" +
+				"\n" +
+				"@Component\n" +
+				"public class AnotherComponent {\n" +
+				"\n" +
+				"   @Autowired\n" +
+				"   RuntimeBeanFactory beanFactory;\n" +
+				"}\n"
+		);
+
+		editor.assertHighlights("@Component", "@Autowired");
+		editor.assertTrimmedHover("@Autowired", 1,
+				"**Autowired `anotherComponent` &rarr; `anonymousBeanFactory`**\n" +
+				"- Bean: `anonymousBeanFactory`  \n" +
+				"  Type: `com.example.SomeComponent$1`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]\n"
+		);
+	}
 }
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeanInjectedIntoHoverProviderTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeanInjectedIntoHoverProviderTest.java
@@ -95,11 +95,8 @@ public class BeanInjectedIntoHoverProviderTest {
 		);
 		editor.assertHighlights("@Bean");
 		editor.assertTrimmedHover("@Bean",
-				"**Injection report for Bean [id: myFoo]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: myFoo, type: `hello.FooImplementation`] exists but is **Not injected anywhere**\n"
+				"**Injected `myFoo` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -154,11 +151,8 @@ public class BeanInjectedIntoHoverProviderTest {
 			);
 			editor.assertHighlights("@Bean");
 			editor.assertTrimmedHover("@Bean",
-					"**Injection report for Bean [id: beanId]**\n" +
-					"\n" +
-					"Process [PID=111, name=`the-app`]:\n" +
-					"\n" +
-					"Bean [id: beanId, type: `hello.FooImplementation`] exists but is **Not injected anywhere**\n"
+					"**Injected `beanId` &rarr; _not injected anywhere_**  \n" +
+					"Process [PID=111, name=`the-app`]"
 			);
 		}
 	}
@@ -209,14 +203,11 @@ public class BeanInjectedIntoHoverProviderTest {
 		);
 		editor.assertHighlights("@Bean");
 		editor.assertTrimmedHover("@Bean",
-				"**Injection report for Bean [id: fooImplementation]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `hello.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController`**\n" +
 				"- Bean: `myController`  \n" +
-				"  Type: `hello.MyController`\n"
+				"  Type: `hello.MyController`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -269,14 +260,11 @@ public class BeanInjectedIntoHoverProviderTest {
 		);
 		editor.assertHighlights("@Bean");
 		editor.assertTrimmedHover("@Bean",
-				"**Injection report for Bean [id: fooImplementation]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `hello.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController`**\n" +
 				"- Bean: `myController`  \n" +
-				"  Type: `hello.MyController`\n"
+				"  Type: `hello.MyController`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -323,15 +311,12 @@ public class BeanInjectedIntoHoverProviderTest {
 		);
 		editor.assertHighlights("@Bean");
 		editor.assertTrimmedHover("@Bean",
-				"**Injection report for Bean [id: fooImplementation]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `hello.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController`**\n" +
 				"- Bean: `myController`  \n" +
 				"  Type: `hello.MyController`  \n" +
-				"  Resource: `" + Paths.get("hello/MyController.class") + "`"
+				"  Resource: `" + Paths.get("hello/MyController.class") + "`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -377,15 +362,12 @@ public class BeanInjectedIntoHoverProviderTest {
 		);
 		editor.assertHighlights("@Bean");
 		editor.assertTrimmedHover("@Bean",
-				"**Injection report for Bean [id: fooImplementation]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `hello.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController`**\n" +
 				"- Bean: `myController`  \n" +
 				"  Type: `hello.MyController`  \n" +
-				"  Resource: `hello/MyController.class`"
+				"  Resource: `hello/MyController.class`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -435,16 +417,13 @@ public class BeanInjectedIntoHoverProviderTest {
 		);
 		editor.assertHighlights("@Bean");
 		editor.assertTrimmedHover("@Bean",
-				"**Injection report for Bean [id: fooImplementation]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `hello.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController` `otherBean`**\n" +
 				"- Bean: `myController`  \n" +
 				"  Type: `hello.MyController`\n" +
 				"- Bean: `otherBean`  \n" +
-				"  Type: `hello.OtherBean`\n"
+				"  Type: `hello.OtherBean`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeansByTypeHoverProviderTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/BeansByTypeHoverProviderTest.java
@@ -134,14 +134,11 @@ public class BeansByTypeHoverProviderTest {
 		);
 		editor.assertHighlights("ScannedRandomClass");
 		editor.assertTrimmedHover("ScannedRandomClass",
-				"**Injection report for Bean [id: scannedRandomClass, type: `com.example.ScannedRandomClass`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: scannedRandomClass, type: `com.example.ScannedRandomClass`] injected into:\n" +
-				"\n" +
+				"**Injected `scannedRandomClass` &rarr; `randomOtherBean`**\n" +
 				"- Bean: `randomOtherBean`  \n" +
-				"  Type: `randomOtherBeanType`"
+				"  Type: `randomOtherBeanType`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -190,14 +187,12 @@ public class BeansByTypeHoverProviderTest {
 		);
 		editor.assertHighlights("ScannedFunctionClass");
 		editor.assertTrimmedHover("ScannedFunctionClass",
-				"**Injection report for Bean [id: scannedFunctionClass, type: `com.example.ScannedFunctionClass`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: scannedFunctionClass, type: `com.example.ScannedFunctionClass`] injected into:\n" +
-				"\n" +
+				"**Injected `scannedFunctionClass` &rarr; 1 bean**\n" +
 				"- Bean: `org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration`  \n" +
-				"  Type: `org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration`"
+				"  Type: `org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
+
 		);
 	}

@@ -233,11 +228,8 @@ public class BeansByTypeHoverProviderTest {
 		);
 		editor.assertHighlights("@Component");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: fooImplementation, type: `com.example.FooImplementation`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `com.example.FooImplementation`] exists but is **Not injected anywhere**\n"
+				"**Injected `fooImplementation` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ComponentInjectionsHoverProviderTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/livehover/test/ComponentInjectionsHoverProviderTest.java
@@ -12,7 +12,6 @@ package org.springframework.ide.vscode.boot.java.livehover.test;

 import static org.junit.Assert.assertTrue;

-import java.nio.file.Paths;
 import java.time.Duration;

 import org.junit.Before;
@@ -107,11 +106,8 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@Component");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: fooImplementation, type: `com.example.FooImplementation`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `com.example.FooImplementation`] exists but is **Not injected anywhere**\n"
+				"**Injected `fooImplementation` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -159,14 +155,11 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@Component");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: fooImplementation, type: `com.example.FooImplementation`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `com.example.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController`**\n" +
 				"- Bean: `myController`  \n" +
-				"  Type: `com.example.MyController`"
+				"  Type: `com.example.MyController`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]\n"
 		);
 	}

@@ -214,16 +207,13 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@Component");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: fooImplementation, type: `com.example.FooImplementation`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `com.example.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController` `otherBean`**\n" +
 				"- Bean: `myController`  \n" +
 				"  Type: `com.example.MyController`\n" +
 				"- Bean: `otherBean`  \n" +
-				"  Type: `com.example.OtherBean`"
+				"  Type: `com.example.OtherBean`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -273,25 +263,21 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@Component");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: fooImplementation, type: `com.example.FooImplementation`]**\n" +
-				"\n" +
-				"Process [PID=1001, name=`app-instance-1`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `com.example.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController` `otherBean`**\n" +
 				"- Bean: `myController`  \n" +
 				"  Type: `com.example.MyController`\n" +
 				"- Bean: `otherBean`  \n" +
 				"  Type: `com.example.OtherBean`\n" +
-				"\n" +
-				"Process [PID=1002, name=`app-instance-2`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `com.example.FooImplementation`] injected into:\n" +
-				"\n" +
+				"  \n" +
+				"Process [PID=1001, name=`app-instance-1`]" +
+				"  \n  \n" +
+				"**Injected `fooImplementation` &rarr; `myController` `otherBean`**\n" +
 				"- Bean: `myController`  \n" +
 				"  Type: `com.example.MyController`\n" +
 				"- Bean: `otherBean`  \n" +
-				"  Type: `com.example.OtherBean`\n"
+				"  Type: `com.example.OtherBean`\n" +
+				"  \n" +
+ 				"Process [PID=1002, name=`app-instance-2`]"
 		);
 	}

@@ -344,14 +330,11 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@Component");
 		editor.assertHoverExactText("@Component",
-				"**Injection report for Bean [id: fooImplementation, type: `com.example.FooImplementation`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: fooImplementation, type: `com.example.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `fooImplementation` &rarr; `myController`**\n" +
 				"- Bean: `myController`  \n" +
-				"  Type: `com.example.MyController`"
+				"  Type: `com.example.MyController`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -404,14 +387,11 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@Component");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: alternateFooImplementation, type: `com.example.FooImplementation`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: alternateFooImplementation, type: `com.example.FooImplementation`] injected into:\n" +
-				"\n" +
+				"**Injected `alternateFooImplementation` &rarr; `otherBean`**\n" +
 				"- Bean: `otherBean`  \n" +
-				"  Type: `com.example.OtherBean`\n"
+				"  Type: `com.example.OtherBean`\n" +
+				"  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -451,7 +431,7 @@ public class ComponentInjectionsHoverProviderTest {
 				"	}\n" +
 				"}\n"
 		);
-		editor.assertHighlights(/*MONE*/);
+		editor.assertHighlights(/*NONE*/);
 		editor.assertNoHover("@Component");
 	}

@@ -516,22 +496,10 @@ public class ComponentInjectionsHoverProviderTest {
 				"	}\n" +
 				"}\n"
 		);
-		editor.assertHighlights("@Component");
+		editor.assertHighlights("@Component", "AutowiredClass");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: autowiredClass, type: `com.example.AutowiredClass`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: autowiredClass, type: `com.example.AutowiredClass`] exists but is **Not injected anywhere**\n" +
-				"\n\n" +
-				"Bean [id: autowiredClass, type: `com.example.AutowiredClass`] got autowired with:\n" +
-				"\n" +
-				"- Bean: `dependencyA`  \n" +
-				"  Type: `com.example.DependencyA`  \n" +
-				"  Resource: `" + Paths.get("com/example/DependencyA.class") + "`\n" +
-				"- Bean: `dependencyB`  \n" +
-				"  Type: `com.example.DependencyB`  \n" +
-				"  Resource: `com/example/DependencyB.class`"
+				"**Injected `autowiredClass` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]\n"
 		);
 	}

@@ -578,11 +546,8 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@Component", "@Autowired");
 		editor.assertTrimmedHover("@Component",
-				"**Injection report for Bean [id: autowiredClass, type: `com.example.AutowiredClass`]**\n" +
-				"\n" +
-				"Process [PID=111, name=`the-app`]:\n" +
-				"\n" +
-				"Bean [id: autowiredClass, type: `com.example.AutowiredClass`] exists but is **Not injected anywhere**\n"
+				"**Injected `autowiredClass` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]\n"
 		);
 	}

@@ -621,7 +586,8 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@SpringBootApplication");
 		editor.assertHoverContains("@SpringBootApplication",
-				"**Injection report for Bean [id: demoApplication, type: `com.example.DemoApplication`]**"
+				"**Injected `demoApplication` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -629,7 +595,7 @@ public class ComponentInjectionsHoverProviderTest {
 	public void componentFromInnerClass() throws Exception {
 		LiveBeansModel beans = LiveBeansModel.builder()
 				.add(LiveBean.builder()
-						.id("demoApplication.InnerClass")
+						.id("com.example.DemoApplication$InnerClass")
 						.type("com.example.DemoApplication$InnerClass")
 						.build()
 				)
@@ -662,7 +628,8 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@SpringBootApplication");
 		editor.assertHoverContains("@SpringBootApplication",
-				"**Injection report for Bean [id: demoApplication.InnerClass, type: `com.example.DemoApplication.InnerClass`]**"
+				"**Injected `com.example.DemoApplication$InnerClass` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}

@@ -670,7 +637,7 @@ public class ComponentInjectionsHoverProviderTest {
 	public void componentFromInnerInnerClass() throws Exception {
 		LiveBeansModel beans = LiveBeansModel.builder()
 				.add(LiveBean.builder()
-						.id("demoApplication.InnerClass.InnerInnerClass")
+						.id("com.example.DemoApplication$InnerClass$InnerInnerClass")
 						.type("com.example.DemoApplication$InnerClass$InnerInnerClass")
 						.build()
 				)
@@ -706,7 +673,8 @@ public class ComponentInjectionsHoverProviderTest {
 		);
 		editor.assertHighlights("@SpringBootApplication");
 		editor.assertHoverContains("@SpringBootApplication",
-				"**Injection report for Bean [id: demoApplication.InnerClass.InnerInnerClass, type: `com.example.DemoApplication.InnerClass.InnerInnerClass`]**"
+				"**Injected `com.example.DemoApplication$InnerClass$InnerInnerClass` &rarr; _not injected anywhere_**  \n" +
+				"Process [PID=111, name=`the-app`]"
 		);
 	}
 }
--- a/vscode-extensions/commons-vscode/icons/boot-12h.png
+++ b/vscode-extensions/commons-vscode/icons/boot-12h.png
--- a/vscode-extensions/commons-vscode/src/highlight-service.ts
+++ b/vscode-extensions/commons-vscode/src/highlight-service.ts
@@ -27,10 +27,15 @@ export class HighlightService {

    constructor() {
        this.DECORATION = VSCode.window.createTextEditorDecorationType({
-            //        textDecoration: "underline",
-            gutterIconPath: path.resolve(__dirname, "../icons/boot-icon.png"),
-            gutterIconSize: "contain",
-            outline: "#32BA56 dotted thin"
+            before: {
+                contentIconPath: path.resolve(__dirname, "../icons/boot-12h.png"),
+                margin: '2px 2px 0px 0px'
+            },
+            backgroundColor: 'rgba(109,179,63,0.25)',
+            borderColor: 'rgba(109,179,63,0.25)',
+            borderSpacing: '4px',
+            borderRadius: '4px',
+            borderWidth: '4px'
        });
        this.highlights = new Map();
    }
@@ -49,6 +54,7 @@ export class HighlightService {
                let highlights : Range[] = this.highlights.get(uri) || [];
                let decorations = highlights.map(hl => toDecoration(hl));
                editor.setDecorations(this.DECORATION, decorations);
+                editor.setDecorations(this.DECORATION, decorations);
            }
        }
    }