package moving

This commit is contained in:
2026-05-06 00:21:41 +01:00
parent ba88dee8cb
commit 7415b70d1b
35 changed files with 122 additions and 102 deletions
@@ -1,4 +1,4 @@
package p.studio.lsp.v1.compiler;
package p.studio.lsp.messages;
import java.util.List;
import java.util.Objects;
@@ -1,4 +1,4 @@
package p.studio.lsp.v1.compiler;
package p.studio.lsp.messages;
import java.util.Objects;
@@ -1,4 +1,4 @@
package p.studio.lsp.v1.compiler;
package p.studio.lsp.messages;
import java.util.Objects;
@@ -1,4 +1,4 @@
package p.studio.lsp.v1.compiler;
package p.studio.lsp.messages;
public enum BaselineIssueSeverity {
INFORMATION,
@@ -1,4 +1,4 @@
package p.studio.lsp.v1.compiler;
package p.studio.lsp.messages;
import java.util.Objects;
@@ -1,6 +1,9 @@
package p.studio.lsp.v1.compiler;
package p.studio.lsp.services;
import p.studio.lsp.api.LspProjectContext;
import p.studio.lsp.messages.BaselineDocumentAnalysis;
import p.studio.lsp.messages.BaselineHover;
import p.studio.lsp.messages.BaselineServerDescription;
import p.studio.lsp.messages.LspProjectContext;
public interface LanguageServiceBridge {
BaselineServerDescription describeServer(LspProjectContext project);
@@ -1,23 +1,22 @@
package p.studio.lsp.v1.bootstrap;
package p.studio.lsp.services;
import p.studio.lsp.api.LspProjectContext;
import p.studio.lsp.api.LspServerBootRequest;
import p.studio.lsp.api.LspServerHandle;
import p.studio.lsp.api.LspServerLifecycle;
import p.studio.lsp.v1.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.v1.host.ProjectScopedLspServerHost;
import p.studio.lsp.v1.host.ProjectScopedLspServerHostFactory;
import p.studio.lsp.messages.LspProjectContext;
import p.studio.lsp.messages.LspServerBootRequest;
import p.studio.lsp.messages.LspServerHandle;
import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.services.host.ProjectScopedLspServerHost;
import p.studio.lsp.services.host.ProjectScopedLspServerHostFactory;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
public final class LspV1ServerLifecycle implements LspServerLifecycle {
public final class LspServerLifecycle implements p.studio.lsp.api.LspServerLifecycle {
private final ProjectScopedLspServerHostFactory serverHostFactory;
private final CompilerLanguageServiceBridge compilerBridge;
private final ConcurrentMap<String, ProjectScopedLspServerHost> activeServers;
public LspV1ServerLifecycle(
public LspServerLifecycle(
final ProjectScopedLspServerHostFactory serverHostFactory,
final CompilerLanguageServiceBridge compilerBridge) {
this.serverHostFactory = Objects.requireNonNull(serverHostFactory, "serverHostFactory");
@@ -1,7 +1,8 @@
package p.studio.lsp.v1.compiler;
package p.studio.lsp.services.compiler;
import p.studio.compiler.workspaces.BuilderPipelineService;
import p.studio.lsp.api.LspProjectContext;
import p.studio.lsp.messages.*;
import p.studio.lsp.services.LanguageServiceBridge;
import java.util.Objects;
@@ -1,6 +1,6 @@
package p.studio.lsp.v1.host;
package p.studio.lsp.services.host;
import p.studio.lsp.api.LspServerEndpoint;
import p.studio.lsp.messages.LspServerEndpoint;
public interface ProjectScopedLspServerHost extends AutoCloseable {
LspServerEndpoint start();
@@ -1,7 +1,7 @@
package p.studio.lsp.v1.host;
package p.studio.lsp.services.host;
import p.studio.lsp.api.LspServerBootRequest;
import p.studio.lsp.v1.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.messages.LspServerBootRequest;
import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge;
public interface ProjectScopedLspServerHostFactory {
ProjectScopedLspServerHost create(
@@ -1,12 +1,12 @@
package p.studio.lsp.v1.host;
package p.studio.lsp.services.host;
import org.eclipse.lsp4j.jsonrpc.Launcher;
import org.eclipse.lsp4j.launch.LSPLauncher;
import org.eclipse.lsp4j.services.LanguageClient;
import p.studio.lsp.api.LspServerBootRequest;
import p.studio.lsp.api.LspServerEndpoint;
import p.studio.lsp.v1.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.v1.protocol.PrometeuLanguageServer;
import p.studio.lsp.messages.LspServerBootRequest;
import p.studio.lsp.messages.LspServerEndpoint;
import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.services.protocol.PrometeuLanguageServer;
import java.io.IOException;
import java.net.InetAddress;
@@ -1,7 +1,7 @@
package p.studio.lsp.v1.host;
package p.studio.lsp.services.host;
import p.studio.lsp.api.LspServerBootRequest;
import p.studio.lsp.v1.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.messages.LspServerBootRequest;
import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge;
public final class TcpLspServerHostFactory implements ProjectScopedLspServerHostFactory {
@Override
@@ -1,11 +1,11 @@
package p.studio.lsp.v1.protocol;
package p.studio.lsp.services.protocol;
import org.eclipse.lsp4j.InitializeParams;
import org.eclipse.lsp4j.WorkspaceFolder;
import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
import p.studio.lsp.api.LspProjectContext;
import p.studio.lsp.messages.LspProjectContext;
import java.net.URI;
import java.nio.file.Path;
@@ -1,4 +1,4 @@
package p.studio.lsp.v1.protocol;
package p.studio.lsp.services.protocol;
import org.eclipse.lsp4j.*;
import org.eclipse.lsp4j.services.LanguageClient;
@@ -6,11 +6,11 @@ import org.eclipse.lsp4j.services.LanguageClientAware;
import org.eclipse.lsp4j.services.LanguageServer;
import org.eclipse.lsp4j.services.TextDocumentService;
import org.eclipse.lsp4j.services.WorkspaceService;
import p.studio.lsp.api.LspProjectContext;
import p.studio.lsp.v1.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.v1.compiler.LanguageServiceBridge;
import p.studio.lsp.v1.protocol.mapping.Lsp4jProtocolMessageMapper;
import p.studio.lsp.v1.protocol.mapping.ProtocolMessageMapper;
import p.studio.lsp.messages.LspProjectContext;
import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge;
import p.studio.lsp.services.LanguageServiceBridge;
import p.studio.lsp.services.protocol.mapping.Lsp4jProtocolMessageMapper;
import p.studio.lsp.services.protocol.mapping.ProtocolMessageMapper;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
@@ -62,8 +62,11 @@ public final class PrometeuLanguageServer implements LanguageServer, LanguageCli
try {
ProjectConnectionValidator.validateProjectBinding(project, params);
} catch (RuntimeException runtimeException) {
client.logMessage(protocolMessageMapper.mapInfoMessage(
"Failed to initialize Prometeu Studio LSP for project " + project.projectKey() + ": " + runtimeException.getMessage()));
final LanguageClient currentClient = client;
if (currentClient != null) {
currentClient.logMessage(protocolMessageMapper.mapInfoMessage(
"Failed to initialize Prometeu Studio LSP for project " + project.projectKey() + ": " + runtimeException.getMessage()));
}
return CompletableFuture.failedFuture(runtimeException);
}
return CompletableFuture.completedFuture(protocolMessageMapper.mapInitializeResult(
@@ -1,11 +1,11 @@
package p.studio.lsp.v1.protocol;
package p.studio.lsp.services.protocol;
import org.eclipse.lsp4j.*;
import org.eclipse.lsp4j.services.LanguageClient;
import org.eclipse.lsp4j.services.TextDocumentService;
import p.studio.lsp.api.LspProjectContext;
import p.studio.lsp.v1.compiler.LanguageServiceBridge;
import p.studio.lsp.v1.protocol.mapping.ProtocolMessageMapper;
import p.studio.lsp.messages.LspProjectContext;
import p.studio.lsp.services.LanguageServiceBridge;
import p.studio.lsp.services.protocol.mapping.ProtocolMessageMapper;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
@@ -1,4 +1,4 @@
package p.studio.lsp.v1.protocol;
package p.studio.lsp.services.protocol;
import org.eclipse.lsp4j.DidChangeConfigurationParams;
import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
@@ -1,7 +1,7 @@
package p.studio.lsp.v1.protocol.mapping;
package p.studio.lsp.services.protocol.mapping;
import org.eclipse.lsp4j.*;
import p.studio.lsp.v1.compiler.*;
import p.studio.lsp.messages.*;
import java.util.List;
@@ -1,12 +1,12 @@
package p.studio.lsp.v1.protocol.mapping;
package p.studio.lsp.services.protocol.mapping;
import org.eclipse.lsp4j.Hover;
import org.eclipse.lsp4j.InitializeResult;
import org.eclipse.lsp4j.MessageParams;
import org.eclipse.lsp4j.PublishDiagnosticsParams;
import p.studio.lsp.v1.compiler.BaselineDocumentAnalysis;
import p.studio.lsp.v1.compiler.BaselineHover;
import p.studio.lsp.v1.compiler.BaselineServerDescription;
import p.studio.lsp.messages.BaselineDocumentAnalysis;
import p.studio.lsp.messages.BaselineHover;
import p.studio.lsp.messages.BaselineServerDescription;
public interface ProtocolMessageMapper {
InitializeResult mapInitializeResult(BaselineServerDescription description);