Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/main/java/net/prominic/groovyls/GroovyLanguageServer.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// Copyright 2022 Prominic.NET, Inc.
// Copyright 2026 trustytrojan
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -14,6 +15,7 @@
// limitations under the License
//
// Author: Prominic.NET, Inc.
// Author: trustytrojan
// No warranty of merchantability or fitness of any kind.
// Use this software at your own risk.
////////////////////////////////////////////////////////////////////////////////
Expand All @@ -26,11 +28,14 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.CompletableFuture;

import org.eclipse.lsp4j.CompletionOptions;
import org.eclipse.lsp4j.InitializeParams;
import org.eclipse.lsp4j.InitializeResult;
import org.eclipse.lsp4j.SemanticTokensLegend;
import org.eclipse.lsp4j.SemanticTokensWithRegistrationOptions;
import org.eclipse.lsp4j.ServerCapabilities;
import org.eclipse.lsp4j.SignatureHelpOptions;
import org.eclipse.lsp4j.TextDocumentSyncKind;
Expand All @@ -43,6 +48,7 @@

import net.prominic.groovyls.config.CompilationUnitFactory;
import net.prominic.groovyls.config.ICompilationUnitFactory;
import net.prominic.groovyls.providers.SemanticTokensProvider;

public class GroovyLanguageServer implements LanguageServer, LanguageClientAware {

Expand Down Expand Up @@ -93,6 +99,14 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
signatureHelpOptions.setTriggerCharacters(Arrays.asList("(", ","));
serverCapabilities.setSignatureHelpProvider(signatureHelpOptions);

// Register semantic tokens provider for full document tokenization
SemanticTokensWithRegistrationOptions semanticTokensOptions = new SemanticTokensWithRegistrationOptions();
semanticTokensOptions.setLegend(new SemanticTokensLegend(
SemanticTokensProvider.TOKEN_TYPES,
Collections.emptyList()));
semanticTokensOptions.setFull(true);
Comment on lines +103 to +107
serverCapabilities.setSemanticTokensProvider(semanticTokensOptions);

InitializeResult initializeResult = new InitializeResult(serverCapabilities);
return CompletableFuture.completedFuture(initializeResult);
}
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/net/prominic/groovyls/GroovyServices.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
////////////////////////////////////////////////////////////////////////////////
// Copyright 2022 Prominic.NET, Inc.
// Copyright 2026 trustytrojan
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -14,6 +15,7 @@
// limitations under the License
//
// Author: Prominic.NET, Inc.
// Author: trustytrojan
// No warranty of merchantability or fitness of any kind.
// Use this software at your own risk.
////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -71,6 +73,8 @@
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.ReferenceParams;
import org.eclipse.lsp4j.RenameParams;
import org.eclipse.lsp4j.SemanticTokens;
import org.eclipse.lsp4j.SemanticTokensParams;
import org.eclipse.lsp4j.SignatureHelp;
import org.eclipse.lsp4j.SignatureHelpParams;
import org.eclipse.lsp4j.SymbolInformation;
Expand Down Expand Up @@ -102,6 +106,7 @@
import net.prominic.groovyls.providers.SignatureHelpProvider;
import net.prominic.groovyls.providers.TypeDefinitionProvider;
import net.prominic.groovyls.providers.WorkspaceSymbolProvider;
import net.prominic.groovyls.providers.SemanticTokensProvider;
import net.prominic.groovyls.util.FileContentsTracker;
import net.prominic.groovyls.util.GroovyLanguageServerUtils;
import net.prominic.lsp.utils.Positions;
Expand All @@ -120,6 +125,7 @@ public class GroovyServices implements TextDocumentService, WorkspaceService, La
private ScanResult classGraphScanResult = null;
private GroovyClassLoader classLoader = null;
private URI previousContext = null;
private SemanticTokensProvider semanticTokensProvider = null;

public GroovyServices(ICompilationUnitFactory factory) {
compilationUnitFactory = factory;
Expand Down Expand Up @@ -358,6 +364,21 @@ public CompletableFuture<List<Either<SymbolInformation, DocumentSymbol>>> docume
return provider.provideDocumentSymbols(params.getTextDocument());
}

@Override
public CompletableFuture<SemanticTokens> semanticTokensFull(SemanticTokensParams params) {
TextDocumentIdentifier textDocument = params.getTextDocument();
URI uri = URI.create(textDocument.getUri());
recompileIfContextChanged(uri);

// Ensure semantic tokens provider is initialized
if (semanticTokensProvider == null) {
semanticTokensProvider = new SemanticTokensProvider(fileContentsTracker, astVisitor);
}

// Provide semantic tokens - GDSL symbols are injected before LSP transmission
return CompletableFuture.completedFuture(semanticTokensProvider.provideFull(textDocument));
Comment on lines +373 to +379
}

@Override
public CompletableFuture<List<? extends SymbolInformation>> symbol(WorkspaceSymbolParams params) {
WorkspaceSymbolProvider provider = new WorkspaceSymbolProvider(astVisitor);
Expand Down
Loading