take overall preference for spring xml support into account for spel syntax validation for xml files

martinlippert · martinlippert · commit fb0a5273f034 · 2020-07-26T18:43:58.000+02:00
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLLanguageServerComponents.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/xml/SpringXMLLanguageServerComponents.java
@@ -63,7 +63,7 @@ public SpringXMLLanguageServerComponents(
 		this.reconcileEngine = new SpringXMLReconcileEngine(projectFinder);
 		
 		config.addListener(ignore -> {
-			reconcileEngine.setSpelExpressionSyntaxValidationEnabled(config.isSpelExpressionValidationEnabled());
+			reconcileEngine.setSpelExpressionSyntaxValidationEnabled(config.isSpelExpressionValidationEnabled() && config.isSpringXMLSupportEnabled());
 		});
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public SpringXMLLanguageServerComponents(`
`63`	`63`	`this.reconcileEngine = new SpringXMLReconcileEngine(projectFinder);`
`64`	`64`
`65`	`65`	`config.addListener(ignore -> {`
`66`		`- reconcileEngine.setSpelExpressionSyntaxValidationEnabled(config.isSpelExpressionValidationEnabled());`
	`66`	`+ reconcileEngine.setSpelExpressionSyntaxValidationEnabled(config.isSpelExpressionValidationEnabled() && config.isSpringXMLSupportEnabled());`
`67`	`67`	`});`
`68`	`68`
`69`	`69`	`}`