diff --git 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 index 0cdd0f740..cc8524e0b 100644 --- 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 @@ -278,7 +278,6 @@ public class RequestMappingHoverProvider implements HoverProvider { Renderable urlRenderables = Renderables.concat(renderableUrls); Renderable processSection = Renderables.concat( urlRenderables, - Renderables.lineBreak(), Renderables.mdBlob(LiveHoverUtils.niceAppName(app)) ); diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java index 71d68fbb9..938609cb5 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java @@ -71,7 +71,6 @@ public class RequestMappingLiveHoverTest { Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/hello-world](https://cfapps.io:1111/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -105,7 +104,6 @@ public class RequestMappingLiveHoverTest { Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/](https://cfapps.io:1111/) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); @@ -160,11 +158,9 @@ public class RequestMappingLiveHoverTest { editor.assertHighlights("@RequestMapping(\"/hello\")", "@RequestMapping(\"/goodbye\")"); editor.assertHoverContains("@RequestMapping(\"/hello\")", "[https://cfapps.io:999/hello](https://cfapps.io:999/hello) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); editor.assertHoverContains("@RequestMapping(\"/goodbye\")", "[https://cfapps.io:999/goodbye](https://cfapps.io:999/goodbye) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -237,7 +233,6 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@DeleteMapping(\"/greetings\")", "[https://cfapps.io:999/greetings](https://cfapps.io:999/greetings) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -374,7 +369,6 @@ public class RequestMappingLiveHoverTest { editor.assertHoverContains("@RequestMapping(value={\"/greetings\", \"/hello\"}, method=GET)", "[https://cfapps.io:999/greetings](https://cfapps.io:999/greetings) \n" + "[https://cfapps.io:999/hello](https://cfapps.io:999/hello) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -426,7 +420,6 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@RequestMapping(value=\"/find\", method=GET)", "[https://cfapps.io:999/find](https://cfapps.io:999/find) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -478,7 +471,6 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@RequestMapping(value=\"/find\", method=GET)", "[https://cfapps.io:999/find](https://cfapps.io:999/find) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -531,7 +523,6 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@RequestMapping(value=\"/find\", method=GET)", "[https://cfapps.io:999/find](https://cfapps.io:999/find) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -584,7 +575,6 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@RequestMapping(value=\"/find\", method=GET)", "[https://cfapps.io:999/find](https://cfapps.io:999/find) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -635,7 +625,6 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@RequestMapping(value=\"/find\", method=GET)", "[https://cfapps.io:999/find](https://cfapps.io:999/find) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); } @@ -686,9 +675,7 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@RequestMapping(value=\"/find\", method=GET)", "[https://cfapps.io:999/find](https://cfapps.io:999/find) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); - } @Test @@ -737,9 +724,7 @@ public class RequestMappingLiveHoverTest { docUri); editor.assertHoverContains("@RequestMapping(value=\"/find\", method=GET)", "[https://cfapps.io:999/find](https://cfapps.io:999/find) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); - } @Test @@ -793,17 +778,13 @@ public class RequestMappingLiveHoverTest { Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); editor.assertHoverContains("@RequestMapping(\"/hello\")", "[https://cfapps.io:1000/hello](https://cfapps.io:1000/hello) \n" + - "\n" + "Process [PID=70000, name=`test-request-mapping-live-hover`]\n" + "\n" + "[https://cfapps.io:1001/hello](https://cfapps.io:1001/hello) \n" + - "\n" + "Process [PID=80000, name=`test-request-mapping-live-hover`]\n" + "\n" + "[https://cfapps.io:1002/hello](https://cfapps.io:1002/hello) \n" + - "\n" + "Process [PID=90000, name=`test-request-mapping-live-hover`]"); - } @Test @@ -869,11 +850,9 @@ public class RequestMappingLiveHoverTest { editor.assertHighlights("@RequestMapping(\"/inner-class\")", "@RequestMapping(\"/inner-inner-class\")"); editor.assertHoverContains("@RequestMapping(\"/inner-class\")", "[https://cfapps.io:1111/inner-class](https://cfapps.io:1111/inner-class) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); editor.assertHoverContains("@RequestMapping(\"/inner-inner-class\")", "[https://cfapps.io:1111/inner-inner-class](https://cfapps.io:1111/inner-inner-class) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTestWithContextPath.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTestWithContextPath.java index f3f97ed06..9217b1a67 100644 --- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTestWithContextPath.java +++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTestWithContextPath.java @@ -71,7 +71,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromEnv/hello-world](https://cfapps.io:1111/fromEnv/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -108,7 +107,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -146,7 +144,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -184,7 +181,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -222,7 +218,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -259,7 +254,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromenvironment/hello-world](https://cfapps.io:1111/fromenvironment/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -296,7 +290,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -334,7 +327,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -372,7 +364,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -410,7 +401,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/frompropsfile/hello-world](https://cfapps.io:1111/frompropsfile/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -450,7 +440,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/fromlaunchconfig/hello-world](https://cfapps.io:1111/fromlaunchconfig/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -485,7 +474,6 @@ public class RequestMappingLiveHoverTestWithContextPath { Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); editor.assertHighlights("@RequestMapping(method=RequestMethod.GET)"); editor.assertHoverContains("@RequestMapping(method=RequestMethod.GET)", "[https://cfapps.io:1111/mockedpath/hello-world](https://cfapps.io:1111/mockedpath/hello-world) \n" + - "\n" + "Process [PID=22022, name=`test-request-mapping-live-hover`]"); } @@ -535,7 +523,6 @@ public class RequestMappingLiveHoverTestWithContextPath { editor.assertHoverContains("@RequestMapping(value={\"/greetings\", \"/hello\"}, method=GET)", "[https://cfapps.io:999/mockedpath/greetings](https://cfapps.io:999/mockedpath/greetings) \n" + "[https://cfapps.io:999/mockedpath/hello](https://cfapps.io:999/mockedpath/hello) \n" + - "\n" + "Process [PID=76543, name=`test-request-mapping-live-hover`]"); }