Unregister language server extension on LS shutdown

fix eclipse-lemminx#605 Signed-off-by: Andrew Obuchowicz <[email protected]>
AObuchow · Feb 6, 2020 · af0c989 · af0c989
1 parent e8dd978
commit af0c989
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
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
@@ -43,12 +43,12 @@
 import org.eclipse.lsp4xml.services.IXMLDocumentProvider;
 import org.eclipse.lsp4xml.services.XMLLanguageService;
 import org.eclipse.lsp4xml.settings.AllXMLSettings;
-import org.eclipse.lsp4xml.settings.XMLCompletionSettings;
 import org.eclipse.lsp4xml.settings.InitializationOptionsSettings;
 import org.eclipse.lsp4xml.settings.LogsSettings;
 import org.eclipse.lsp4xml.settings.ServerSettings;
 import org.eclipse.lsp4xml.settings.SharedSettings;
 import org.eclipse.lsp4xml.settings.XMLCodeLensSettings;
+import org.eclipse.lsp4xml.settings.XMLCompletionSettings;
 import org.eclipse.lsp4xml.settings.XMLFormattingOptions;
 import org.eclipse.lsp4xml.settings.XMLGeneralClientSettings;
 import org.eclipse.lsp4xml.settings.XMLSymbolSettings;
@@ -176,6 +176,7 @@ public synchronized void updateSettings(Object initializationOptionsSettings) {
 
 	@Override
 	public CompletableFuture<Object> shutdown() {
+		xmlLanguageService.disposeExtensions();
 		return computeAsync(cc -> new Object());
 	}
 

diff --git a/....lsp4xml/src/main/java/org/eclipse/lsp4xml/services/extensions/XMLExtensionsRegistry.java b/....lsp4xml/src/main/java/org/eclipse/lsp4xml/services/extensions/XMLExtensionsRegistry.java
@@ -197,6 +197,12 @@ void unregisterExtension(IXMLExtension extension) {
 		extensions.remove(extension);
 		extension.stop(this);
 	}
+
+	public void disposeExtensions() {
+		for (IXMLExtension extension : extensions) {
+			unregisterExtension(extension);
+		}
+	}
 
 	public void registerCompletionParticipant(ICompletionParticipant completionParticipant) {
 		completionParticipants.add(completionParticipant);