Unify VFS interfaces

src/org/rascalmpl/ideservices/GsonUtils.java

@@ -84,6 +84,7 @@ public class GsonUtils {
      */
     static {
         writer.setRationalsAsString(true);
+        writer.setFileLocationsAsPathOnly(false);
         typeMappings = List.of(
             new TypeMapping(IBool.class, tf.boolType()),
             new TypeMapping(ICollection.class), // IList, IMap, ISet

src/org/rascalmpl/library/Content.rsc

@@ -82,7 +82,7 @@ data Response
   = response(Status status, str mimeType, map[str,str] header, str content)
   | fileResponse(loc file, str mimeType, map[str,str] header)
   | jsonResponse(Status status, map[str,str] header, value val, str dateTimeFormat = "yyyy-MM-dd\'T\'HH:mm:ss\'Z\'", JSONFormatter[value] formatter = str (value _) { fail; },
-      bool explicitConstructorNames=false, bool explicitDataTypes=false, bool dateTimeAsInt=true, bool rationalsAsString=false)
+      bool explicitConstructorNames=false, bool explicitDataTypes=false, bool dateTimeAsInt=true, bool rationalsAsString=false, bool fileLocationsAsPathOnly=true)
   ;
 
 @synopsis{Utility to quickly render a string as HTML content}  

src/org/rascalmpl/library/lang/json/IO.java

@@ -106,7 +106,7 @@ public IValue parseJSON(IValue type, IString src, IString dateTimeFormat, IBool
 
     public void writeJSON(ISourceLocation loc, IValue value, IBool unpackedLocations, IString dateTimeFormat,
         IBool dateTimeAsInt, IBool rationalsAsString, IInteger indent, IBool dropOrigins, IFunction formatter, IBool explicitConstructorNames,
-        IBool explicitDataTypes) {
+        IBool explicitDataTypes, IBool fileLocationsAsPathOnly) {
         try (JsonWriter out =
             new JsonWriter(new OutputStreamWriter(URIResolverRegistry.getInstance().getOutputStream(loc, false),
                 Charset.forName("UTF8")))) {
@@ -123,6 +123,7 @@ public void writeJSON(ISourceLocation loc, IValue value, IBool unpackedLocations
                 .setFormatters(formatter)
                 .setExplicitConstructorNames(explicitConstructorNames.getValue())
                 .setExplicitDataTypes(explicitDataTypes.getValue())
+                .setFileLocationsAsPathOnly(fileLocationsAsPathOnly.getValue())
                 .write(out, value);
         }
         catch (IOException e) {
@@ -132,7 +133,7 @@ public void writeJSON(ISourceLocation loc, IValue value, IBool unpackedLocations
 
     public IString asJSON(IValue value, IBool unpackedLocations, IString dateTimeFormat, IBool dateTimeAsInt, IBool rationalsAsString,
         IInteger indent, IBool dropOrigins, IFunction formatter, IBool explicitConstructorNames,
-        IBool explicitDataTypes) {
+        IBool explicitDataTypes, IBool fileLocationsAsPathOnly) {
         StringWriter string = new StringWriter();
 
         try (JsonWriter out = new JsonWriter(string)) {
@@ -148,6 +149,7 @@ public IString asJSON(IValue value, IBool unpackedLocations, IString dateTimeFor
                 .setFormatters(formatter)
                 .setExplicitConstructorNames(explicitConstructorNames.getValue())
                 .setExplicitDataTypes(explicitDataTypes.getValue())
+                .setFileLocationsAsPathOnly(fileLocationsAsPathOnly.getValue())
                 .write(out, value);
 
             return values.string(string.toString());

src/org/rascalmpl/library/lang/json/IO.rsc

@@ -175,7 +175,8 @@ java void writeJSON(loc target, value val,
   bool dropOrigins=true, 
   JSONFormatter[value] formatter = str (value _) { fail; }, 
   bool explicitConstructorNames=false, 
-  bool explicitDataTypes=false
+  bool explicitDataTypes=false,
+  bool fileLocationsAsPathOnly=true
 );
 
 @javaClass{org.rascalmpl.library.lang.json.IO}
@@ -184,7 +185,7 @@ java void writeJSON(loc target, value val,
 @description{
 This function uses `writeJSON` and stores the result in a string.
 }
-java str asJSON(value val, bool unpackedLocations=false, str dateTimeFormat=DEFAULT_DATETIME_FORMAT, bool dateTimeAsInt=false, bool rationalsAsString=false, int indent = 0, bool dropOrigins=true, JSONFormatter[value] formatter = str (value _) { fail; }, bool explicitConstructorNames=false, bool explicitDataTypes=false);
+java str asJSON(value val, bool unpackedLocations=false, str dateTimeFormat=DEFAULT_DATETIME_FORMAT, bool dateTimeAsInt=false, bool rationalsAsString=false, int indent = 0, bool dropOrigins=true, JSONFormatter[value] formatter = str (value _) { fail; }, bool explicitConstructorNames=false, bool explicitDataTypes=false, bool fileLocationsAsPathOnly=true);
 
 @synopsis{((writeJSON)) and ((asJSON)) uses `Formatter` functions to flatten structured data to strings, on-demand}
 @description{

src/org/rascalmpl/library/lang/json/internal/JsonValueWriter.java

@@ -67,6 +67,7 @@ public class JsonValueWriter {
     private IFunction formatters;
     private boolean explicitConstructorNames = false;
     private boolean explicitDataTypes;
+    private boolean fileLocationsAsPathOnly = true;
 
     /** helper class for number serialization without quotes */
     private static class RascalNumber extends Number {
@@ -163,6 +164,11 @@ public JsonValueWriter setExplicitDataTypes(boolean setting) {
         return this;
     }
 
+    public JsonValueWriter setFileLocationsAsPathOnly(boolean setting) {
+        this.fileLocationsAsPathOnly = setting;
+        return this;
+    }
+
     public void write(JsonWriter out, IValue value) throws IOException {
         value.accept(new IValueVisitor<Void, IOException>() {
 
@@ -262,7 +268,7 @@ public Void visitSourceLocation(ISourceLocation o) throws IOException {
                 }
                 else {
                     if (!o.hasOffsetLength()) {
-                        if ("file".equals(o.getScheme())) {
+                        if (fileLocationsAsPathOnly && "file".equals(o.getScheme())) {
                             out.value(o.getPath());
                         }
                         else {

src/org/rascalmpl/library/lang/rascal/tests/library/lang/json/JSONIOTests.rsc

@@ -14,8 +14,8 @@ import Node;
 loc targetFile = |memory://test-tmp/test-<"<uuidi()>">.json|;
 public int maxLong = floor(pow(2,63));
 
-bool writeRead(type[&T] returnType, &T dt, value (value x) normalizer = value(value x) { return x; }, bool dateTimeAsInt=false, bool rationalsAsString=false, bool unpackedLocations=false, bool explicitConstructorNames=false, bool explicitDataTypes=false) {
-    json = asJSON(dt, dateTimeAsInt=dateTimeAsInt, rationalsAsString=rationalsAsString, unpackedLocations=unpackedLocations, explicitConstructorNames=explicitConstructorNames, explicitDataTypes=explicitDataTypes);
+bool writeRead(type[&T] returnType, &T dt, value (value x) normalizer = value(value x) { return x; }, bool dateTimeAsInt=false, bool rationalsAsString=false, bool unpackedLocations=false, bool explicitConstructorNames=false, bool explicitDataTypes=false, bool fileLocationsAsPathOnly=true) {
+    json = asJSON(dt, dateTimeAsInt=dateTimeAsInt, rationalsAsString=rationalsAsString, unpackedLocations=unpackedLocations, explicitConstructorNames=explicitConstructorNames, explicitDataTypes=explicitDataTypes, fileLocationsAsPathOnly=fileLocationsAsPathOnly);
     readBack = normalizer(parseJSON(returnType, json, explicitConstructorNames=explicitConstructorNames, explicitDataTypes=explicitDataTypes));
     if (readBack !:= normalizer(dt) /* ignores additional src fields */) {
         println("What is read back, a <type(typeOf(readBack),())>:");
@@ -59,6 +59,7 @@ test bool jsonWithNum1(num dt) = writeRead(#num, dt, normalizer=numNormalizer);
 
 test bool jsonWithLoc1(loc dt) = writeRead(#loc, dt);
 test bool jsonWithLoc2(loc dt) = writeRead(#loc, dt, unpackedLocations=true);
+test bool jsonWithLoc3(loc dt) = writeRead(#loc, dt, fileLocationsAsPathOnly=false);
 test bool jsonWithStr1(str dt) = writeRead(#str, dt);
 test bool jsonWithDatetime1(datetime dt) = writeRead(#datetime, dt);
 test bool jsonWithDatetime2(datetime dt) = writeRead(#datetime, dt, dateTimeAsInt=true);

src/org/rascalmpl/library/util/TermREPL.java

@@ -286,6 +286,7 @@ private ICommandOutput handleJSONResponse(IConstructor response) {
             IValue formatters = kws.getParameter("formatter");
             IValue ecn = kws.getParameter("explicitConstructorNames");
             IValue edt = kws.getParameter("explicitDataTypes");
+            IValue fpo = kws.getParameter("fileLocationsAsPathOnly");
 
             JsonValueWriter writer = new JsonValueWriter()
                 .setCalendarFormat(dtf != null ? ((IString) dtf).getValue() : "yyyy-MM-dd\'T\'HH:mm:ss\'Z\'")
@@ -294,6 +295,7 @@ private ICommandOutput handleJSONResponse(IConstructor response) {
                 .setRationalsAsString(ras != null ? ((IBool) ras).getValue() : false)
                 .setExplicitConstructorNames(ecn != null ? ((IBool) ecn).getValue() : false)
                 .setExplicitDataTypes(edt != null ? ((IBool) edt).getValue() : false)
+                .setFileLocationsAsPathOnly(edt != null ? ((IBool) fpo).getValue() : true)
                 ;
 
             return new ICommandOutput() {

src/org/rascalmpl/library/util/Webserver.java

@@ -245,6 +245,7 @@ private Response translateJsonResponse(Method method, IConstructor cons) {
                 IValue formatters = kws.getParameter("formatter");
                 IValue ecn = kws.getParameter("explicitConstructorNames");
                 IValue edt = kws.getParameter("explicitDataTypes");
+                IValue fpo = kws.getParameter("fileLocationsAsPathOnly");
 
                 JsonValueWriter writer = new JsonValueWriter()
                     .setCalendarFormat(dtf != null ? ((IString) dtf).getValue() : "yyyy-MM-dd\'T\'HH:mm:ss\'Z\'")
@@ -253,6 +254,7 @@ private Response translateJsonResponse(Method method, IConstructor cons) {
                     .setRationalsAsString(ras != null ? ((IBool) ras).getValue() : false)
                     .setExplicitConstructorNames(ecn != null ? ((IBool) ecn).getValue() : false)
                     .setExplicitDataTypes(edt != null ? ((IBool) edt).getValue() : false)
+                    .setFileLocationsAsPathOnly(fpo != null ? ((IBool) fpo).getValue() : true)
                     ;
 
                 try {

src/org/rascalmpl/repl/http/REPLContentServer.java

@@ -167,6 +167,7 @@ private static Response translateJsonResponse(Method method, IConstructor cons)
         IValue formatters = kws.getParameter("formatter");
         IValue ecn = kws.getParameter("explicitConstructorNames");
         IValue edt = kws.getParameter("explicitDataTypes");
+        IValue fpo = kws.getParameter("fileLocationsAsPathOnly");
 
         JsonValueWriter writer = new JsonValueWriter()
             .setCalendarFormat(dtf != null ? ((IString) dtf).getValue() : "yyyy-MM-dd\'T\'HH:mm:ss\'Z\'")
@@ -175,6 +176,7 @@ private static Response translateJsonResponse(Method method, IConstructor cons)
             .setRationalsAsString(ras != null ? ((IBool) ras).getValue() : false)
             .setExplicitConstructorNames(ecn != null ? ((IBool) ecn).getValue() : false)
             .setExplicitDataTypes(edt != null ? ((IBool) edt).getValue() : false)
+            .setFileLocationsAsPathOnly(fpo != null ? ((IBool) fpo).getValue() : true);
             ;
 
         try {

src/org/rascalmpl/shell/RascalShell.java

@@ -14,8 +14,8 @@
 package org.rascalmpl.shell;
 
 import java.io.IOException;
-import java.io.Writer;
 import java.io.PrintWriter;
+import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
@@ -38,9 +38,6 @@ public static void main(String[] args) throws IOException {
         for (; i < args.length; i++) {
             if (args[i].equals("--remoteIDEServicesPort")) {
                 ideServicesPort = Integer.parseInt(args[++i]);
-            } else if (args[i].equals("--vfsPort")) {
-                System.err.println("Ignored parameter --vfsPort and its argument");
-                i++; // skip the argument
             } else if (args[i].startsWith("--")) {
                 // Currently unknown named argument, skipping over this
                 System.err.println("Ignored parameter " + args[i]);

src/org/rascalmpl/uri/IExternalResolverRegistry.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018-2026, NWO-I CWI and Swat.engineering
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.rascalmpl.uri;
+
+public interface IExternalResolverRegistry extends ISourceLocationInputOutput, ILogicalSourceLocationResolver, ISourceLocationWatcher {
+    @Override
+    default String scheme() {
+        throw new UnsupportedOperationException("'scheme' is not supported for external resolvers");
+    }
+
+    @Override
+    default String authority() {
+        throw new UnsupportedOperationException("`authority` is not supported for external resolvers");
+    }
+}

src/org/rascalmpl/uri/ISourceLocationInput.java

@@ -33,10 +33,10 @@ default long created(ISourceLocation uri) throws IOException {
 	/** In bytes !only for internal use! */
 	long size(ISourceLocation uri)  throws IOException; 
 	boolean isDirectory(ISourceLocation uri);  
-	boolean isFile(ISourceLocation uri) ;
+	boolean isFile(ISourceLocation uri);
 	boolean isReadable(ISourceLocation uri) throws IOException;
 
-	String[] list(ISourceLocation uri)  throws IOException;
+	String[] list(ISourceLocation uri) throws IOException;
 	String scheme();
 	boolean supportsHost();
 	default boolean supportsReadableFileChannel() {

src/org/rascalmpl/uri/ISourceLocationWatcher.java

@@ -44,7 +44,6 @@ public interface ISourceLocationWatcher {
 	 */
 	boolean supportsRecursiveWatch();
 
-
 	public interface ISourceLocationChanged {
 		ISourceLocation getLocation();
 		ISourceLocationChangeType getChangeType();
@@ -63,9 +62,9 @@ default boolean isChanged() {
 	}
 
 	public enum ISourceLocationChangeType {
-		CREATED(),
-		DELETED(),
-		MODIFIED()
+		CREATED,
+		DELETED,
+		MODIFIED;
 	}
 
 	static ISourceLocationChanged created(ISourceLocation loc) {