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

PT 134914895 - Fix NPE in Yaml Hover if no info is provided

Browse Source
This commit is contained in:
nsingh
2016-11-24 11:57:38 -08:00
parent 69482dcf73
commit a43ac18324
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vscode-extensions/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/hover/YamlHoverInfoProvider.java
View File

@@ -82,12 +82,14 @@ public class YamlHoverInfoProvider implements HoverInfoProvider {
}
assistContext = assistPath.traverse(assistContext);
if (assistContext != null) {
if (path.pointsAtValue()) {
Renderable info = assistContext.getValueHoverInfo(ymlDoc, new DocumentRegion(doc, region));
Renderable info = path.pointsAtValue()
? assistContext.getValueHoverInfo(ymlDoc, new DocumentRegion(doc, region))
: assistContext.getHoverInfo();
// Fix for: PT 134914895. If assist context cannot provide an info, then don't return a Tuple.
if (info != null) {
return Tuples.of(info, region);
}
Renderable info = assistContext.getHoverInfo();
return Tuples.of(info, region);
}
}
}

21
vscode-extensions/vscode-manifest-yaml/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
View File

@@ -408,7 +408,6 @@ public class ManifestYamlEditorTest {
" timeout: 80\n" +
" health-check-type: none\n"
);
editor.assertNoHover("comment");
editor.assertIsHoverRegion("memory");
editor.assertIsHoverRegion("inherit");
@@ -454,6 +453,26 @@ public class ManifestYamlEditorTest {
editor.assertHoverContains("timeout", "The `timeout` attribute defines the number of seconds Cloud Foundry allocates for starting your application");
editor.assertHoverContains("health-check-type", "Use the `health-check-type` attribute to");
}
@Test
public void noHoverInfos() throws Exception {
Editor editor = harness.newEditor(
"#comment\n" +
"applications:\n" +
"- buildpack: zbuildpack\n" +
" name: foo\n" +
" domains:\n" +
" - pivotal.io\n" +
" - otherdomain.org\n"
);
editor.assertNoHover("comment");
// May fail in the future if hover support is added, but if hover support is added in the future,
// it is expected that these should start to fail, as right now they have no hover
editor.assertNoHover("pivotal.io");
editor.assertNoHover("otherdomain.org");
}
//////////////////////////////////////////////////////////////////////////////