diff --git a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/completions/PropertyCompletionFactory.java b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/completions/PropertyCompletionFactory.java index 894ed6a82..069ae692b 100644 --- a/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/completions/PropertyCompletionFactory.java +++ b/vscode-extensions/commons/application-properties-metadata/src/main/java/org/springframework/ide/vscode/application/properties/metadata/completions/PropertyCompletionFactory.java @@ -170,7 +170,7 @@ public class PropertyCompletionFactory { @Override public String getLabel() { - return getBaseDisplayString() + " : " + typeUtil.niceTypeName(getType()); + return getBaseDisplayString(); } @Override diff --git a/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/tools/AbstractPropertyRenderableProvider.java b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/tools/AbstractPropertyRenderableProvider.java index 37838521b..1e76a9af6 100644 --- a/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/tools/AbstractPropertyRenderableProvider.java +++ b/vscode-extensions/vscode-boot-properties/src/main/java/org/springframework/ide/vscode/boot/properties/tools/AbstractPropertyRenderableProvider.java @@ -23,12 +23,6 @@ import com.google.common.collect.ImmutableList.Builder; public abstract class AbstractPropertyRenderableProvider { - /** - * Fake host name that is used in 'action link' urls so that we can - * recognize them as such. - */ - private static final String ACTION_HOST = "action"; - public Renderable getRenderable() { Builder renderableBuilder = ImmutableList.builder(); @@ -103,9 +97,8 @@ public abstract class AbstractPropertyRenderableProvider { * link then the provided runnable is to be executed. */ public void actionLink(Builder renderableBuilder, String displayString) { - String url = "http://"+ACTION_HOST+"/action-id"; renderableBuilder.add(lineBreak()); - renderableBuilder.add(link(displayString, url)); + renderableBuilder.add(link(displayString, "null")); } private void defaultValueRenderable(Builder renderableBuilder, String defaultValue) { diff --git a/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java index 95a18db46..ff4afc1ea 100644 --- a/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java +++ b/vscode-extensions/vscode-boot-properties/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java @@ -70,7 +70,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { @Test public void testServerPortCompletion() throws Exception { data("server.port", INTEGER, 8080, "Port where server listens for http."); assertCompletion("ser<*>", "server.port=<*>"); - assertCompletionDisplayString("ser<*>", "server.port : int"); + assertCompletionDisplayString("ser<*>", "server.port"); } @Test public void testLoggingLevelCompletion() throws Exception { @@ -1501,7 +1501,7 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest { "some.property=SOMETHING\n" + "<*>" , // =============== - "some.other.property : String" + "some.other.property" , // => "some.property=SOMETHING\n" + "some.other.property=<*>"