Merge branch 'master' of github.com:spring-projects/sts4

vudayani · Jun 5, 2019 · 7f316b5 · 7f316b5
2 parents 154eb64 + bdd9c1c
commit 7f316b5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...ain/java/org/springframework/ide/vscode/boot/app/YamlPropertiesJavaDefinitionHandler.java b/...ain/java/org/springframework/ide/vscode/boot/app/YamlPropertiesJavaDefinitionHandler.java
@@ -91,7 +91,10 @@ public List<Location> handle(TextDocumentPositionParams position) {
 
 						if (assistContext != null) {
 							if (path.pointsAtValue()) {
-								return assistContext.getDefinitionsForPropertyValue(getNodeRegion(ast, offset));
+								DocumentRegion nodeRegion = getNodeRegion(ast, offset);
+								if (nodeRegion != null) {
+									return assistContext.getDefinitionsForPropertyValue(nodeRegion);
+								}
 							} else {
 								return assistContext.getDefinitionsForPropertyKey();
 							}