Unify VFS interfaces

rascal-lsp/.vscode/launch.json

@@ -11,7 +11,8 @@
       "vmArgs": [
         "-Dlog4j2.level=TRACE",
         "-Drascal.compilerClasspath=${workspaceFolder}/target/lib/rascal.jar",
-        "-Drascal.fallbackResolver=org.rascalmpl.vscode.lsp.uri.FallbackResolver"
+        "-Drascal.remoteResolverRegistryPort=8889",
+        "-Drascal.specializedRemoteResolverRegistryClass=org.rascalmpl.vscode.lsp.uri.jsonrpc.VSCodeFileSystemInRascal"
       ]
     },
     {
@@ -24,7 +25,8 @@
       "vmArgs": [
         "-Dlog4j2.level=TRACE",
         "-Drascal.compilerClasspath=${workspaceFolder}/target/lib/rascal.jar",
-        "-Drascal.fallbackResolver=org.rascalmpl.vscode.lsp.uri.FallbackResolver"
+        "-Drascal.remoteResolverRegistryPort=8889",
+        "-Drascal.specializedRemoteResolverRegistryClass=org.rascalmpl.vscode.lsp.uri.jsonrpc.VSCodeFileSystemInRascal"
       ]
     }
   ]

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/BaseLanguageServer.java

@@ -43,6 +43,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -60,20 +61,22 @@
 import org.eclipse.lsp4j.services.LanguageClientAware;
 import org.rascalmpl.ideservices.GsonUtils;
 import org.rascalmpl.library.util.PathConfig;
+import org.rascalmpl.uri.URIResolverRegistry;
+import org.rascalmpl.uri.remote.jsonrpc.RemoteIOError;
 import org.rascalmpl.vscode.lsp.log.LogRedirectConfiguration;
 import org.rascalmpl.vscode.lsp.parametric.LanguageRegistry.LanguageParameter;
 import org.rascalmpl.vscode.lsp.terminal.RemoteIDEServicesThread;
-import org.rascalmpl.vscode.lsp.uri.jsonrpc.impl.VSCodeVFSClient;
+import org.rascalmpl.vscode.lsp.uri.jsonrpc.RascalFileSystemInVSCode;
 import org.rascalmpl.vscode.lsp.uri.jsonrpc.messages.PathConfigParameter;
-import org.rascalmpl.vscode.lsp.uri.jsonrpc.messages.VFSRegister;
+import org.rascalmpl.vscode.lsp.util.Sets;
 import org.rascalmpl.vscode.lsp.util.concurrent.CompletableFutureUtils;
 import org.rascalmpl.vscode.lsp.util.locations.Locations;
 
 import io.usethesource.vallang.IList;
 import io.usethesource.vallang.ISourceLocation;
 
 /**
-* The main language server class for Rascal is build on top of the Eclipse lsp4j library
+* The main language server class for Rascal is built on top of the Eclipse lsp4j library
 */
 @SuppressWarnings("java:S106") // we are using system.in/system.out correctly in this class
 public abstract class BaseLanguageServer {
@@ -119,6 +122,7 @@ private static Launcher<IBaseLanguageClient> constructLSPClient(InputStream in,
             .setOutput(out)
             .configureGson(GsonUtils.complexAsJsonObject())
             .setExecutorService(threadPool)
+            .setExceptionHandler(t -> RemoteIOError.translate((Exception) t).getResponseError())
             .create();
 
         server.connect(clientLauncher.getRemoteProxy());
@@ -193,7 +197,7 @@ private static void startLSP(Launcher<IBaseLanguageClient> server) {
             }
         }
     }
-    private static class ActualLanguageServer implements IBaseLanguageServerExtensions, LanguageClientAware {
+    private static class ActualLanguageServer extends RascalFileSystemInVSCode implements IBaseLanguageServerExtensions, LanguageClientAware {
         static final Logger logger = LogManager.getLogger(ActualLanguageServer.class);
         private final IBaseTextDocumentService lspDocumentService;
         private final BaseWorkspaceService lspWorkspaceService;
@@ -307,15 +311,11 @@ public void connect(LanguageClient client) {
             var actualClient = (IBaseLanguageClient) client;
             lspDocumentService.connect(actualClient);
             lspWorkspaceService.connect(actualClient);
+            provideClient(actualClient);
             remoteIDEServicesConfiguration = RemoteIDEServicesThread.startRemoteIDEServicesServer(client, lspDocumentService, executor);
             logger.debug("Remote IDE Services Port {}", remoteIDEServicesConfiguration);
         }
 
-        @Override
-        public void registerVFS(VFSRegister registration) {
-            VSCodeVFSClient.buildAndRegister(registration.getPort());
-        }
-
         @Override
         public void cancelProgress(WorkDoneProgressCancelParams params) {
             lspDocumentService.cancelProgress(params.getToken().getLeft());
@@ -326,5 +326,14 @@ public void setMinimumLogLevel(String level) {
             final var l = Level.toLevel(level, Level.DEBUG); // fall back to debug when the string cannot be mapped
             Configurator.setRootLevel(l);
         }
+
+        @Override
+        public CompletableFuture<String[]> fileSystemSchemes() {
+            var reg = URIResolverRegistry.getInstance();
+            var inputs = reg.getRegisteredInputSchemes();
+            var logicals = reg.getRegisteredLogicalSchemes();
+
+            return CompletableFuture.completedFuture(Sets.union(inputs, logicals).toArray(String[]::new));
+        }
     }
 }

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/IBaseLanguageClient.java

@@ -31,35 +31,38 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.eclipse.lsp4j.services.LanguageClient;
+import org.rascalmpl.uri.vfs.IRemoteResolverRegistryClient;
 import org.rascalmpl.vscode.lsp.parametric.LanguageRegistry.LanguageParameter;
 
 import io.usethesource.vallang.IInteger;
 import io.usethesource.vallang.IString;
 
-public interface IBaseLanguageClient extends LanguageClient {
-    @JsonNotification("rascal/showContent")
+@JsonSegment("rascal")
+public interface IBaseLanguageClient extends LanguageClient, IRemoteResolverRegistryClient {
+    @JsonNotification
     void showContent(URI uri, IString title, IInteger viewColumn);
 
-    @JsonNotification("rascal/receiveRegisterLanguage")
+    @JsonNotification
     void receiveRegisterLanguage(LanguageParameter lang);
 
-    @JsonNotification("rascal/receiveUnregisterLanguage")
+    @JsonNotification
     void receiveUnregisterLanguage(LanguageParameter lang);
 
-    @JsonNotification("rascal/editDocument")
+    @JsonNotification
     void editDocument(URI uri, @Nullable Range range, int viewColumn);
 
     /**
      * Notification sent to the vscode client to start a debugging session on the given debug adapter port
      */
-    @JsonNotification("rascal/startDebuggingSession")
+    @JsonNotification
     void startDebuggingSession(int serverPort);
 
     /**
      * Notification sent to the vscode client to register the port on which the debug adapter server is listening
      * It is then used to make the link between a terminal process ID and the corresponding debug server port
      */
-    @JsonNotification("rascal/registerDebugServerPort")
+    @JsonNotification
     void registerDebugServerPort(int processID, int serverPort);
 }

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/IBaseLanguageServerExtensions.java

@@ -32,35 +32,36 @@
 import org.eclipse.lsp4j.jsonrpc.messages.Tuple.Two;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.eclipse.lsp4j.jsonrpc.services.JsonRequest;
+import org.eclipse.lsp4j.jsonrpc.services.JsonSegment;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.rascalmpl.vscode.lsp.parametric.LanguageRegistry.LanguageParameter;
 import org.rascalmpl.vscode.lsp.uri.jsonrpc.messages.PathConfigParameter;
-import org.rascalmpl.vscode.lsp.uri.jsonrpc.messages.VFSRegister;
 
-public interface IBaseLanguageServerExtensions extends LanguageServer, IRascalFileSystemServices {
-    @JsonNotification("rascal/supplyRemoteIDEServicesConfiguration")
+@JsonSegment("rascal")
+public interface IBaseLanguageServerExtensions extends LanguageServer {
+    @JsonNotification
     default CompletableFuture<IDEServicesConfiguration> supplyRemoteIDEServicesConfiguration() {
         throw new UnsupportedOperationException();
     }
 
-    @JsonRequest("rascal/sendRegisterLanguage")
+    @JsonRequest
     default CompletableFuture<Void> sendRegisterLanguage(LanguageParameter lang) {
         throw new UnsupportedOperationException();
     }
 
-    @JsonRequest("rascal/sendUnregisterLanguage")
+    @JsonRequest
     default CompletableFuture<Void> sendUnregisterLanguage(LanguageParameter lang) {
         throw new UnsupportedOperationException();
     }
 
-    @JsonRequest("rascal/supplyPathConfig")
+    @JsonRequest
     default CompletableFuture<Two<String, URI[]>[]> supplyPathConfig(PathConfigParameter projectFolder) {
         throw new UnsupportedOperationException();
     }
 
-    @JsonNotification("rascal/vfs/register")
-    void registerVFS(VFSRegister registration);
-
-    @JsonNotification("rascal/logLevel")
+    @JsonNotification("logLevel")
     void setMinimumLogLevel(String level);
+
+    @JsonRequest("vfs/schemes")
+    CompletableFuture<String[]> fileSystemSchemes();
 }