Fix build on Windows

Signed-off-by: Snjezana Peco <[email protected]>

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

@@ -31,6 +31,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.jobs.IJobManager;
 import org.eclipse.core.runtime.jobs.Job;
@@ -304,27 +305,35 @@ private CodeActionOptions getCodeActionOptions() {
  @Override
  public CompletableFuture<Object> shutdown() {
  logInfo(">> shutdown");
+ disconnectFromWorkspace();
  return computeAsync((monitor) -> {
- try {
- JavaRuntime.removeVMInstallChangedListener(jvmConfigurator);
- if (workspaceDiagnosticsHandler != null) {
- workspaceDiagnosticsHandler.removeResourceChangeListener();
- workspaceDiagnosticsHandler = null;
- }
- ResourcesPlugin.getWorkspace().save(true, monitor);
- } catch (CoreException e) {
- logException(e.getMessage(), e);
- }
  return new Object();
  });
  }
 
+ private void disconnectFromWorkspace() {
+ try {
+ JavaRuntime.removeVMInstallChangedListener(jvmConfigurator);
+ if (workspaceDiagnosticsHandler != null) {
+ workspaceDiagnosticsHandler.removeResourceChangeListener();
+ workspaceDiagnosticsHandler = null;
+ }
+ JavaLanguageServerPlugin.logInfo("Saving workspace");
+ long start = System.currentTimeMillis();
+ ResourcesPlugin.getWorkspace().save(true, new NullProgressMonitor());
+ JavaLanguageServerPlugin.logInfo("Workspace saved. Took " + (System.currentTimeMillis() - start) + " ms");
+ } catch (CoreException e) {
+ logException(e.getMessage(), e);
+ }
+ }
+
  /* (non-Javadoc)
  * @see org.eclipse.lsp4j.services.LanguageServer#exit()
  */
  @Override
  public void exit() {
  logInfo(">> exit");
+ disconnectFromWorkspace();
  JavaLanguageServerPlugin.getLanguageServer().exit();
  Executors.newSingleThreadScheduledExecutor().schedule(() -> {
  logInfo("Forcing exit after 1 min.");