[POM-leading for DSLs] Main update 20260625

.github/workflows/build.yaml

@@ -43,8 +43,8 @@ jobs:
         working-directory: ./rascal-vscode-extension
         run: |
           npm ci
-          npm run compile-tests
-          npm run normalTest
+          npm run compile:tests
+          npm run test:normal
 
   ui-test:
     strategy:
@@ -80,7 +80,7 @@ jobs:
         working-directory: ./rascal-vscode-extension
         run: |
           npm ci
-          npm run compile-tests
+          npm run compile:tests
 
       - name: Cache vscode downloads 
         id: cache-vscode
@@ -182,15 +182,16 @@ jobs:
             sed -i "1i⚠️ This is pre-release build, based on [CI build $GITHUB_RUN_NUMBER](https://github.com/usethesource/rascal-language-servers/actions/runs/$GITHUB_RUN_ID). ⚠️\n\n" README.md
           sed -i "s/\\(\"version\":.*\\)\\-head/\\1-head$GITHUB_RUN_NUMBER/" package.json
 
-      - name: Package & compile extension 
+      - name: Compile extension 
         working-directory: ./rascal-vscode-extension
         run: |
           npm ci
-          npm run license-check
-          npm run esbuild
+          npm run license:check
           npm run lint 
+          npm run check:types
+          npm run compile
 
-      - name: package extension
+      - name: Package extension
         working-directory: rascal-vscode-extension
         run: |
           npm run lsp4j:package

rascal-lsp/src/main/checkerframework/lsp4j.astub

@@ -451,3 +451,20 @@ public class SemanticTokensCapabilities extends DynamicRegistrationCapabilities
   public @Nullable Boolean getServerCancelSupport() {}
   public @Nullable Boolean getAugmentsSyntaxTokens() {}
 }
+
+package org.eclipse.lsp4j;
+
+import org.checkerframework.checker.nullness.qual.*;
+
+public class DocumentFilter {
+  public DocumentFilter(@Nullable String language, @Nullable String scheme, @Nullable Either<String, RelativePattern> pattern) {}
+}
+
+package org.eclipse.lsp4j;
+
+import org.checkerframework.checker.nullness.qual.*;
+
+public class Registration {
+  public Registration(String id, String method) {}
+  public Registration(String id, String method, @Nullable Object registerOptions) {}
+}

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

@@ -285,38 +285,36 @@ public CompletableFuture<Two<String, URI[]>[]> supplyPathConfig(PathConfigParame
         @Override
         public CompletableFuture<Void> sendRegisterLanguage(LanguageParameter lang) {
             logger.debug("rascal/sendRegisterLanguage({}, {})", lang.getName(), lang.getMainFunction());
-            return CompletableFuture.runAsync(() -> lspDocumentService.registerLanguage(lang), executor);
+            lspDocumentService.registerLanguage(lang);
+            return CompletableFutureUtils.completedFuture(null, executor);
         }
         @Override
         public CompletableFuture<Void> sendUnregisterLanguage(LanguageParameter lang) {
             logger.debug("rascal/sendUnregisterLanguage({})", lang.getName());
-            return CompletableFuture.runAsync(() -> lspDocumentService.unregisterLanguage(lang), executor);
+            lspDocumentService.unregisterLanguage(lang);
+            return CompletableFutureUtils.completedFuture(null, executor);
         }
 
         @Override
         public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
             // Exit when our parent process exits
             executor.submit(() -> ProcessHandle.of(params.getProcessId()).ifPresent(p -> p.onExit().thenAccept(ignored -> this.exit())));
 
-            return CompletableFuture.supplyAsync(() -> {
-                logger.info("LSP connection started (connected to {} version {})", params.getClientInfo().getName(), params.getClientInfo().getVersion());
-                logger.debug("LSP client capabilities: {}", params.getCapabilities());
-                final InitializeResult initializeResult = new InitializeResult(new ServerCapabilities());
-                lspDocumentService.initializeServerCapabilities(params.getCapabilities(), initializeResult.getCapabilities());
-                lspWorkspaceService.initialize(params.getCapabilities(), params.getWorkspaceFolders(), initializeResult.getCapabilities());
-                logger.debug("Initialized LSP connection with capabilities: {}", initializeResult);
-                return initializeResult;
-            }, executor);
+            logger.info("LSP connection started (connected to {} version {})", params.getClientInfo().getName(), params.getClientInfo().getVersion());
+            logger.debug("LSP client capabilities: {}", params.getCapabilities());
+            final InitializeResult initializeResult = new InitializeResult(new ServerCapabilities());
+            lspDocumentService.initializeServerCapabilities(params.getCapabilities(), initializeResult.getCapabilities());
+            lspWorkspaceService.initialize(params.getCapabilities(), params.getWorkspaceFolders(), initializeResult.getCapabilities());
+            logger.debug("Initialized LSP connection with capabilities: {}", initializeResult);
+            return CompletableFutureUtils.completedFuture(initializeResult, executor);
         }
 
         @Override
         @SuppressWarnings("unused") // InitializedParams is an empty interface
         public void initialized(InitializedParams params) {
-            executor.submit(() -> {
-                logger.debug("LSP connection initialized");
-                lspWorkspaceService.initialized();
-                lspDocumentService.initialized();
-            });
+            logger.debug("LSP connection initialized");
+            lspWorkspaceService.initialized();
+            lspDocumentService.initialized();
         }
 
         @Override

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

@@ -38,6 +38,7 @@
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.rascalmpl.library.util.ParseErrorRecovery;
+import org.rascalmpl.uri.FileAttributes;
 import org.rascalmpl.values.IRascalValueFactory;
 import org.rascalmpl.values.parsetrees.ITree;
 import org.rascalmpl.vscode.lsp.parametric.NoContributions.NoContributionException;
@@ -64,6 +65,7 @@ public class TextDocumentState {
     private final BiFunction<ISourceLocation, String, CompletableFuture<ITree>> parser;
     private final ISourceLocation location;
     private final ExecutorService exec;
+    private final FileAttributes attributesOnDisk;
 
     private final AtomicReference<Versioned<Update>> current;
     private final AtomicReference<@Nullable Versioned<ITree>> lastWithoutErrors;
@@ -73,10 +75,11 @@ public TextDocumentState(
             BiFunction<ISourceLocation, String, CompletableFuture<ITree>> parser,
             ISourceLocation location,
             int initialVersion, String initialContent, long initialTimestamp,
-            ExecutorService exec) {
+            ExecutorService exec, FileAttributes attributesOnDisk) {
 
         this.parser = parser;
         this.location = location;
+        this.attributesOnDisk = attributesOnDisk;
         this.lastWithoutErrors = new AtomicReference<>();
         this.last = new AtomicReference<>();
         this.exec = exec;
@@ -89,6 +92,13 @@ public ISourceLocation getLocation() {
         return location;
     }
 
+    /**
+     * The file attributes (aka stat) of the location on disk, before it was opened by VS Code
+     */
+    public FileAttributes getAttributesOnDisk() {
+        return attributesOnDisk;
+    }
+
     public CompletableFuture<Versioned<List<Diagnostics.Template>>> update(int version, String content, long timestamp) {
         var u = new Update(version, content, timestamp);
         Versioned.replaceIfNewer(current, new Versioned<>(version, u));
@@ -266,6 +276,6 @@ public long getLastModified() {
 
     public TextDocumentState changeParser(BiFunction<ISourceLocation, String, CompletableFuture<ITree>> parsing) {
         var c = getCurrentContent();
-        return new TextDocumentState(parsing, this.location, c.version(), c.get(), getLastModified(), exec);
+        return new TextDocumentState(parsing, this.location, c.version(), c.get(), getLastModified(), exec, getAttributesOnDisk());
     }
 }

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

@@ -49,6 +49,7 @@
 import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
+import org.rascalmpl.uri.FileAttributes;
 import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.util.locations.ColumnMaps;
 import org.rascalmpl.util.locations.LineColumnOffsetMap;
@@ -58,7 +59,6 @@
 import org.rascalmpl.vscode.lsp.util.Lists;
 import org.rascalmpl.vscode.lsp.util.Versioned;
 import org.rascalmpl.vscode.lsp.util.locations.Locations;
-
 import io.usethesource.vallang.ISourceLocation;
 
 /**
@@ -153,9 +153,25 @@ protected TextDocumentState getFile(ISourceLocation loc) {
         }
     }
 
+    private FileAttributes safeStat(ISourceLocation loc, long timestamp) {
+        try {
+            return URIResolverRegistry.getInstance().stat(loc);
+        } catch (IOException e) {
+            // generate a fallback
+            // for example for untitled files, text document content provided,
+            // or other files that are not accessible to our VFS
+            return new FileAttributes(
+                true, true,
+                timestamp, timestamp,
+                true, false,
+                0
+            );
+        }
+
+    }
+
     protected TextDocumentState openFile(TextDocumentItem doc, Function<ISourceLocation, BiFunction<ISourceLocation, String, CompletableFuture<ITree>>> parserGetter, long timestamp, ExecutorService exec)  {
-        return files.computeIfAbsent(Locations.toLoc(doc),
-            l -> new TextDocumentState(parserGetter.apply(l), l, doc.getVersion(), doc.getText(), timestamp, exec));
+        return files.computeIfAbsent(Locations.toLoc(doc), l -> new TextDocumentState(parserGetter.apply(l), l, doc.getVersion(), doc.getText(), timestamp, exec, safeStat(l, timestamp)));
     }
 
     private void invalidateColumnMaps(ISourceLocation loc) {
@@ -191,12 +207,13 @@ protected void closeFile(ISourceLocation loc) {
         return files.keySet();
     }
 
-    protected void updateContents(DidChangeTextDocumentParams change, long timestamp) {
+    protected TextDocumentState updateContents(DidChangeTextDocumentParams change, long timestamp) {
         var doc = change.getTextDocument();
         logger.trace("New contents for {}", doc);
         TextDocumentState file = getFile(Locations.toLoc(doc));
         invalidateColumnMaps(file.getLocation());
         handleParsingErrors(file, file.update(doc.getVersion(), Lists.last(change.getContentChanges()).getText(), timestamp));
+        return file;
     }
 
     protected void handleParsingErrors(TextDocumentState file, CompletableFuture<Versioned<List<Diagnostics.Template>>> diagnosticsAsync) {