Unify VFS interfaces by rodinaarssen · Pull Request #2641 · usethesource/rascal

rodinaarssen · 2026-02-11T09:41:23Z

No description provided.

…IResolverRegistry

… a port during start-up

codecov · 2026-02-11T09:47:29Z

Codecov Report

❌ Patch coverage is 0.96154% with 309 lines in your changes missing coverage. Please review.
✅ Project coverage is 46%. Comparing base (0f0afb4) to head (971fd4f).
⚠️ Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
...mpl/uri/remote/RemoteExternalResolverRegistry.java	0%	160 Missing ⚠️
...org/rascalmpl/uri/vfs/IRemoteResolverRegistry.java	0%	69 Missing ⚠️
...rc/org/rascalmpl/uri/vfs/FileAttributesResult.java	0%	46 Missing ⚠️
src/org/rascalmpl/uri/URIResolverRegistry.java	21%	9 Missing and 2 partials ⚠️
src/org/rascalmpl/util/NamedThreadPool.java	0%	10 Missing ⚠️
src/org/rascalmpl/uri/watch/WatchRegistry.java	0%	6 Missing ⚠️
src/org/rascalmpl/util/Lazy.java	0%	5 Missing ⚠️
...c/org/rascalmpl/uri/IExternalResolverRegistry.java	0%	2 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff            @@
##              main   #2641    +/-   ##
========================================
- Coverage       46%     46%    -1%     
+ Complexity    6683    6675     -8     
========================================
  Files          795     801     +6     
  Lines        65902   66172   +270     
  Branches      9880    9904    +24     
========================================
- Hits         30721   30707    -14     
- Misses       32801   33084   +283     
- Partials      2380    2381     +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…e in rascal-lsp

toinehartman

All of this (and the companion PR usethesource/rascal-language-servers#967) look like a nice unification and clean-up of interfaces.

src/org/rascalmpl/uri/remote/RemoteExternalResolverRegistry.java

DavyLandman

It's making progress, but it's not there yet.

src/org/rascalmpl/uri/remote/RemoteExternalResolverRegistry.java

DavyLandman · 2026-02-17T08:13:26Z

src/org/rascalmpl/uri/remote/RemoteExternalResolverRegistry.java

+            return this.callbacks.isEmpty();
+        }
+
+        public void publish(ISourceLocationWatcher.ISourceLocationChanged changed) {


this method should be called somewhere from the jsonrpc side?

DavyLandman · 2026-02-17T08:18:05Z

src/org/rascalmpl/uri/vfs/IRemoteResolverRegistry.java

+        }
+    }
+
+    public static class SourceLocation {


do we need this class (and the others?)? since I see we're using ISourceLocation directly in arguments using our gson configured serializers?

DavyLandman · 2026-02-17T08:23:01Z

src/org/rascalmpl/uri/URIResolverRegistry.java

+		this.externalRegistry = externalRegistry;
+		watchers.setExternalRegistry(externalRegistry);
+	}
+


what if this is called after loadServices then it will never be seen. The rest of this URIRegistryResolver has a lot of logic to make sure it loads resolvers correctly, no matter which path is taken.

I think we should consider something like an environment setting or something like that to make sure we don't get into messy initialization bugs.

…mote

… the remote

…IResolverRegistry can configure itself properly

…scal

…owards the Rascal side

sonarqubecloud · 2026-03-06T14:22:18Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

toinehartman · 2026-03-09T08:29:51Z

src/org/rascalmpl/uri/remote/IRascalFileSystemServices.java

+import io.usethesource.vallang.ISourceLocation;
+
+public interface IRascalFileSystemServices extends IRemoteResolverRegistry {
+    static final URIResolverRegistry reg = URIResolverRegistry.getInstance();


Suggested change

static final URIResolverRegistry reg = URIResolverRegistry.getInstance();

private static final URIResolverRegistry reg = URIResolverRegistry.getInstance();

toinehartman · 2026-03-09T08:31:18Z

src/org/rascalmpl/uri/remote/IRascalFileSystemServices.java

+
+public interface IRascalFileSystemServices extends IRemoteResolverRegistry {
+    static final URIResolverRegistry reg = URIResolverRegistry.getInstance();
+    public static final ExecutorService executor = NamedThreadPool.cachedDaemon("rascal-vfs");


Is this public for a reason? If so, I think private + a getter is a cleaner solution.

toinehartman · 2026-03-09T08:38:57Z

src/org/rascalmpl/uri/remote/RemoteExternalResolverRegistry.java

+                if (cause instanceof ResponseErrorException) {
+                    throw translateException((ResponseErrorException) cause);
+                }
+                throw new IOException(cause);


Suggested change

throw new IOException(cause);

rodinaarssen added 24 commits January 7, 2026 15:43

Added an interface for a remote resolver registry

51b6393

Ported over FileAttributesResult from rascal-lsp

8adb46e

Merge branch 'main' into unify-vfs-interfaces

3cb33d9

Renamed fallback to external in WatchRegistry

f300250

Fixed layout issues

052ae18

Changed URI to ISourceLocation in remote resolver interface

513ffb3

Removed FallbackResolver in favor of external resolver registry in UR…

a144fe5

…IResolverRegistry

Removed method from remote interface

842881a

Added IExternalResolverRegistry interface

3284a32

Added client side for remote resolver registry

16c4bb2

RascalShell connects to external resolver registry when provided with…

9fe54a6

… a port during start-up

Merge branch 'main' into unify-vfs-interfaces

82d2ae9

Merge branch 'main' into unify-vfs-interfaces

177f099

Using new GsonUtils configuration function

d494609

Merge remote-tracking branch 'origin/main' into unify-vfs-interfaces

01d2b66

Merge branch 'main' into unify-vfs-interfaces

8febaae

Merge branch 'main' into unify-vfs-interfaces

f6328c8

Merge branch 'main' into unify-vfs-interfaces

9490e8c

RemoteExternalResolverRegistry now correctly throws plain IOExceptions

8cebae8

Ported over NamedThreadPool from rascal-lsp

b25f48c

Ported over Watch-related classes from rascal-lsp

387b853

Working on implementing remote watches

f0de47f

Merge remote-tracking branch 'origin/main' into unify-vfs-interfaces

0c56761

Merge remote-tracking branch 'origin/main' into unify-vfs-interfaces

20f6541

rodinaarssen added 3 commits February 11, 2026 13:27

Ported over Lazy from rascal-lsp

a57d1c3

Reinstated directory listing cache for jsonrpc that was present befor…

88a6696

…e in rascal-lsp

Reinstated handling of native jsonrpc error codes from rascal-lsp

2d1c2cc

toinehartman reviewed Feb 11, 2026

View reviewed changes

src/org/rascalmpl/uri/remote/RemoteExternalResolverRegistry.java Outdated Show resolved Hide resolved

src/org/rascalmpl/uri/remote/RemoteExternalResolverRegistry.java Show resolved Hide resolved

DavyLandman requested changes Feb 17, 2026

View reviewed changes

rodinaarssen added 20 commits February 20, 2026 10:35

Using NamedThreadPool instead of DaemonThreadPool

674c6d8

Introduced constants instead of magic numbers for errors

8364a67

RemoteExternalResolverRegistry now forwards setLastModified to the re…

32b542a

…mote

RemoteExternalResolverRegistry now forwards supportsRecursiveWatch to…

1d728fd

… the remote

Using streaming Base64 for remote getOutputStream

cfc7cf6

Fixed remote getInputStream: using (streaming) Base64 decoding

4f975d3

Removed SourceLocation wrapper class

fa96e91

Replaced --vfsPort argument with an environment variable such that UR…

f74831f

…IResolverRegistry can configure itself properly

Removed the plain join() from the remote watch call

169d811

Imports

269b8f1

Merge remote-tracking branch 'origin/main' into unify-vfs-interfaces

971fd4f

Merge remote-tracking branch 'origin/main' into unify-vfs-interfaces

c7a57f7

Removed FileChangeEvent and FileChangeType from IRemoveResolverRegistry

1b2f38c

Added value to ISourceLocationChangeType enum

9d2862c

Implemented remote watch callbacks

ebc14b2

Merge remote-tracking branch 'origin/main' into unify-vfs-interfaces

b5f72f5

Merge remote-tracking branch 'origin/main' into unify-vfs-interfaces

d28de94

Moved default server implementation for remote Rascal FS access to Ra…

a2e6234

…scal

Got rid of FileAttributesResult in favor of FileAttributes

65555f2

Changed remote resolver interfaces to align the writeFile signature t…

7a901fc

…owards the Rascal side

toinehartman reviewed Mar 9, 2026

View reviewed changes

	static final URIResolverRegistry reg = URIResolverRegistry.getInstance();
	private static final URIResolverRegistry reg = URIResolverRegistry.getInstance();

Conversation

rodinaarssen commented Feb 11, 2026

Uh oh!

codecov bot commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

toinehartman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DavyLandman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DavyLandman Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

DavyLandman Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

DavyLandman Feb 17, 2026

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Mar 6, 2026

Quality Gate passed

Uh oh!

toinehartman Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

toinehartman Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

toinehartman Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Feb 11, 2026 •

edited

Loading