From 7415b70d1ba3d6a2e40cbb149359f8a4fda5ce85 Mon Sep 17 00:00:00 2001 From: bQUARKz Date: Wed, 6 May 2026 00:21:41 +0100 Subject: [PATCH] package moving --- .../src/main/java/p/studio/AppContainer.java | 13 ++++++------ .../p/studio/lsp/api/LspServerLifecycle.java | 4 ++++ .../{api => messages}/LspProjectContext.java | 2 +- .../LspServerBootRequest.java | 2 +- .../LspServerConfiguration.java | 2 +- .../{api => messages}/LspServerEndpoint.java | 2 +- .../{api => messages}/LspServerHandle.java | 2 +- .../lsp/api/LspServerBootRequestTest.java | 3 +++ .../BaselineDocumentAnalysis.java | 2 +- .../BaselineDocumentIssue.java | 2 +- .../compiler => messages}/BaselineHover.java | 2 +- .../BaselineIssueSeverity.java | 2 +- .../BaselineServerDescription.java | 2 +- .../LanguageServiceBridge.java | 7 +++++-- .../LspServerLifecycle.java} | 19 +++++++++--------- .../CompilerLanguageServiceBridge.java | 5 +++-- .../host/ProjectScopedLspServerHost.java | 4 ++-- .../ProjectScopedLspServerHostFactory.java | 6 +++--- .../host/TcpLspServerHost.java | 10 +++++----- .../host/TcpLspServerHostFactory.java | 6 +++--- .../protocol/ProjectConnectionValidator.java | 4 ++-- .../protocol/PrometeuLanguageServer.java | 19 ++++++++++-------- .../protocol/PrometeuTextDocumentService.java | 8 ++++---- .../protocol/PrometeuWorkspaceService.java | 2 +- .../mapping/Lsp4jProtocolMessageMapper.java | 4 ++-- .../mapping/ProtocolMessageMapper.java | 8 ++++---- .../LspServerLifecycleTest.java} | 20 +++++++++---------- .../boundary/LspV1BoundaryTest.java | 6 +++--- .../CompilerLanguageServiceBridgeTest.java | 7 +++++-- .../protocol/PrometeuLanguageServerTest.java | 12 ++++++----- .../PrometeuTextDocumentServiceTest.java | 8 ++++---- .../projectsessions/StudioProjectSession.java | 4 ++-- .../StudioProjectSessionFactory.java | 6 +++--- .../StudioProjectSessionFactoryTest.java | 9 +++++---- .../StudioProjectSessionTest.java | 10 ++++++---- 35 files changed, 122 insertions(+), 102 deletions(-) rename prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/{api => messages}/LspProjectContext.java (96%) rename prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/{api => messages}/LspServerBootRequest.java (94%) rename prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/{api => messages}/LspServerConfiguration.java (96%) rename prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/{api => messages}/LspServerEndpoint.java (94%) rename prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/{api => messages}/LspServerHandle.java (90%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1/compiler => messages}/BaselineDocumentAnalysis.java (88%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1/compiler => messages}/BaselineDocumentIssue.java (95%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1/compiler => messages}/BaselineHover.java (91%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1/compiler => messages}/BaselineIssueSeverity.java (69%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1/compiler => messages}/BaselineServerDescription.java (94%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1/compiler => services}/LanguageServiceBridge.java (62%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1/bootstrap/LspV1ServerLifecycle.java => services/LspServerLifecycle.java} (82%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/compiler/CompilerLanguageServiceBridge.java (95%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/host/ProjectScopedLspServerHost.java (64%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/host/ProjectScopedLspServerHostFactory.java (55%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/host/TcpLspServerHost.java (93%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/host/TcpLspServerHostFactory.java (68%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/protocol/ProjectConnectionValidator.java (97%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/protocol/PrometeuLanguageServer.java (85%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/protocol/PrometeuTextDocumentService.java (93%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/protocol/PrometeuWorkspaceService.java (91%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/protocol/mapping/Lsp4jProtocolMessageMapper.java (97%) rename prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/{v1 => services}/protocol/mapping/ProtocolMessageMapper.java (74%) rename prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/{v1/bootstrap/LspV1ServerLifecycleTest.java => services/LspServerLifecycleTest.java} (73%) rename prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/{v1 => services}/boundary/LspV1BoundaryTest.java (86%) rename prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/{v1 => services}/compiler/CompilerLanguageServiceBridgeTest.java (82%) rename prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/{v1 => services}/protocol/PrometeuLanguageServerTest.java (94%) rename prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/{v1 => services}/protocol/PrometeuTextDocumentServiceTest.java (96%) diff --git a/prometeu-app/src/main/java/p/studio/AppContainer.java b/prometeu-app/src/main/java/p/studio/AppContainer.java index 8bcaeb8f..6f84a69d 100644 --- a/prometeu-app/src/main/java/p/studio/AppContainer.java +++ b/prometeu-app/src/main/java/p/studio/AppContainer.java @@ -2,12 +2,11 @@ package p.studio; import com.fasterxml.jackson.databind.ObjectMapper; import p.packer.Packer; -import p.studio.lsp.api.LspServerLifecycle; import p.studio.lsp.events.StudioEventBus; import p.studio.lsp.events.StudioPackerEventAdapter; -import p.studio.lsp.v1.bootstrap.LspV1ServerLifecycle; -import p.studio.lsp.v1.compiler.CompilerLanguageServiceBridge; -import p.studio.lsp.v1.host.TcpLspServerHostFactory; +import p.studio.lsp.services.LspServerLifecycle; +import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge; +import p.studio.lsp.services.host.TcpLspServerHostFactory; import p.studio.utilities.ThemeService; import p.studio.utilities.i18n.I18nService; @@ -23,7 +22,7 @@ public final class AppContainer implements Container { private final ObjectMapper mapper; private final EmbeddedPacker embeddedPacker; private final StudioBackgroundTasks backgroundTasks; - private final LspServerLifecycle lspServerLifecycle; + private final p.studio.lsp.api.LspServerLifecycle lspServerLifecycle; public AppContainer() { this.i18nService = new I18nService(); @@ -34,7 +33,7 @@ public final class AppContainer implements Container { this.backgroundTasks = new StudioBackgroundTasks(backgroundExecutor); final Packer packer = Packer.bootstrap(this.mapper, new StudioPackerEventAdapter(studioEventBus)); this.embeddedPacker = new EmbeddedPacker(packer.workspaceService(), packer::close); - this.lspServerLifecycle = new LspV1ServerLifecycle( + this.lspServerLifecycle = new LspServerLifecycle( new TcpLspServerHostFactory(), new CompilerLanguageServiceBridge()); } @@ -70,7 +69,7 @@ public final class AppContainer implements Container { } @Override - public LspServerLifecycle getLspServerLifecycle() { + public p.studio.lsp.api.LspServerLifecycle getLspServerLifecycle() { return lspServerLifecycle; } diff --git a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerLifecycle.java b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerLifecycle.java index 24863daa..749733de 100644 --- a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerLifecycle.java +++ b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerLifecycle.java @@ -1,5 +1,9 @@ package p.studio.lsp.api; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.messages.LspServerBootRequest; +import p.studio.lsp.messages.LspServerHandle; + public interface LspServerLifecycle { LspServerHandle bootServer(LspServerBootRequest request); diff --git a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspProjectContext.java b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspProjectContext.java similarity index 96% rename from prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspProjectContext.java rename to prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspProjectContext.java index 02b9f8da..aa9dfcb9 100644 --- a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspProjectContext.java +++ b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspProjectContext.java @@ -1,4 +1,4 @@ -package p.studio.lsp.api; +package p.studio.lsp.messages; import java.nio.file.Path; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerBootRequest.java b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerBootRequest.java similarity index 94% rename from prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerBootRequest.java rename to prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerBootRequest.java index 2406a24f..ba3e057d 100644 --- a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerBootRequest.java +++ b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerBootRequest.java @@ -1,4 +1,4 @@ -package p.studio.lsp.api; +package p.studio.lsp.messages; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerConfiguration.java b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerConfiguration.java similarity index 96% rename from prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerConfiguration.java rename to prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerConfiguration.java index f5f8644a..1307584f 100644 --- a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerConfiguration.java +++ b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerConfiguration.java @@ -1,4 +1,4 @@ -package p.studio.lsp.api; +package p.studio.lsp.messages; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerEndpoint.java b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerEndpoint.java similarity index 94% rename from prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerEndpoint.java rename to prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerEndpoint.java index db255c1f..d8bdebed 100644 --- a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerEndpoint.java +++ b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerEndpoint.java @@ -1,4 +1,4 @@ -package p.studio.lsp.api; +package p.studio.lsp.messages; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerHandle.java b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerHandle.java similarity index 90% rename from prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerHandle.java rename to prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerHandle.java index 9c90d38f..b894435c 100644 --- a/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/api/LspServerHandle.java +++ b/prometeu-lsp/prometeu-lsp-api/src/main/java/p/studio/lsp/messages/LspServerHandle.java @@ -1,4 +1,4 @@ -package p.studio.lsp.api; +package p.studio.lsp.messages; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-api/src/test/java/p/studio/lsp/api/LspServerBootRequestTest.java b/prometeu-lsp/prometeu-lsp-api/src/test/java/p/studio/lsp/api/LspServerBootRequestTest.java index bd895b74..cc8c1e3a 100644 --- a/prometeu-lsp/prometeu-lsp-api/src/test/java/p/studio/lsp/api/LspServerBootRequestTest.java +++ b/prometeu-lsp/prometeu-lsp-api/src/test/java/p/studio/lsp/api/LspServerBootRequestTest.java @@ -1,6 +1,9 @@ package p.studio.lsp.api; import org.junit.jupiter.api.Test; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.messages.LspServerBootRequest; +import p.studio.lsp.messages.LspServerConfiguration; import java.nio.file.Path; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineDocumentAnalysis.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineDocumentAnalysis.java similarity index 88% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineDocumentAnalysis.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineDocumentAnalysis.java index edb457fe..1c43c4eb 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineDocumentAnalysis.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineDocumentAnalysis.java @@ -1,4 +1,4 @@ -package p.studio.lsp.v1.compiler; +package p.studio.lsp.messages; import java.util.List; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineDocumentIssue.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineDocumentIssue.java similarity index 95% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineDocumentIssue.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineDocumentIssue.java index 6b19dc8d..7ee61cb9 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineDocumentIssue.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineDocumentIssue.java @@ -1,4 +1,4 @@ -package p.studio.lsp.v1.compiler; +package p.studio.lsp.messages; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineHover.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineHover.java similarity index 91% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineHover.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineHover.java index 46efc4d2..5b795586 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineHover.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineHover.java @@ -1,4 +1,4 @@ -package p.studio.lsp.v1.compiler; +package p.studio.lsp.messages; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineIssueSeverity.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineIssueSeverity.java similarity index 69% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineIssueSeverity.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineIssueSeverity.java index f6f7caa8..2624a846 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineIssueSeverity.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineIssueSeverity.java @@ -1,4 +1,4 @@ -package p.studio.lsp.v1.compiler; +package p.studio.lsp.messages; public enum BaselineIssueSeverity { INFORMATION, diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineServerDescription.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineServerDescription.java similarity index 94% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineServerDescription.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineServerDescription.java index dab48834..2fc747a9 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/BaselineServerDescription.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/messages/BaselineServerDescription.java @@ -1,4 +1,4 @@ -package p.studio.lsp.v1.compiler; +package p.studio.lsp.messages; import java.util.Objects; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/LanguageServiceBridge.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LanguageServiceBridge.java similarity index 62% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/LanguageServiceBridge.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LanguageServiceBridge.java index 689d6fd2..38cef196 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/LanguageServiceBridge.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LanguageServiceBridge.java @@ -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); diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/bootstrap/LspV1ServerLifecycle.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycle.java similarity index 82% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/bootstrap/LspV1ServerLifecycle.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycle.java index 40c6e258..bab34c5c 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/bootstrap/LspV1ServerLifecycle.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/LspServerLifecycle.java @@ -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 activeServers; - public LspV1ServerLifecycle( + public LspServerLifecycle( final ProjectScopedLspServerHostFactory serverHostFactory, final CompilerLanguageServiceBridge compilerBridge) { this.serverHostFactory = Objects.requireNonNull(serverHostFactory, "serverHostFactory"); diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/CompilerLanguageServiceBridge.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java similarity index 95% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/CompilerLanguageServiceBridge.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java index 8021ec50..375f5c29 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/compiler/CompilerLanguageServiceBridge.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridge.java @@ -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; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/ProjectScopedLspServerHost.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/ProjectScopedLspServerHost.java similarity index 64% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/ProjectScopedLspServerHost.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/ProjectScopedLspServerHost.java index b3a847a5..a5263266 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/ProjectScopedLspServerHost.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/ProjectScopedLspServerHost.java @@ -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(); diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/ProjectScopedLspServerHostFactory.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/ProjectScopedLspServerHostFactory.java similarity index 55% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/ProjectScopedLspServerHostFactory.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/ProjectScopedLspServerHostFactory.java index 8b46b58a..130c764e 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/ProjectScopedLspServerHostFactory.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/ProjectScopedLspServerHostFactory.java @@ -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( diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/TcpLspServerHost.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/TcpLspServerHost.java similarity index 93% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/TcpLspServerHost.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/TcpLspServerHost.java index 5d14c2c6..f01a4388 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/TcpLspServerHost.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/TcpLspServerHost.java @@ -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; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/TcpLspServerHostFactory.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/TcpLspServerHostFactory.java similarity index 68% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/TcpLspServerHostFactory.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/TcpLspServerHostFactory.java index d8713f5a..465d5f7e 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/host/TcpLspServerHostFactory.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/host/TcpLspServerHostFactory.java @@ -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 diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/ProjectConnectionValidator.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/ProjectConnectionValidator.java similarity index 97% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/ProjectConnectionValidator.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/ProjectConnectionValidator.java index 2dbf3a64..9abb9c8a 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/ProjectConnectionValidator.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/ProjectConnectionValidator.java @@ -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; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuLanguageServer.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuLanguageServer.java similarity index 85% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuLanguageServer.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuLanguageServer.java index 2a467e08..aa394d19 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuLanguageServer.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuLanguageServer.java @@ -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( diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuTextDocumentService.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuTextDocumentService.java similarity index 93% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuTextDocumentService.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuTextDocumentService.java index c81edb55..903bab5f 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuTextDocumentService.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuTextDocumentService.java @@ -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; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuWorkspaceService.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuWorkspaceService.java similarity index 91% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuWorkspaceService.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuWorkspaceService.java index 1a5efa8e..612f9dd7 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/PrometeuWorkspaceService.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/PrometeuWorkspaceService.java @@ -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; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/mapping/Lsp4jProtocolMessageMapper.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/mapping/Lsp4jProtocolMessageMapper.java similarity index 97% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/mapping/Lsp4jProtocolMessageMapper.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/mapping/Lsp4jProtocolMessageMapper.java index 8b9cf2bd..c6272e51 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/mapping/Lsp4jProtocolMessageMapper.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/mapping/Lsp4jProtocolMessageMapper.java @@ -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; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/mapping/ProtocolMessageMapper.java b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/mapping/ProtocolMessageMapper.java similarity index 74% rename from prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/mapping/ProtocolMessageMapper.java rename to prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/mapping/ProtocolMessageMapper.java index 83d09bd1..d934411e 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/v1/protocol/mapping/ProtocolMessageMapper.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/main/java/p/studio/lsp/services/protocol/mapping/ProtocolMessageMapper.java @@ -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); diff --git a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/bootstrap/LspV1ServerLifecycleTest.java b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleTest.java similarity index 73% rename from prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/bootstrap/LspV1ServerLifecycleTest.java rename to prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleTest.java index 38aa03b1..0d576e87 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/bootstrap/LspV1ServerLifecycleTest.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/LspServerLifecycleTest.java @@ -1,12 +1,12 @@ -package p.studio.lsp.v1.bootstrap; +package p.studio.lsp.services; import org.junit.jupiter.api.Test; -import p.studio.lsp.api.LspProjectContext; -import p.studio.lsp.api.LspServerBootRequest; -import p.studio.lsp.api.LspServerEndpoint; -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.LspServerEndpoint; +import p.studio.lsp.services.compiler.CompilerLanguageServiceBridge; +import p.studio.lsp.services.host.ProjectScopedLspServerHost; +import p.studio.lsp.services.host.ProjectScopedLspServerHostFactory; import java.nio.file.Path; @@ -14,13 +14,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -class LspV1ServerLifecycleTest { +class LspServerLifecycleTest { @Test void lifecycleBootsAndShutsDownProjectScopedHost() { final FakeHost host = new FakeHost(); final ProjectScopedLspServerHostFactory factory = (request, compilerBridge) -> host; - final var lifecycle = new LspV1ServerLifecycle(factory, new CompilerLanguageServiceBridge()); + final var lifecycle = new LspServerLifecycle(factory, new CompilerLanguageServiceBridge()); final var project = new LspProjectContext("demo", "pbs", Path.of(".")); final var handle = lifecycle.bootServer(LspServerBootRequest.defaults(project)); @@ -37,7 +37,7 @@ class LspV1ServerLifecycleTest { @Test void lifecycleRejectsDoubleBootForSameProject() { final ProjectScopedLspServerHostFactory factory = (request, compilerBridge) -> new FakeHost(); - final var lifecycle = new LspV1ServerLifecycle(factory, new CompilerLanguageServiceBridge()); + final var lifecycle = new LspServerLifecycle(factory, new CompilerLanguageServiceBridge()); final var request = LspServerBootRequest.defaults(new LspProjectContext("demo", "pbs", Path.of("."))); lifecycle.bootServer(request); diff --git a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/boundary/LspV1BoundaryTest.java b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/boundary/LspV1BoundaryTest.java similarity index 86% rename from prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/boundary/LspV1BoundaryTest.java rename to prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/boundary/LspV1BoundaryTest.java index dc380fd7..2b09e71d 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/boundary/LspV1BoundaryTest.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/boundary/LspV1BoundaryTest.java @@ -1,4 +1,4 @@ -package p.studio.lsp.v1.boundary; +package p.studio.lsp.services.boundary; import org.junit.jupiter.api.Test; @@ -7,6 +7,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; class LspV1BoundaryTest { @@ -39,8 +40,7 @@ class LspV1BoundaryTest { for (final Path javaFile : javaFiles) { final String source = Files.readString(javaFile); - assertTrue(!source.contains("org.eclipse.lsp4j"), - () -> "LSP4J leaked outside lsp-v1: " + javaFile); + assertFalse(source.contains("org.eclipse.lsp4j"), () -> "LSP4J leaked outside lsp-v1: " + javaFile); } } } diff --git a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/compiler/CompilerLanguageServiceBridgeTest.java b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridgeTest.java similarity index 82% rename from prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/compiler/CompilerLanguageServiceBridgeTest.java rename to prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridgeTest.java index 1db5da43..56c0735d 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/compiler/CompilerLanguageServiceBridgeTest.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/compiler/CompilerLanguageServiceBridgeTest.java @@ -1,7 +1,10 @@ -package p.studio.lsp.v1.compiler; +package p.studio.lsp.services.compiler; import org.junit.jupiter.api.Test; -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; import java.nio.file.Path; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/protocol/PrometeuLanguageServerTest.java b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/protocol/PrometeuLanguageServerTest.java similarity index 94% rename from prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/protocol/PrometeuLanguageServerTest.java rename to prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/protocol/PrometeuLanguageServerTest.java index 9c64cdba..66db3f0a 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/protocol/PrometeuLanguageServerTest.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/protocol/PrometeuLanguageServerTest.java @@ -1,4 +1,4 @@ -package p.studio.lsp.v1.protocol; +package p.studio.lsp.services.protocol; import org.eclipse.lsp4j.InitializeParams; import org.eclipse.lsp4j.InitializeResult; @@ -6,11 +6,13 @@ import org.eclipse.lsp4j.WorkspaceFolder; import org.eclipse.lsp4j.jsonrpc.ResponseErrorException; import org.eclipse.lsp4j.PublishDiagnosticsParams; import org.eclipse.lsp4j.services.TextDocumentService; -import org.eclipse.lsp4j.services.WorkspaceService; import org.junit.jupiter.api.Test; -import p.studio.lsp.api.LspProjectContext; -import p.studio.lsp.v1.compiler.*; -import p.studio.lsp.v1.protocol.mapping.ProtocolMessageMapper; +import p.studio.lsp.messages.BaselineDocumentAnalysis; +import p.studio.lsp.messages.BaselineHover; +import p.studio.lsp.messages.BaselineServerDescription; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.services.LanguageServiceBridge; +import p.studio.lsp.services.protocol.mapping.ProtocolMessageMapper; import java.nio.file.Path; import java.util.List; diff --git a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/protocol/PrometeuTextDocumentServiceTest.java b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/protocol/PrometeuTextDocumentServiceTest.java similarity index 96% rename from prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/protocol/PrometeuTextDocumentServiceTest.java rename to prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/protocol/PrometeuTextDocumentServiceTest.java index a1e05504..3deccbd5 100644 --- a/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/v1/protocol/PrometeuTextDocumentServiceTest.java +++ b/prometeu-lsp/prometeu-lsp-v1/src/test/java/p/studio/lsp/services/protocol/PrometeuTextDocumentServiceTest.java @@ -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.junit.jupiter.api.Test; -import p.studio.lsp.api.LspProjectContext; -import p.studio.lsp.v1.compiler.*; -import p.studio.lsp.v1.protocol.mapping.ProtocolMessageMapper; +import p.studio.lsp.messages.*; +import p.studio.lsp.services.LanguageServiceBridge; +import p.studio.lsp.services.protocol.mapping.ProtocolMessageMapper; import java.nio.file.Path; import java.util.List; diff --git a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSession.java b/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSession.java index 3e2b08b5..037e06ef 100644 --- a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSession.java +++ b/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSession.java @@ -1,8 +1,8 @@ package p.studio.projectsessions; import p.studio.execution.StudioExecutionSessionService; -import p.studio.lsp.api.LspProjectContext; -import p.studio.lsp.api.LspServerHandle; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.messages.LspServerHandle; import p.studio.lsp.api.LspServerLifecycle; import p.studio.projectstate.ProjectLocalStudioSetup; import p.studio.projectstate.ProjectLocalStudioState; diff --git a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSessionFactory.java b/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSessionFactory.java index 5258a7d3..dcebf551 100644 --- a/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSessionFactory.java +++ b/prometeu-studio/src/main/java/p/studio/projectsessions/StudioProjectSessionFactory.java @@ -1,8 +1,8 @@ package p.studio.projectsessions; -import p.studio.lsp.api.LspProjectContext; -import p.studio.lsp.api.LspServerBootRequest; -import p.studio.lsp.api.LspServerHandle; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.messages.LspServerBootRequest; +import p.studio.lsp.messages.LspServerHandle; import p.studio.lsp.api.LspServerLifecycle; import p.studio.execution.StudioExecutionSessionService; import p.studio.projectstate.ProjectLocalStudioSetupService; diff --git a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionFactoryTest.java b/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionFactoryTest.java index 6b2aa5fc..64cee709 100644 --- a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionFactoryTest.java +++ b/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionFactoryTest.java @@ -1,10 +1,11 @@ package p.studio.projectsessions; import org.junit.jupiter.api.Test; -import p.studio.lsp.api.LspProjectContext; -import p.studio.lsp.api.LspServerBootRequest; -import p.studio.lsp.api.LspServerHandle; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.messages.LspServerBootRequest; +import p.studio.lsp.messages.LspServerHandle; import p.studio.lsp.api.LspServerLifecycle; +import p.studio.lsp.messages.LspServerEndpoint; import p.studio.projectstate.ProjectLocalStudioSetup; import p.studio.projectstate.ProjectLocalStudioSetupService; import p.studio.projectstate.ProjectLocalStudioState; @@ -105,7 +106,7 @@ final class StudioProjectSessionFactoryTest { lastRequest = request; return new LspServerHandle( request.project(), - new p.studio.lsp.api.LspServerEndpoint("127.0.0.1", request.configuration().port())); + new LspServerEndpoint("127.0.0.1", request.configuration().port())); } @Override diff --git a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionTest.java b/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionTest.java index f9a8eb8b..39753c34 100644 --- a/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionTest.java +++ b/prometeu-studio/src/test/java/p/studio/projectsessions/StudioProjectSessionTest.java @@ -2,9 +2,11 @@ package p.studio.projectsessions; import org.junit.jupiter.api.Test; import p.studio.execution.StudioExecutionSessionService; -import p.studio.lsp.api.LspProjectContext; -import p.studio.lsp.api.LspServerHandle; +import p.studio.lsp.messages.LspProjectContext; +import p.studio.lsp.messages.LspServerHandle; import p.studio.lsp.api.LspServerLifecycle; +import p.studio.lsp.messages.LspServerBootRequest; +import p.studio.lsp.messages.LspServerEndpoint; import p.studio.projectstate.ProjectLocalStudioSetup; import p.studio.projectstate.ProjectLocalStudioState; import p.studio.projectstate.ProjectLocalStudioStateService; @@ -61,7 +63,7 @@ final class StudioProjectSessionTest { final RecordingLspServerLifecycle lspServerLifecycle = new RecordingLspServerLifecycle(); final LspServerHandle lspServerHandle = new LspServerHandle( new LspProjectContext("demo", "pbs", Path.of("/tmp/example")), - new p.studio.lsp.api.LspServerEndpoint("127.0.0.1", 7777)); + new LspServerEndpoint("127.0.0.1", 7777)); final StudioProjectSession session = new StudioProjectSession( projectReference(), stateService, @@ -100,7 +102,7 @@ final class StudioProjectSessionTest { private LspProjectContext lastProject; @Override - public LspServerHandle bootServer(final p.studio.lsp.api.LspServerBootRequest request) { + public LspServerHandle bootServer(final LspServerBootRequest request) { throw new UnsupportedOperationException(); }