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

Hover info provider for tasks wired-up properly

Browse Source 
Note: still need to add the markdown blobs for most properties however.
So you still won't see much info in the hovers.
This commit is contained in:
Kris De Volder
2017-01-26 15:19:59 -08:00
parent f408e7c87f
commit 4fd18c9a7c
4 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServer.java
View File

@@ -112,7 +112,17 @@ public class ConcourseLanguageServer extends SimpleLanguageServer {
throw new IllegalStateException("Not implemented");
});
documents.onHover(forPipelines.hoverEngine::getHover); //TODO: dispatch based on language id
documents.onHover(params -> {
TextDocument doc = documents.get(params);
if (doc!=null) {
if (LanguageIds.CONCOURSE_PIPELINE.equals(doc.getLanguageId())) {
return forPipelines.hoverEngine.getHover(params);
} else if (LanguageIds.CONCOURSE_TASK.equals(doc.getLanguageId())) {
return forTasks.hoverEngine.getHover(params);
}
}
return SimpleTextDocumentService.NO_HOVER;
});
documents.onDefinition(definitionFinder);
}

3
vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
View File

@@ -246,7 +246,8 @@ public class PipelineYmlSchema implements YamlSchema {
}
}
YType t_platform = f.yenum("Platform", "windows", "linux", "darwin");
YAtomicType t_platform = f.yenum("Platform", "windows", "linux", "darwin");
t_platform.parseWith(ValueParsers.NE_STRING); //no errors because in theory platform are just strings.
YType t_name_and_path = f.ybean("NameAndPath" ,
f.yprop("name", t_ne_string).isRequired(true),

3
vscode-extensions/vscode-concourse/src/main/resources/desc/TaskConfig/platform.md Normal file
View File

@@ -0,0 +1,3 @@
*Required.* The platform the task should run on. By convention, `windows`,
`linux`, or `darwin` are specified. This determines the pool of workers
that the task can run against. The base deployment provides Linux workers.

28
vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
View File

@@ -1480,7 +1480,6 @@ public class ConcourseEditorTest {
"params: the-params\n"
);
editor.assertProblems(
"a-platform|unknown 'Platform'",
"name|Unknown property",
"bogus-source-prop|Unknown property",
"path: path/to/input|'name' is required",
@@ -1512,8 +1511,35 @@ public class ConcourseEditorTest {
"run:\n" +
" <*>"
);
assertTaskCompletions(
"platform: <*>"
, //=>
"platform: darwin<*>",
"platform: linux<*>",
"platform: windows<*>"
);
}
@Test public void hoversForTaskFileToplevelProperties() throws Exception {
Editor editor = harness.newEditor(LanguageIds.CONCOURSE_TASK,
"image: some-image\n" +
"image_resource:\n" +
" type: docker-image\n" +
" source:\n" +
" repository: kdvolder/sts4-build-env\n" +
"inputs: []\n" +
"outputs: []\n" +
"params: {}\n" +
"platform: linux\n" +
"run:\n" +
" path: sts4/concourse/tasks/build-vscode-extensions.sh"
);
editor.assertHoverContains("platform", "The platform the task should run on");
}
//////////////////////////////////////////////////////////////////////////////
private void assertContextualCompletions(String conText, String textBefore, String... textAfter) throws Exception {