Factor out helper functions in NextflowLanguageServer

Signed-off-by: Ben Sherman <[email protected]>

Author: bentsherman

src/main/java/nextflow/lsp/NextflowLanguageServer.java

@@ -140,42 +140,45 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
             }
         }
 
-        var serverCapabilities = new ServerCapabilities();
-        serverCapabilities.setTextDocumentSync(TextDocumentSyncKind.Incremental);
+        var initializeResult = new InitializeResult(serverCapabilities());
+        return CompletableFuture.completedFuture(initializeResult);
+    }
+
+    private static ServerCapabilities serverCapabilities() {
+        var result = new ServerCapabilities();
+        result.setTextDocumentSync(TextDocumentSyncKind.Incremental);
 
         var workspaceFoldersOptions = new WorkspaceFoldersOptions();
         workspaceFoldersOptions.setSupported(true);
         workspaceFoldersOptions.setChangeNotifications(true);
         var workspaceCapabilities = new WorkspaceServerCapabilities(workspaceFoldersOptions);
-        serverCapabilities.setWorkspace(workspaceCapabilities);
+        result.setWorkspace(workspaceCapabilities);
 
-        serverCapabilities.setCallHierarchyProvider(true);
+        result.setCallHierarchyProvider(true);
         var codeLensOptions = new CodeLensOptions(false);
-        serverCapabilities.setCodeLensProvider(codeLensOptions);
+        result.setCodeLensProvider(codeLensOptions);
         var completionOptions = new CompletionOptions(false, List.of("."));
-        serverCapabilities.setCompletionProvider(completionOptions);
-        serverCapabilities.setDefinitionProvider(true);
-        serverCapabilities.setDocumentFormattingProvider(true);
+        result.setCompletionProvider(completionOptions);
+        result.setDefinitionProvider(true);
+        result.setDocumentFormattingProvider(true);
         var documentLinkOptions = new DocumentLinkOptions(false);
-        serverCapabilities.setDocumentLinkProvider(documentLinkOptions);
-        serverCapabilities.setDocumentSymbolProvider(true);
+        result.setDocumentLinkProvider(documentLinkOptions);
+        result.setDocumentSymbolProvider(true);
         var executeCommandOptions = new ExecuteCommandOptions(List.of("nextflow.server.previewDag"));
-        serverCapabilities.setExecuteCommandProvider(executeCommandOptions);
-        serverCapabilities.setHoverProvider(true);
-        serverCapabilities.setReferencesProvider(true);
+        result.setExecuteCommandProvider(executeCommandOptions);
+        result.setHoverProvider(true);
+        result.setReferencesProvider(true);
         var semanticTokensOptions = new SemanticTokensWithRegistrationOptions(
             new SemanticTokensLegend(
                 SemanticTokensVisitor.TOKEN_TYPES,
                 Collections.emptyList()
             ),
             true,
             false);
-        serverCapabilities.setSemanticTokensProvider(semanticTokensOptions);
-        serverCapabilities.setRenameProvider(true);
-        serverCapabilities.setWorkspaceSymbolProvider(true);
-
-        var initializeResult = new InitializeResult(serverCapabilities);
-        return CompletableFuture.completedFuture(initializeResult);
+        result.setSemanticTokensProvider(semanticTokensOptions);
+        result.setRenameProvider(true);
+        result.setWorkspaceSymbolProvider(true);
+        return result;
     }
 
     @Override
@@ -453,27 +456,8 @@ public void didChangeConfiguration(DidChangeConfigurationParams params) {
             withDefault(JsonUtils.getBoolean(settings, "nextflow.typeChecking"), configuration.typeChecking())
         );
 
-        if( shouldInitialize(oldConfiguration, configuration) ) {
-            var progress = new ProgressNotification(client, "initialize");
-            progress.create();
-            progress.begin("Initializing workspace...");
-
-            var count = 0;
-            var total = workspaceRoots.keySet().size() - 1;
-            for( var name : workspaceRoots.keySet() ) {
-                if( DEFAULT_WORKSPACE_FOLDER_NAME.equals(name) )
-                    continue;
-                var progressMessage = String.format("Initializing workspace: %s (%d / %d)", name, count + 1, total);
-                progress.update(progressMessage, count * 100 / total);
-                count++;
-
-                var uri = workspaceRoots.get(name);
-                scriptServices.get(name).initialize(uri, configuration);
-                configServices.get(name).initialize(uri, configuration);
-            }
-
-            progress.end();
-        }
+        if( shouldInitialize(oldConfiguration, configuration) )
+            initializeWorkspaces();
     }
 
     private ErrorReportingMode errorReportingMode(Object settings) {
@@ -493,6 +477,28 @@ private boolean shouldInitialize(LanguageServerConfiguration previous, LanguageS
             || previous.typeChecking() != current.typeChecking();
     }
 
+    private void initializeWorkspaces() {
+        var progress = new ProgressNotification(client, "initialize");
+        progress.create();
+        progress.begin("Initializing workspace...");
+
+        var count = 0;
+        var total = workspaceRoots.keySet().size() - 1;
+        for( var name : workspaceRoots.keySet() ) {
+            if( DEFAULT_WORKSPACE_FOLDER_NAME.equals(name) )
+                continue;
+            var progressMessage = String.format("Initializing workspace: %s (%d / %d)", name, count + 1, total);
+            progress.update(progressMessage, count * 100 / total);
+            count++;
+
+            var uri = workspaceRoots.get(name);
+            scriptServices.get(name).initialize(uri, configuration);
+            configServices.get(name).initialize(uri, configuration);
+        }
+
+        progress.end();
+    }
+
     @Override
     public void didChangeWatchedFiles(DidChangeWatchedFilesParams params) {
         log.debug("workspace/didChangeWatchedFiles " + params);