Removed the incremental setting, it is default and you can't change it

Signed-off-by: Nikolas <[email protected]>
eclipse · Apr 23, 2019 · 88d04f9 · 88d04f9
1 parent be6108f
commit 88d04f9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 34 deletions.
diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/XMLLanguageServer.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/XMLLanguageServer.java
@@ -150,15 +150,6 @@ public synchronized void updateSettings(Object initializationOptionsSettings) {
 				String workDir = serverSettings.getNormalizedWorkDir();
 				FilesUtils.setCachePathSetting(workDir);
 			}
-
-			XMLIncrementalSupportSettings incremental = xmlClientSettings.getIncrementalSupport();
-			if (incremental != null) {
-				xmlTextDocumentService.updateIncrementalSupport(incremental);
-
-			}
-			else {
-				xmlTextDocumentService.manuallySetIncrementalSupport();
-			}
 		}
 		ContentModelSettings cmSettings = ContentModelSettings.getContentModelXMLSettings(initializationOptionsSettings);
 		if(cmSettings != null) {

diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/XMLTextDocumentService.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/XMLTextDocumentService.java
@@ -439,15 +439,6 @@ public XMLFormattingOptions getSharedFormattingSettings() {
 		return sharedSettings.formattingSettings;
 	}
 
-	public void updateIncrementalSupport(XMLIncrementalSupportSettings incrementalSupport) {
-		sharedSettings.setIncrementalSettings(incrementalSupport);
-		documents.setIncremental(sharedSettings);
-	}
-
-	public void manuallySetIncrementalSupport() {
-		documents.setIncremental(sharedSettings);
-	}
-
 	public XMLValidationSettings getValidationSettings() {
 
 		return sharedSettings.validationSettings;

diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/commons/TextDocuments.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/commons/TextDocuments.java
@@ -27,21 +27,13 @@
  */
 public class TextDocuments implements ITextDocumentFactory {
 
-	private Boolean incremental;
+	private final Boolean incremental;
 
 	private final Map<String, TextDocument> documents;
 
 	public TextDocuments() {
 		documents = new HashMap<>();
-	}
-
-	/**
-	 * Set the incremental support.
-	 * 
-	 * @param incremental
-	 */
-	public void setIncremental(SharedSettings sharedSettings) {
-		this.incremental = sharedSettings.incrementalSettings.getEnabled();
+		incremental = true;
 		documents.values().forEach(document -> document.setIncremental(incremental));
 	}
 

diff --git a/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/settings/SharedSettings.java b/org.eclipse.lsp4xml/src/main/java/org/eclipse/lsp4xml/settings/SharedSettings.java
@@ -24,14 +24,12 @@ public class SharedSettings {
 	public final FoldingRangeCapabilities foldingSettings;
 	public XMLFormattingOptions formattingSettings;
 	public final XMLValidationSettings validationSettings;
-	public XMLIncrementalSupportSettings incrementalSettings;
 
 	public SharedSettings() {
 		this.completionSettings = new CompletionSettings();
 		this.foldingSettings = new FoldingRangeCapabilities();
 		this.formattingSettings = new XMLFormattingOptions(true);
 		this.validationSettings = new XMLValidationSettings();
-		this.incrementalSettings = new XMLIncrementalSupportSettings();
 	}
 
 	public void setFormattingSettings(XMLFormattingOptions formattingOptions) {
@@ -41,8 +39,4 @@ public void setFormattingSettings(XMLFormattingOptions formattingOptions) {
 	public void setCompletionSettings(CompletionSettings completionSettings) {
 		this.completionSettings = completionSettings;
 	}
-
-	public void setIncrementalSettings(XMLIncrementalSupportSettings incrementalSettings) {
-		this.incrementalSettings = incrementalSettings;
-	}
 }