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

Add target description to buildpack CA hints

Browse Source
This commit is contained in:
Kris De Volder
2017-04-25 08:15:41 -07:00
parent 5a8864d622
commit 347ad2a653
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlCFBuildpacksProvider.java
View File

@@ -17,6 +17,8 @@ import java.util.List;
import org.springframework.ide.vscode.commons.cloudfoundry.client.CFBuildpack;
import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTarget;
import org.springframework.ide.vscode.commons.cloudfoundry.client.cftarget.CFTargetCache;
import org.springframework.ide.vscode.commons.util.Renderable;
import org.springframework.ide.vscode.commons.util.Renderables;
import org.springframework.ide.vscode.commons.yaml.schema.BasicYValueHint;
import org.springframework.ide.vscode.commons.yaml.schema.YValueHint;
@@ -34,12 +36,15 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
for (CFTarget cfTarget : targets) {
List<CFBuildpack> buildpacks = cfTarget.getBuildpacks();
Renderable targetLabel = Renderables.text(cfTarget.getLabel());
if (buildpacks != null && !buildpacks.isEmpty()) {
for (CFBuildpack buildpack : buildpacks) {
String name = buildpack.getName();
String label = getBuildpackLabel(cfTarget, buildpack);
YValueHint hint = new BasicYValueHint(name, label);
YValueHint hint = new BasicYValueHint(name, label)
.setDocumentation(targetLabel);
if (!hints.contains(hint)) {
hints.add(hint);
}
@@ -56,7 +61,7 @@ public class ManifestYamlCFBuildpacksProvider extends AbstractCFHintsProvider {
}
protected String getBuildpackLabel(CFTarget target, CFBuildpack buildpack) {
return buildpack.getName() + " (" + target.getName() + ")";
return buildpack.getName();
}
@Override

4
headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
View File

@@ -1012,7 +1012,9 @@ public class ManifestYamlEditorTest {
when(buildPack.getName()).thenReturn("java_buildpack");
when(cfClient.getBuildpacks()).thenReturn(ImmutableList.of(buildPack));
assertCompletions("buildpack: <*>", "buildpack: java_buildpack<*>");
CompletionItem completion = assertCompletions("buildpack: <*>", "buildpack: java_buildpack<*>").get(0);
assertEquals("java_buildpack", completion.getLabel());
assertEquals("an-org : a-space [test.io]", completion.getDocumentation());
}
@Test