Skip to content

Structure view #1541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 22, 2025
Merged

Structure view #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
260e9c9
WIP
BoykoAlex Apr 9, 2025
8ccaa5f
`SpringIndexElement` serialization. Initial Structure view in VSCode
BoykoAlex Apr 15, 2025
fe0c738
Corrections
BoykoAlex Apr 15, 2025
c56fc65
Serialization polishing
BoykoAlex Apr 16, 2025
6cc3086
Don't include java.lang.Object in supertypes serialization
BoykoAlex Apr 17, 2025
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
15 changes: 11 additions & 4 deletions ...main/java/org/springframework/ide/vscode/commons/languageserver/LanguageServerRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.function.Consumer;
import java.util.function.Function;

import org.eclipse.lsp4j.jsonrpc.Launcher;
Expand All @@ -38,6 +39,8 @@
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
import org.springframework.ide.vscode.commons.protocol.STS4LanguageClient;

import com.google.gson.GsonBuilder;

/**
* A CommandLineRunner that launches a language server. This meant to be used as a Spring bean
* in a SpringBoot app.
Expand Down Expand Up @@ -98,11 +101,14 @@ public void run(String... args) throws Exception {

private Function<MessageConsumer, MessageConsumer> messageConsumer;

public LanguageServerRunner(LanguageServerProperties properties, SimpleLanguageServer languageServer, Function<MessageConsumer, MessageConsumer> messageConsumer) {
private Consumer<GsonBuilder> configureGson;

public LanguageServerRunner(LanguageServerProperties properties, SimpleLanguageServer languageServer, Function<MessageConsumer, MessageConsumer> messageConsumer, Consumer<GsonBuilder> configureGson) {
super();
this.properties = properties;
this.languageServer = languageServer;
this.messageConsumer = messageConsumer;
this.configureGson = configureGson;
}

public void start() throws Exception {
Expand Down Expand Up @@ -207,7 +213,7 @@ private <T> Launcher<T> createSocketLauncher(
AsynchronousSocketChannel socketChannel = serverSocket.accept().get();
log.info("Client connected via socket");
return Launcher.createIoLauncher(localService, remoteInterface, Channels.newInputStream(socketChannel),
Channels.newOutputStream(socketChannel), executorService, wrapper);
Channels.newOutputStream(socketChannel), executorService, wrapper, configureGson);
}

private static Connection connectToNode() throws IOException {
Expand Down Expand Up @@ -235,12 +241,13 @@ private static Connection connectToNode() throws IOException {
private Future<Void> runAsync(Connection connection) throws Exception {
LanguageServer server = this.languageServer;
ExecutorService executor = createServerThreads();
Launcher<STS4LanguageClient> launcher = Launcher.createLauncher(server,
Launcher<STS4LanguageClient> launcher = Launcher.createIoLauncher(server,
STS4LanguageClient.class,
connection.in,
connection.out,
executor,
messageConsumer
messageConsumer,
configureGson
);

if (server instanceof LanguageClientAware) {
Expand Down
Loading