Moved EclipseAcceleoLanguageServerContext from server to plugin start.

eclipse-acceleo · Dec 20, 2023 · 75a8620 · 75a8620
1 parent 356e9f4
commit 75a8620
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 55 deletions.
diff --git a/...ipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/AcceleoConnectionProvider.java b/...ipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/AcceleoConnectionProvider.java
@@ -16,9 +16,7 @@
 import java.net.InetAddress;
 import java.net.Socket;
 
-import org.eclipse.acceleo.aql.ls.IAcceleoLanguageServerContext;
 import org.eclipse.acceleo.aql.ls.AcceleoSocketServer;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.lsp4e.server.StreamConnectionProvider;
 
 /**
@@ -48,9 +46,7 @@ public class AcceleoConnectionProvider implements StreamConnectionProvider {
 	 * Constructor.
 	 */
 	public AcceleoConnectionProvider() {
-		IAcceleoLanguageServerContext acceleoContext = new EclipseAcceleoLanguageServerContext(ResourcesPlugin
-				.getWorkspace());
-		this.acceleoSocketServer = new AcceleoSocketServer(acceleoContext);
+		this.acceleoSocketServer = new AcceleoSocketServer(Activator.getDefault().getServiceContext());
 	}
 
 	@Override

diff --git a/plugins/org.eclipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/Activator.java b/plugins/org.eclipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/Activator.java
@@ -14,6 +14,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -46,31 +47,39 @@ public class Activator extends AbstractUIPlugin {
 	 */
 	private static Activator plugin;
 
+	/**
+	 * The {@link EclipseAcceleoLanguageServerContext}.
+	 */
+	private EclipseAcceleoLanguageServerContext serviceContext;
+
 	/**
 	 * The constructor.
 	 */
 	public Activator() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework. BundleContext)
-	 */
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
+		serviceContext = new EclipseAcceleoLanguageServerContext(ResourcesPlugin.getWorkspace());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework. BundleContext)
-	 */
 	@Override
 	public void stop(BundleContext context) throws Exception {
+		serviceContext.dispose();
+		serviceContext = null;
 		plugin = null;
 		super.stop(context);
+	}
 
+	/**
+	 * Gets the {@link EclipseAcceleoLanguageServerContext}.
+	 * 
+	 * @return the {@link EclipseAcceleoLanguageServerContext}
+	 */
+	public EclipseAcceleoLanguageServerContext getServiceContext() {
+		return serviceContext;
 	}
 
 	/**

diff --git a/...eo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/EclipseAcceleoLanguageServerContext.java b/...eo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/EclipseAcceleoLanguageServerContext.java
@@ -14,8 +14,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Objects;
 
 import org.eclipse.acceleo.aql.ide.AcceleoPlugin;
@@ -45,13 +43,13 @@
 public class EclipseAcceleoLanguageServerContext implements IAcceleoLanguageServerContext {
 
 	/**
-	 * the {@link Synchronizer} for Acceleo.
+	 * The {@link Synchronizer} for Acceleo.
 	 * 
 	 * @author <a href="mailto:yvan.lussaud@obeo.fr">Yvan Lussaud</a>
 	 */
-	private static class AcceleSynchronizer extends Synchronizer<AcceleoProject> {
+	private static class AcceleoSynchronizer extends Synchronizer<AcceleoProject> {
 
-		AcceleSynchronizer(IWorkspace eclipseWorkspace, IQueryWorkspace<AcceleoProject> queryWorkspace) {
+		AcceleoSynchronizer(IWorkspace eclipseWorkspace, IQueryWorkspace<AcceleoProject> queryWorkspace) {
 			super(eclipseWorkspace, queryWorkspace);
 		}
 
@@ -78,9 +76,9 @@ public AcceleoWorkspace getAcceleoWorkspace() {
 	private final IWorkspace clientWorkspace;
 
 	/**
-	 * The mapping form an {@link AcceleoWorkspace} to its {@link EclipseWorkspace2AcceleoWorkspace}.
+	 * The {@link AcceleoSynchronizer}.
 	 */
-	private final Map<AcceleoWorkspace, AcceleSynchronizer> synchronizers = new HashMap<>();
+	private final AcceleoSynchronizer synchronizer;
 
 	/**
 	 * The constructor.
@@ -90,22 +88,22 @@ public AcceleoWorkspace getAcceleoWorkspace() {
 	 */
 	public EclipseAcceleoLanguageServerContext(IWorkspace clientWorkspace) {
 		this.clientWorkspace = Objects.requireNonNull(clientWorkspace);
-	}
-
-	@Override
-	public AcceleoWorkspace createWorkspace() {
 		final AcceleoWorkspace acceleoWorkspace = new AcceleoWorkspace(getAcceleoWorkspaceName(
 				clientWorkspace), this);
-		final AcceleSynchronizer syncrhonizer = new AcceleSynchronizer(clientWorkspace, acceleoWorkspace);
-		synchronizers.put(syncrhonizer.getAcceleoWorkspace(), syncrhonizer);
-		syncrhonizer.synchronize();
-		return syncrhonizer.getAcceleoWorkspace();
+		synchronizer = new AcceleoSynchronizer(clientWorkspace, acceleoWorkspace);
+		synchronizer.synchronize();
+	}
+
+	/**
+	 * Disposes this context.
+	 */
+	public void dispose() {
+		synchronizer.dispose();
 	}
 
 	@Override
-	public void deleteWorkspace(AcceleoWorkspace acceleoWorkspaceToDelete) {
-		final AcceleSynchronizer syncronizer = synchronizers.remove(acceleoWorkspaceToDelete);
-		syncronizer.dispose();
+	public AcceleoWorkspace getWorkspace() {
+		return synchronizer.getAcceleoWorkspace();
 	}
 
 	@Override
@@ -135,18 +133,17 @@ public String getResourceContents(URI resource) {
 	public AcceleoProject getProject(AcceleoWorkspace workspace, URI resource) {
 		final AcceleoProject res;
 
-		final AcceleSynchronizer synchoniser = synchronizers.get(workspace);
-		synchronized(synchoniser) {
+		synchronized(synchronizer) {
 
 			final IFile file = clientWorkspace.getRoot().getFileForLocation(new Path(resource.getPath()
 					.toString()));
 			final IProject eclipseProject = file.getProject();
-			final AcceleoProject existingProject = synchoniser.getProject(eclipseProject);
+			final AcceleoProject existingProject = synchronizer.getProject(eclipseProject);
 			if (existingProject != null) {
 				res = existingProject;
 			} else {
-				synchoniser.add(file.getProject());
-				res = synchoniser.getProject(eclipseProject);
+				synchronizer.add(file.getProject());
+				res = synchronizer.getProject(eclipseProject);
 			}
 		}
 
@@ -157,7 +154,6 @@ public AcceleoProject getProject(AcceleoWorkspace workspace, URI resource) {
 	public IQueryWorkspaceQualifiedNameResolver createResolver(AcceleoProject acceleoProject) {
 		Objects.nonNull(acceleoProject);
 
-		final AcceleSynchronizer synchronizer = synchronizers.get(acceleoProject.getWorkspace());
 		final IProject eclipseProject = synchronizer.getProject(acceleoProject);
 		final IQualifiedNameResolver resolver = QueryPlugin.getPlugin().createQualifiedNameResolver(
 				AcceleoPlugin.getPlugin().getClass().getClassLoader(), eclipseProject,

diff --git a/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/AcceleoLanguageServer.java b/plugins/org.eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/AcceleoLanguageServer.java
@@ -88,12 +88,12 @@ public String getLabel() {
 	}
 
 	/**
-	 * Creates the {@link AcceleoWorkspace}.
+	 * Connects the {@link AcceleoWorkspace}.
 	 * 
-	 * @return the newly-created {@link AcceleoWorkspace}.
+	 * @return the {@link AcceleoWorkspace}.
 	 */
-	public AcceleoWorkspace createWorkspace() {
-		AcceleoWorkspace workspace = this.acceleoLanguageServerContext.createWorkspace();
+	public AcceleoWorkspace connectWorkspace() {
+		final AcceleoWorkspace workspace = this.acceleoLanguageServerContext.getWorkspace();
 		workspace.setOwner(this);
 		return workspace;
 	}
@@ -169,10 +169,14 @@ private TextDocumentSyncOptions createTextDocumentSyncOptions() {
 
 	@Override
 	public CompletableFuture<Object> shutdown() {
-		this.acceleoLanguageServerContext.deleteWorkspace(this.getWorkspace());
+		final AcceleoWorkspace workspace = this.acceleoLanguageServerContext.getWorkspace();
+		workspace.setOwner(null);
 		if (this.languageClient != null) {
 			this.languageClient.logMessage(new MessageParams(MessageType.Log,
 					"Acceleo Language Server is shutting down"));
+			this.languageClient = null;
+			this.textDocumentService.disconnect();
+			this.workspaceService.disconnect();
 		}
 		return CompletableFuture.completedFuture(null);
 	}

diff --git a/....eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/IAcceleoLanguageServerContext.java b/....eclipse.acceleo.aql.ls/src/org/eclipse/acceleo/aql/ls/IAcceleoLanguageServerContext.java
@@ -29,19 +29,11 @@
 public interface IAcceleoLanguageServerContext {
 
 	/**
-	 * Creates an {@link AcceleoWorkspace}.
+	 * Gets the {@link AcceleoWorkspace}.
 	 * 
-	 * @return the newly-created {@link AcceleoWorkspace}.
+	 * @return the {@link AcceleoWorkspace}.
 	 */
-	AcceleoWorkspace createWorkspace();
-
-	/**
-	 * Called when the owner {@link AcceleoLanguageServer} shutdowns.
-	 * 
-	 * @param workspaceToDelete
-	 *            the (non-{@code null}) {@link AcceleoWorkspace} to delete.
-	 */
-	void deleteWorkspace(AcceleoWorkspace workspaceToDelete);
+	AcceleoWorkspace getWorkspace();
 
 	/**
 	 * Gets the contents of the given resource {@link URI}.

diff --git a/...l.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocumentService.java b/...l.ls/src/org/eclipse/acceleo/aql/ls/services/textdocument/AcceleoTextDocumentService.java
@@ -109,6 +109,13 @@ public void connect(LanguageClient newLanguageClient) {
 	}
 	////
 
+	/**
+	 * Disconnects from the {@link LanguageClient}.
+	 */
+	public void disconnect() {
+		this.languageClient = null;
+	}
+
 	// Mandatory TextDocumentService API.
 	@Override
 	public void didOpen(DidOpenTextDocumentParams params) {
@@ -125,6 +132,9 @@ public void didOpen(DidOpenTextDocumentParams params) {
 				final URI binaryURI = resolver.getBinaryURI(openedDocumentUri);
 				workspace.addResource(project, binaryURI);
 				openedAcceleoTextDocument = workspace.getDocument(openedDocumentUri);
+				if (openedAcceleoTextDocument != null) {
+					openedAcceleoTextDocument.validateAndPublishResults();
+				}
 			}
 			if (openedAcceleoTextDocument == null) {
 				throw new IllegalStateException("Could not find the Acceleo Text Document at URI "

diff --git a/...leo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/workspace/AcceleoWorkspaceService.java b/...leo.aql.ls/src/org/eclipse/acceleo/aql/ls/services/workspace/AcceleoWorkspaceService.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020 Obeo.
+ * Copyright (c) 2020, 2023 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -52,14 +52,21 @@ public class AcceleoWorkspaceService implements WorkspaceService, LanguageClient
 	 */
 	public AcceleoWorkspaceService(AcceleoLanguageServer acceleoLanguageServer) {
 		this.server = Objects.requireNonNull(acceleoLanguageServer);
-		this.acceleoWorkspace = this.server.createWorkspace();
+		this.acceleoWorkspace = this.server.connectWorkspace();
 	}
 
 	@Override
 	public void connect(LanguageClient newLanguageClient) {
 		this.languageClient = newLanguageClient;
 	}
 
+	/**
+	 * Disconnects from the {@link LanguageClient}.
+	 */
+	public void disconnect() {
+		this.languageClient = null;
+	}
+
 	/**
 	 * Provides the current {@link AcceleoWorkspace}.
 	 *