From 67923f0312f7d0d17cbeeb6b597cbf940af18481 Mon Sep 17 00:00:00 2001
From: Vasili Gulevich <vasili.gulevich@xored.com>
Date: Wed, 7 Jun 2023 21:33:52 +0400
Subject: [PATCH] Style and consistency fixes (#681)

---
 .../org/eclipse/lsp4e/LanguageServerWrapper.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
index 10aacf02c..b664d32d9 100644
--- a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
+++ b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
@@ -53,6 +53,7 @@
 import org.eclipse.core.resources.WorkspaceJob;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -110,6 +111,8 @@
 
 public class LanguageServerWrapper {
 
+	private static final ILog LOG = Platform.getLog(LanguageServerWrapper.class);
+
 	private final IFileBufferListener fileBufferListener = new FileBufferListenerAdapter() {
 		@Override
 		public void bufferDisposed(IFileBuffer buffer) {
@@ -157,7 +160,7 @@ public void dirtyStateChanged(IFileBuffer buffer, boolean isDirty) {
 	private ServerCapabilities serverCapabilities;
 	private final Timer timer = new Timer("Stop Language Server Task Processor"); //$NON-NLS-1$
 	private TimerTask stopTimerTask;
-	private AtomicReference<CompletableFuture<Void>> stopping = new AtomicReference<CompletableFuture<Void>>(null);
+	private final AtomicReference<CompletableFuture<Void>> stopping = new AtomicReference<CompletableFuture<Void>>(null);
 
 	private final ExecutorService dispatcher;
 
@@ -207,9 +210,9 @@ void stopDispatcher() {
 			stop().get(6, TimeUnit.SECONDS);
 		} catch (InterruptedException e ) {
 			Thread.currentThread().interrupt();
-			LanguageServerPlugin.logError(e);
+			LOG.error(e.getLocalizedMessage(), e);
 		} catch (ExecutionException | TimeoutException e) {
-			Platform.getLog(LanguageServerWrapper.class).error(String.format("Failed to stop %s in 6 second", this), e);  //$NON-NLS-1$
+			LOG.error(String.format("Failed to stop %s in 6 second", this), e);  //$NON-NLS-1$
 		} finally {
 			this.dispatcher.shutdownNow();
 
@@ -474,7 +477,7 @@ public synchronized CompletableFuture<Void> stop() {
 				} catch (InterruptedException ex) {
 					Thread.currentThread().interrupt();
 				} catch (Exception ex) {
-					LanguageServerPlugin.logError(ex);
+					LOG.error(ex.getLocalizedMessage(), ex);
 				}
 			}
 
@@ -498,7 +501,7 @@ public synchronized CompletableFuture<Void> stop() {
 				result.complete(ignored);
 			}
 			if (!this.stopping.compareAndSet(result, null)) {
-				LanguageServerPlugin.logError(new IllegalStateException("Unexpected concurrent stop")); //$NON-NLS-1$
+				LOG.error("Unexpected concurrent stop", new IllegalStateException()); //$NON-NLS-1$
 			}
 		});
 
@@ -644,7 +647,7 @@ public CompletableFuture<Void> disconnect(URI uri) {
 			if (this.serverDefinition.lastDocumentDisconnectedTimeout != 0) {
 				startStopTimerTask();
 			} else {
-				CompletableFuture.allOf(documentClosedFuture, stop());
+				documentClosedFuture = documentClosedFuture.thenCompose(ignored -> this.stop());
 			}
 		}
 		return documentClosedFuture;