Fixed workspace resolution.

- now resolver are local to a project and delegate
  to resolvers of project dependencies.

plugins/org.eclipse.acceleo.aql.ide.ui/src/org/eclipse/acceleo/aql/ide/ui/EclipseAcceleoLanguageServerContext.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
@@ -10,11 +10,32 @@
  *******************************************************************************/
 package org.eclipse.acceleo.aql.ide.ui;
 
+import java.io.ByteArrayOutputStream;
+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;
 import org.eclipse.acceleo.aql.ls.AcceleoLanguageServerContext;
+import org.eclipse.acceleo.aql.ls.services.workspace.AcceleoProject;
 import org.eclipse.acceleo.aql.ls.services.workspace.AcceleoWorkspace;
+import org.eclipse.acceleo.aql.parser.AcceleoParser;
+import org.eclipse.acceleo.aql.parser.ModuleLoader;
+import org.eclipse.acceleo.query.ide.QueryPlugin;
+import org.eclipse.acceleo.query.ide.runtime.impl.namespace.workspace.Synchronizer;
+import org.eclipse.acceleo.query.runtime.namespace.IQualifiedNameResolver;
+import org.eclipse.acceleo.query.runtime.namespace.workspace.IQueryWorkspace;
+import org.eclipse.acceleo.query.runtime.namespace.workspace.IQueryWorkspaceQualifiedNameResolver;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
 
 /**
  * Eclipse-specific implementation of {@link AcceleoLanguageServerContext}.
@@ -23,16 +44,43 @@
  */
 public class EclipseAcceleoLanguageServerContext implements AcceleoLanguageServerContext {
 
+	/**
+	 * the {@link Synchronizer} for Acceleo.
+	 * 
+	 * @author <a href="mailto:yvan.lussaud@obeo.fr">Yvan Lussaud</a>
+	 */
+	private static class AcceleSynchronizer extends Synchronizer<AcceleoProject> {
+
+		AcceleSynchronizer(IWorkspace eclipseWorkspace, IQueryWorkspace<AcceleoProject> queryWorkspace) {
+			super(eclipseWorkspace, queryWorkspace);
+		}
+
+		@Override
+		protected AcceleoProject createProject(IQueryWorkspace<AcceleoProject> acceleoWorkspace,
+				IProject eclipseProject) {
+			return new AcceleoProject(eclipseProject.getName(), (AcceleoWorkspace)acceleoWorkspace);
+		}
+
+		public AcceleoWorkspace getAcceleoWorkspace() {
+			return (AcceleoWorkspace)getQueryWorkspace();
+		}
+
+	}
+
+	/**
+	 * The size of the buffer we use to read {@link IFile Acceleo documents}.
+	 */
+	private static final int BUFFER_SIZE = 8 * 1024;
+
 	/**
 	 * The client {@link IWorkspace}.
 	 */
 	private final IWorkspace clientWorkspace;
 
 	/**
-	 * The {@link EclipseWorkspace2AcceleoWorkspace} that allows us to bridge the {@link IWorkspace} and
-	 * {@link AcceleoWorkspace} APIs.
+	 * The mapping form an {@link AcceleoWorkspace} to its {@link EclipseWorkspace2AcceleoWorkspace}.
 	 */
-	private final EclipseWorkspace2AcceleoWorkspace workspaceSynchronizer = new EclipseWorkspace2AcceleoWorkspace();
+	private final Map<AcceleoWorkspace, AcceleSynchronizer> synchronizers = new HashMap<>();
 
 	/**
 	 * The constructor.
@@ -46,12 +94,70 @@ public EclipseAcceleoLanguageServerContext(IWorkspace clientWorkspace) {
 
 	@Override
 	public AcceleoWorkspace createWorkspace() {
-		return this.workspaceSynchronizer.createAcceleoWorkspace(this.clientWorkspace);
+		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();
 	}
 
 	@Override
 	public void deleteWorkspace(AcceleoWorkspace acceleoWorkspaceToDelete) {
-		this.workspaceSynchronizer.deleteAcceleoWorkspace(acceleoWorkspaceToDelete);
+		final AcceleSynchronizer syncronizer = synchronizers.remove(acceleoWorkspaceToDelete);
+		syncronizer.dispose();
+	}
+
+	@Override
+	public String getResourceContents(URI resource) {
+		final IFile file = clientWorkspace.getRoot().getFileForLocation(new Path(resource.getPath()
+				.toString()));
+		try {
+			InputStream inputStream = file.getContents();
+			ByteArrayOutputStream result = new ByteArrayOutputStream();
+			byte[] buffer = new byte[BUFFER_SIZE];
+			int length;
+			while ((length = inputStream.read(buffer)) != -1) {
+				result.write(buffer, 0, length);
+			}
+			inputStream.close();
+			return result.toString(file.getCharset());
+		} catch (IOException | CoreException exception) {
+			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+					"There was an issue while reading the contents of file " + file.getLocation().toString(),
+					exception));
+		}
+
+		return null;
+	}
+
+	@Override
+	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,
+				AcceleoParser.QUALIFIER_SEPARATOR, true);
+		resolver.addLoader(new ModuleLoader(new AcceleoParser(), null));
+		resolver.addLoader(QueryPlugin.getPlugin().createJavaLoader(AcceleoParser.QUALIFIER_SEPARATOR));
+
+		return QueryPlugin.getPlugin().createWorkspaceQualifiedNameResolver(eclipseProject, resolver,
+				synchronizer);
+	}
+
+	/**
+	 * Provides the {@link String name} to use for the created {@link AcceleoWorkspace} corresponding to an
+	 * {@link IWorkspace}.
+	 * 
+	 * @param clientWorkspace
+	 *            the (non-{@code null}) source {@link IWorkspace}.
+	 * @return the {@link String name} intended for the {@link AcceleoWorkspace} corresponding to
+	 *         {@code clientWorkspace}.
+	 */
+	private static String getAcceleoWorkspaceName(IWorkspace clientWorkspace) {
+		return "AcceleoWorkspace[" + clientWorkspace.getRoot().getLocationURI().toString() + "]";
 	}
 
 }