Parametric: formatting

rascal-lsp/.vscode/settings.json

@@ -3,6 +3,7 @@
         "target": false
     },
     "search.exclude": {
-        "target": true
+		"target": true,
+		"/target/": true
     },
 }

rascal-lsp/pom.xml

@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.rascalmpl</groupId>
       <artifactId>rascal</artifactId>
-      <version>0.43.0-RC8</version>
+      <version>0.43.0-RC15-PREVIEW-REGULAR-PARSERS</version>
     </dependency>
     <!-- Rascal tests require JUnit 4 -->
     <dependency>
@@ -155,6 +155,12 @@
             <version>3.5.6</version>
           </dependency>
         </dependencies>
+        <configuration>
+          <systemPropertyVariables>
+            <forkMode>always</forkMode>
+            <log4j2.configurationFactory>org.rascalmpl.vscode.lsp.log.LogRedirectConfiguration</log4j2.configurationFactory>
+          </systemPropertyVariables>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.rascalmpl</groupId>

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/ILanguageContributions.java

@@ -62,6 +62,7 @@ public interface ILanguageContributions {
     public InterruptibleFuture<IList> selectionRange(IList focus);
     public InterruptibleFuture<IList> prepareCallHierarchy(IList focus);
     public InterruptibleFuture<IList> incomingOutgoingCalls(IConstructor hierarchyItem, IConstructor direction);
+    public InterruptibleFuture<IList> formatting(IList input, IConstructor formattingOptions);
 
     public InterruptibleFuture<ISourceLocation> prepareRename(IList focus);
     public InterruptibleFuture<ITuple> rename(IList focus, String name);
@@ -88,6 +89,7 @@ public interface ILanguageContributions {
     public CompletableFuture<Boolean> providesSelectionRange();
     public CompletableFuture<Boolean> providesCallHierarchy();
     public CompletableFuture<Boolean> providesCompletion();
+    public CompletableFuture<Boolean> providesFormatting();
 
     public CompletableFuture<Boolean> specialCaseHighlighting();
 

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/InterpretedLanguageContributions.java

@@ -99,6 +99,8 @@ public class InterpretedLanguageContributions implements ILanguageContributions
     private final CompletableFuture<@Nullable IFunction> didRenameFiles;
     private final CompletableFuture<@Nullable IFunction> selectionRange;
     private final CompletableFuture<@Nullable IFunction> prepareCallHierarchy;
+    private final CompletableFuture<@Nullable IFunction> formatting;
+
     private final CompletableFuture<@Nullable IFunction> callHierarchyService;
     private final CompletableFuture<@Nullable IFunction> completion;
     private final CompletableFuture<IList> completionTriggerCharacters;
@@ -119,6 +121,7 @@ public class InterpretedLanguageContributions implements ILanguageContributions
     private final CompletableFuture<Boolean> providesSelectionRange;
     private final CompletableFuture<Boolean> providesCallHierarchy;
     private final CompletableFuture<Boolean> providesCompletion;
+    private final CompletableFuture<Boolean> providesFormatting;
 
     private final CompletableFuture<Boolean> specialCaseHighlighting;
 
@@ -169,6 +172,7 @@ public InterpretedLanguageContributions(LanguageParameter lang, IBaseTextDocumen
             this.callHierarchyService = getFunctionFor(contributions, LanguageContributions.CALL_HIERARCHY, 1);
             this.completion = getFunctionFor(contributions, LanguageContributions.COMPLETION);
             this.completionTriggerCharacters = getContributionParameter(contributions, LanguageContributions.COMPLETION, LanguageContributions.COMPLETION_TRIGGER_CHARACTERS, VF.list(), IList.class);
+            this.formatting = getFunctionFor(contributions, LanguageContributions.FORMATTING);
 
             // assign boolean properties once instead of wasting futures all the time
             this.providesAnalysis = nonNull(this.analysis);
@@ -187,6 +191,7 @@ public InterpretedLanguageContributions(LanguageParameter lang, IBaseTextDocumen
             this.providesSelectionRange = nonNull(this.selectionRange);
             this.providesCallHierarchy = nonNull(this.prepareCallHierarchy);
             this.providesCompletion = nonNull(this.completion);
+            this.providesFormatting = nonNull(this.formatting);
 
             this.specialCaseHighlighting = getContributionParameter(contributions,
                 LanguageContributions.PARSING,
@@ -486,6 +491,12 @@ public CompletableFuture<IList> completionTriggerCharacters() {
         return completionTriggerCharacters;
     }
 
+    @Override
+    public InterruptibleFuture<IList> formatting(IList focus, IConstructor formattingOptions) {
+        debug(LanguageContributions.FORMATTING, focus.size(), formattingOptions);
+        return execFunction(LanguageContributions.FORMATTING, formatting, VF.list(), focus, formattingOptions);
+    }
+
     private void debug(String name, Object param) {
         logger.debug("{}({})", name, param);
     }
@@ -563,6 +574,11 @@ public CompletableFuture<Boolean> providesCompletion() {
         return providesCompletion;
     }
 
+    @Override
+    public CompletableFuture<Boolean> providesFormatting() {
+        return providesFormatting;
+    }
+
     @Override
     public CompletableFuture<Boolean> providesAnalysis() {
         return providesAnalysis;

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/LanguageContributionsMultiplexer.java

@@ -77,6 +77,7 @@ private static final <T> CompletableFuture<T> failedInitialization() {
     private volatile CompletableFuture<ILanguageContributions> selectionRange = failedInitialization();
     private volatile CompletableFuture<ILanguageContributions> callHierarchy = failedInitialization();
     private volatile CompletableFuture<ILanguageContributions> completion = failedInitialization();
+    private volatile CompletableFuture<ILanguageContributions> formatting = failedInitialization();
 
     private volatile CompletableFuture<Boolean> providesAnalysis = failedInitialization();
     private volatile CompletableFuture<Boolean> providesBuild = failedInitialization();
@@ -94,6 +95,7 @@ private static final <T> CompletableFuture<T> failedInitialization() {
     private volatile CompletableFuture<Boolean> providesSelectionRange = failedInitialization();
     private volatile CompletableFuture<Boolean> providesCallHierarchy = failedInitialization();
     private volatile CompletableFuture<Boolean> providesCompletion = failedInitialization();
+    private volatile CompletableFuture<Boolean> providesFormatting = failedInitialization();
 
     private volatile CompletableFuture<Boolean> specialCaseHighlighting = failedInitialization();
 
@@ -172,6 +174,7 @@ private synchronized void calculateRouting() {
         selectionRange = findFirstOrDefault(ILanguageContributions::providesSelectionRange, "selectionRange");
         callHierarchy = findFirstOrDefault(ILanguageContributions::providesCallHierarchy, "callHierarchy");
         completion = findFirstOrDefault(ILanguageContributions::providesCompletion, "completion");
+        formatting = findFirstOrDefault(ILanguageContributions::providesFormatting, "formatting");
 
         providesAnalysis = anyTrue(ILanguageContributions::providesAnalysis);
         providesBuild = anyTrue(ILanguageContributions::providesBuild);
@@ -189,6 +192,7 @@ private synchronized void calculateRouting() {
         providesSelectionRange = anyTrue(ILanguageContributions::providesSelectionRange);
         providesCallHierarchy = anyTrue(ILanguageContributions::providesCallHierarchy);
         providesCompletion = anyTrue(ILanguageContributions::providesCompletion);
+        providesFormatting = anyTrue(ILanguageContributions::providesFormatting);
 
         // Always use the special-case highlighting status of *the first*
         // contribution (possibly using the default value in the Rascal ADT if
@@ -350,6 +354,11 @@ public InterruptibleFuture<IList> selectionRange(IList focus) {
         return flatten(selectionRange, c -> c.selectionRange(focus));
     }
 
+    @Override
+    public InterruptibleFuture<IList> formatting(IList focus, IConstructor formattingOptions) {
+        return flatten(formatting, c -> c.formatting(focus, formattingOptions));
+    }
+
     @Override
     public InterruptibleFuture<IList> completion(IList focus, IInteger cursorOffset, IConstructor trigger) {
         return flatten(completion, c -> c.completion(focus, cursorOffset, trigger));
@@ -449,6 +458,11 @@ public CompletableFuture<Boolean> providesCompletion() {
         return providesCompletion;
     }
 
+    @Override
+    public CompletableFuture<Boolean> providesFormatting() {
+        return providesFormatting;
+    }
+
     @Override
     public CompletableFuture<Boolean> specialCaseHighlighting() {
         return specialCaseHighlighting;

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/NoContributions.java

@@ -199,6 +199,11 @@ public CompletableFuture<IList> completionTriggerCharacters() {
         return completable(VF.list());
     }
 
+    @Override
+    public InterruptibleFuture<IList> formatting(IList input, IConstructor formattingOptions) {
+        return interruptible(VF.list());
+    }
+
     @Override
     public CompletableFuture<Boolean> providesAnalysis() {
         return falsy;
@@ -279,6 +284,11 @@ public CompletableFuture<Boolean> providesCompletion() {
         return falsy;
     }
 
+    @Override
+    public CompletableFuture<Boolean> providesFormatting() {
+        return falsy;
+    }
+
     @Override
     public CompletableFuture<Boolean> specialCaseHighlighting() {
         return falsy;

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/ParametricTextDocumentService.java

@@ -63,6 +63,7 @@
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionParams;
 import org.eclipse.lsp4j.CodeLens;
+import org.eclipse.lsp4j.CodeLensOptions;
 import org.eclipse.lsp4j.CodeLensParams;
 import org.eclipse.lsp4j.Command;
 import org.eclipse.lsp4j.CompletionItem;
@@ -75,12 +76,17 @@
 import org.eclipse.lsp4j.DidCloseTextDocumentParams;
 import org.eclipse.lsp4j.DidOpenTextDocumentParams;
 import org.eclipse.lsp4j.DidSaveTextDocumentParams;
+import org.eclipse.lsp4j.DocumentFormattingParams;
+import org.eclipse.lsp4j.DocumentRangeFormattingParams;
 import org.eclipse.lsp4j.DocumentSymbol;
 import org.eclipse.lsp4j.DocumentSymbolParams;
+import org.eclipse.lsp4j.ExecuteCommandOptions;
+import org.eclipse.lsp4j.DocumentSymbolParams;
 import org.eclipse.lsp4j.FileDelete;
 import org.eclipse.lsp4j.FileRename;
 import org.eclipse.lsp4j.FoldingRange;
 import org.eclipse.lsp4j.FoldingRangeRequestParams;
+import org.eclipse.lsp4j.FormattingOptions;
 import org.eclipse.lsp4j.Hover;
 import org.eclipse.lsp4j.HoverParams;
 import org.eclipse.lsp4j.ImplementationParams;
@@ -98,6 +104,7 @@
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.ReferenceParams;
 import org.eclipse.lsp4j.RenameFilesParams;
+import org.eclipse.lsp4j.RenameOptions;
 import org.eclipse.lsp4j.RenameParams;
 import org.eclipse.lsp4j.SelectionRange;
 import org.eclipse.lsp4j.SelectionRangeParams;
@@ -111,6 +118,8 @@
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.TextDocumentItem;
 import org.eclipse.lsp4j.TextDocumentSyncKind;
+import org.eclipse.lsp4j.TextEdit;
+import org.eclipse.lsp4j.VersionedTextDocumentIdentifier;
 import org.eclipse.lsp4j.WorkspaceEdit;
 import org.eclipse.lsp4j.WorkspaceFolder;
 import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
@@ -120,6 +129,7 @@
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.LanguageClientAware;
+import org.eclipse.lsp4j.util.Ranges;
 import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.uri.URIUtil;
 import org.rascalmpl.values.IRascalValueFactory;
@@ -138,6 +148,7 @@
 import org.rascalmpl.vscode.lsp.parametric.model.ParametricFileFacts;
 import org.rascalmpl.vscode.lsp.parametric.model.ParametricSummary;
 import org.rascalmpl.vscode.lsp.parametric.model.ParametricSummary.SummaryLookup;
+import org.rascalmpl.vscode.lsp.rascal.RascalLanguageServices;
 import org.rascalmpl.vscode.lsp.rascal.conversion.CallHierarchy;
 import org.rascalmpl.vscode.lsp.rascal.conversion.CodeActions;
 import org.rascalmpl.vscode.lsp.rascal.conversion.Completion;
@@ -149,6 +160,7 @@
 import org.rascalmpl.vscode.lsp.rascal.conversion.SelectionRanges;
 import org.rascalmpl.vscode.lsp.rascal.conversion.SemanticTokenizer;
 import org.rascalmpl.vscode.lsp.uri.LSPOpenFileRedirector;
+import org.rascalmpl.vscode.lsp.util.FormattingOptionsTool;
 import org.rascalmpl.vscode.lsp.util.Maps;
 import org.rascalmpl.vscode.lsp.util.Versioned;
 import org.rascalmpl.vscode.lsp.util.concurrent.CompletableFutureUtils;
@@ -227,6 +239,23 @@
 
         // Register document sync statically
         result.setTextDocumentSync(TextDocumentSyncKind.Full);
+
+        // JV: this block came back in a merge conflict. Should it be deleted?
+        result.setHoverProvider(true);
+        result.setReferencesProvider(true);
+        result.setDocumentSymbolProvider(true);
+        result.setImplementationProvider(true);
+        result.setSemanticTokensProvider(SemanticTokenizer.options());
+        result.setCodeActionProvider(true);
+        result.setCodeLensProvider(new CodeLensOptions(false));
+        result.setRenameProvider(Either.forRight(new RenameOptions(true)));
+        result.setExecuteCommandProvider(new ExecuteCommandOptions(Collections.singletonList(getRascalMetaCommandName())));
+        result.setDocumentFormattingProvider(true);
+        result.setDocumentRangeFormattingProvider(true);
+        result.setInlayHintProvider(true);
+        result.setSelectionRangeProvider(true);
+        result.setFoldingRangeProvider(true);
+        result.setCallHierarchyProvider(true);
     }
 
     private String getRascalMetaCommandName() {
@@ -711,6 +740,50 @@
         return CodeActions.mergeAndConvertCodeActions(this, dedicatedLanguageName, contribs.getName(), quickfixes, codeActions);
     }
 
+    @Override
+    public CompletableFuture<List<? extends TextEdit>> formatting(DocumentFormattingParams params) {
+        logger.debug("Formatting: {}", params);
+
+        var uri = Locations.toLoc(params.getTextDocument());
+        final ILanguageContributions contribs = contributions(uri);
+
+        // call the `formatting` implementation of the relevant language contribution
+        return getFile(uri)
+            .getCurrentTreeAsync(true)
+            .thenApply(Versioned::get)
+            .thenCompose(tree -> {
+                final var opts = FormattingOptionsTool.translate(params.getOptions());
+                return contribs.formatting(VF.list(tree), opts).get();
+            })
+            .thenApply(l -> DocumentChanges.translateTextEdits(l, getColumnMaps()));
+    }
+
+    @Override
+    public CompletableFuture<List<? extends TextEdit>> rangeFormatting(DocumentRangeFormattingParams params) {
+        logger.debug("Formatting range: {}", params);
+
+        var uri = Locations.toLoc(params.getTextDocument());
+        Range range = params.getRange();
+        final ILanguageContributions contribs = contributions(uri);
+
+        // call the `formatting` implementation of the relevant language contribution
+        return getFile(uri)
+            .getCurrentTreeAsync(true)
+            .thenApply(Versioned::get)
+            .thenCompose(tree -> {
+                var r = Locations.setRange(uri, range, getColumnMaps());
+                var focus = TreeSearch.computeFocusList(tree, r.getBeginLine(), r.getBeginColumn(), r.getEndLine(), r.getEndColumn());
+
+                IConstructor opts = FormattingOptionsTool.translate(params.getOptions());
+                return contribs.formatting(focus, opts).get();
+            })
+            // convert the document changes
+            .thenApply(l -> DocumentChanges.translateTextEdits(l, getColumnMaps())
+                .stream()
+                .filter(e -> Ranges.containsRange(range, e.getRange()))
+                .collect(Collectors.toList()));
+    }
+
     private CompletableFuture<IList> computeCodeActions(final ILanguageContributions contribs, final int startLine, final int startColumn, ITree tree) {
         IList focus = TreeSearch.computeFocusList(tree, startLine, startColumn);
 

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/parametric/model/RascalADTs.java

@@ -51,6 +51,7 @@ private LanguageContributions () {}
         public static final String CALL_HIERARCHY = "callHierarchy";
         public static final String COMPLETION = "completion";
         public static final String COMPLETION_TRIGGER_CHARACTERS = "additionalTriggerCharacters";
+        public static final String FORMATTING = "formatting";
 
         public static final String RENAME_SERVICE = "renameService";
         public static final String PREPARE_RENAME_SERVICE = "prepareRenameService";

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

@@ -48,6 +48,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.eclipse.lsp4j.FormattingOptions;
 import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
@@ -73,7 +74,9 @@
 import org.rascalmpl.vscode.lsp.uri.LSPOpenFileResolver;
 import org.rascalmpl.vscode.lsp.util.EvaluatorUtil;
 import org.rascalmpl.vscode.lsp.util.EvaluatorUtil.LSPContext;
+import org.rascalmpl.vscode.lsp.util.FormattingOptionsTool;
 import org.rascalmpl.vscode.lsp.util.RascalServices;
+import org.rascalmpl.vscode.lsp.util.Versioned;
 import org.rascalmpl.vscode.lsp.util.concurrent.InterruptibleFuture;
 import org.rascalmpl.vscode.lsp.util.locations.Locations;
 
@@ -128,7 +131,7 @@
         var context = new LSPContext(exec, docService, workspaceService, client);
 
         shortRunningTaskEvaluator = makeFutureEvaluator(context, "Rascal tasks", monitor, pcfg,  "lang::rascal::lsp::DocumentSymbols", "lang::rascal::lsp::Templates", "lang::rascal::lsp::Analyzer");
-        semanticEvaluator = makeFutureEvaluator(context, "Rascal semantics", monitor, compilerPcfg, "lang::rascalcore::check::Summary", "lang::rascal::lsp::refactor::Rename", "lang::rascal::lsp::Actions");
+        semanticEvaluator = makeFutureEvaluator(context, "Rascal semantics", monitor, compilerPcfg, "lang::rascalcore::check::Summary", "lang::rascal::lsp::refactor::Rename", "lang::rascal::lsp::Actions", "lang::rascal::lsp::Formatter");
         compilerEvaluator = makeFutureEvaluator(context, "Rascal compiler", monitor, compilerPcfg, "lang::rascal::lsp::IDECheckerWrapper");
         actionStore = semanticEvaluator.thenApply(e -> ((ModuleEnvironment) e.getModule("lang::rascal::lsp::Actions")).getStore());
         rascalTextDocumentService = docService;
@@ -392,6 +395,18 @@
         return result;
     }
 
+    public CompletableFuture<IList> format(IList focus, FormattingOptions options) {
+        return runEvaluator(
+            "Formatting",
+            semanticEvaluator,
+            eval -> (IList) eval.call("rascalFormattingService", focus, FormattingOptionsTool.translate(options)),
+            VF.list(),
+            exec,
+            false,
+            client
+        ).get();
+    }
+
     public CompletableFuture<IList> parseCodeActions(String command) {
         return actionStore.thenApply(commandStore -> {
             try {