From 3180b5daf0cbebd84c2239436224d1cc2e2f3f78 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Mon, 19 Oct 2020 10:56:55 -0700
Subject: [PATCH] Tolerate redundant '.' before '[' in properties file

See: https://www.pivotaltracker.com/story/show/175147973
---
 .../properties/reconcile/PropertyNavigator.java    |  3 +++
 .../boot/test/ApplicationPropertiesEditorTest.java | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
index 84472042c..0c5124183 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/properties/reconcile/PropertyNavigator.java
@@ -78,6 +78,9 @@ public class PropertyNavigator {
 		if (type!=null) {
 			if (offset<region.getEnd()) {
 				char navOp = getChar(offset);
+				if (navOp=='.' && getChar(offset+1)=='[') {
+					navOp = '['; // just skip the redundant '.'. See:  https://www.pivotaltracker.com/story/show/175147973
+				}
 				if (navOp=='.') {
 					if (typeUtil.isDotable(type)) {
 						return dotNavigate(offset, type);
diff --git a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
index 11f948606..b16ca05dc 100644
--- a/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
+++ b/headless-services/spring-boot-language-server/src/test/java/org/springframework/ide/vscode/boot/test/ApplicationPropertiesEditorTest.java
@@ -583,6 +583,20 @@ public class ApplicationPropertiesEditorTest extends AbstractPropsEditorTest {
 				//no other problems
 		);
 	}
+
+	@Test public void test_PT_175147973_tolerate_extra_dot_before_lbrack() throws Exception {
+		//See: https://www.pivotaltracker.com/story/show/175147973
+		IJavaProject p = createPredefinedMavenProject("map-of-pojo");
+		useProject(p);
+		Editor editor = newEditor(
+				"my.map.[foo.bar].age=foo-age\n" +
+				"my.map[foo.bar].age=bar-age\n"
+		);
+		editor.assertProblems(
+				"foo-age|'int'",
+				"bar-age|'int'"
+		);
+	}
 	
 	@Test public void test_GH_534() throws Exception {
 		IJavaProject p = createPredefinedMavenProject("map-of-pojo");