clean up and simplify

This commit is contained in:
2026-05-06 02:58:18 +01:00
parent 14d4751f9a
commit 41f2c804a0
26 changed files with 497 additions and 1141 deletions
@@ -2,6 +2,7 @@ package p.studio.projects;
import org.apache.commons.lang3.StringUtils;
import p.packer.messages.PackerProjectContext;
import p.studio.lsp.messages.LspProjectContext;
import java.nio.file.Path;
@@ -35,4 +36,11 @@ public record ProjectReference(
public PackerProjectContext toPackerProjectContext() {
return new PackerProjectContext(name, absoluteRootPath());
}
public LspProjectContext toLspProjectContext() {
return new LspProjectContext(
rootPath().toAbsolutePath().normalize().toString(),
languageId(),
rootPath());
}
}
@@ -1,13 +1,11 @@
package p.studio.projectsessions;
import p.studio.execution.StudioExecutionSessionService;
import p.studio.lsp.messages.LspProjectContext;
import p.studio.lsp.messages.LspServerHandle;
import p.studio.lsp.api.LspServerLifecycle;
import p.studio.projects.ProjectReference;
import p.studio.projectstate.ProjectLocalStudioSetup;
import p.studio.projectstate.ProjectLocalStudioState;
import p.studio.projectstate.ProjectLocalStudioStateService;
import p.studio.projects.ProjectReference;
import java.util.Objects;
@@ -17,7 +15,6 @@ public final class StudioProjectSession implements AutoCloseable {
private final ProjectLocalStudioSetup projectLocalStudioSetup;
private final StudioExecutionSessionService executionSessionService;
private final LspServerLifecycle lspServerLifecycle;
private final LspServerHandle lspServerHandle;
private ProjectLocalStudioState projectLocalStudioState;
private boolean closed;
@@ -29,7 +26,6 @@ public final class StudioProjectSession implements AutoCloseable {
ProjectLocalStudioSetup.defaults(),
new StudioExecutionSessionService(),
null,
null,
ProjectLocalStudioState.defaults());
}
@@ -39,14 +35,12 @@ public final class StudioProjectSession implements AutoCloseable {
final ProjectLocalStudioSetup projectLocalStudioSetup,
final StudioExecutionSessionService executionSessionService,
final LspServerLifecycle lspServerLifecycle,
final LspServerHandle lspServerHandle,
final ProjectLocalStudioState projectLocalStudioState) {
this.projectReference = Objects.requireNonNull(projectReference, "projectReference");
this.projectLocalStudioStateService = Objects.requireNonNull(projectLocalStudioStateService, "projectLocalStudioStateService");
this.projectLocalStudioSetup = Objects.requireNonNull(projectLocalStudioSetup, "projectLocalStudioSetup");
this.executionSessionService = Objects.requireNonNull(executionSessionService, "executionSessionService");
this.lspServerLifecycle = lspServerLifecycle;
this.lspServerHandle = lspServerHandle;
this.projectLocalStudioState = Objects.requireNonNull(projectLocalStudioState, "projectLocalStudioState");
}
@@ -66,10 +60,6 @@ public final class StudioProjectSession implements AutoCloseable {
return executionSessionService;
}
public LspServerHandle lspServerHandle() {
return lspServerHandle;
}
public void replaceProjectLocalStudioState(final ProjectLocalStudioState nextProjectLocalStudioState) {
this.projectLocalStudioState = Objects.requireNonNull(nextProjectLocalStudioState, "nextProjectLocalStudioState");
}
@@ -106,10 +96,9 @@ public final class StudioProjectSession implements AutoCloseable {
}
private void shutdownLspServer() {
if (lspServerLifecycle == null || lspServerHandle == null) {
if (lspServerLifecycle == null) {
return;
}
final LspProjectContext projectContext = lspServerHandle.project();
lspServerLifecycle.shutdownServer(projectContext);
lspServerLifecycle.shutdownServer(projectReference.toLspProjectContext());
}
}
@@ -1,13 +1,11 @@
package p.studio.projectsessions;
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.lsp.api.LspServerLifecycle;
import p.studio.lsp.messages.LspServerConfiguration;
import p.studio.projects.ProjectReference;
import p.studio.projectstate.ProjectLocalStudioSetupService;
import p.studio.projectstate.ProjectLocalStudioStateService;
import p.studio.projects.ProjectReference;
import java.util.Objects;
@@ -36,22 +34,13 @@ public final class StudioProjectSessionFactory {
final ProjectReference target = Objects.requireNonNull(projectReference, "projectReference");
final var setup = projectLocalStudioSetupService.load(target);
final var state = projectLocalStudioStateService.load(target);
final LspProjectContext lspProjectContext = toLspProjectContext(target);
final LspServerHandle lspServerHandle = lspServerLifecycle.bootServer(LspServerBootRequest.defaults(lspProjectContext));
lspServerLifecycle.bootServer(LspServerConfiguration.defaults(), target.toLspProjectContext());
return new StudioProjectSession(
target,
projectLocalStudioStateService,
setup,
new StudioExecutionSessionService(),
lspServerLifecycle,
lspServerHandle,
state);
}
private static LspProjectContext toLspProjectContext(final ProjectReference projectReference) {
return new LspProjectContext(
projectReference.rootPath().toAbsolutePath().normalize().toString(),
projectReference.languageId(),
projectReference.rootPath());
}
}
@@ -1,23 +1,18 @@
package p.studio.projectsessions;
import org.junit.jupiter.api.Test;
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.lsp.messages.LspProjectContext;
import p.studio.lsp.messages.LspServerConfiguration;
import p.studio.projects.ProjectReference;
import p.studio.projectstate.ProjectLocalStudioSetup;
import p.studio.projectstate.ProjectLocalStudioSetupService;
import p.studio.projectstate.ProjectLocalStudioState;
import p.studio.projectstate.ProjectLocalStudioStateService;
import p.studio.projects.ProjectReference;
import java.nio.file.Path;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.*;
final class StudioProjectSessionFactoryTest {
@Test
@@ -44,10 +39,9 @@ final class StudioProjectSessionFactoryTest {
assertEquals("IDLE", session.executionSession().snapshot().state().name());
assertSame(projectReference, stateService.loadedProjectReference);
assertSame(projectReference, setupService.loadedProjectReference);
assertNotNull(session.lspServerHandle());
assertEquals(1, lspServerLifecycle.bootCalls);
assertEquals(projectReference.languageId(), lspServerLifecycle.lastRequest.project().languageId());
assertEquals(projectReference.rootPath().toAbsolutePath().normalize(), lspServerLifecycle.lastRequest.project().projectRoot());
assertEquals(projectReference.languageId(), lspServerLifecycle.lastProjectContext.languageId());
assertEquals(projectReference.rootPath().toAbsolutePath().normalize(), lspServerLifecycle.lastProjectContext.projectRoot());
}
@Test
@@ -98,15 +92,12 @@ final class StudioProjectSessionFactoryTest {
private static final class RecordingLspServerLifecycle implements LspServerLifecycle {
private int bootCalls;
private LspServerBootRequest lastRequest;
private LspProjectContext lastProjectContext;
@Override
public LspServerHandle bootServer(final LspServerBootRequest request) {
public void bootServer(LspServerConfiguration serverConfiguration, LspProjectContext context) {
bootCalls++;
lastRequest = request;
return new LspServerHandle(
request.project(),
new LspServerEndpoint("127.0.0.1", request.configuration().port()));
lastProjectContext = context;
}
@Override
@@ -116,7 +107,7 @@ final class StudioProjectSessionFactoryTest {
private static final class FailingLspServerLifecycle implements LspServerLifecycle {
@Override
public LspServerHandle bootServer(final LspServerBootRequest request) {
public void bootServer(LspServerConfiguration serverConfiguration, LspProjectContext context) {
throw new IllegalStateException("boom");
}
@@ -2,15 +2,13 @@ package p.studio.projectsessions;
import org.junit.jupiter.api.Test;
import p.studio.execution.StudioExecutionSessionService;
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.lsp.messages.LspProjectContext;
import p.studio.lsp.messages.LspServerConfiguration;
import p.studio.projects.ProjectReference;
import p.studio.projectstate.ProjectLocalStudioSetup;
import p.studio.projectstate.ProjectLocalStudioState;
import p.studio.projectstate.ProjectLocalStudioStateService;
import p.studio.projects.ProjectReference;
import java.nio.file.Path;
@@ -27,7 +25,6 @@ final class StudioProjectSessionTest {
ProjectLocalStudioSetup.defaults(),
new StudioExecutionSessionService(),
null,
null,
ProjectLocalStudioState.defaults());
session.close();
@@ -46,7 +43,6 @@ final class StudioProjectSessionTest {
ProjectLocalStudioSetup.defaults(),
new StudioExecutionSessionService(),
null,
null,
ProjectLocalStudioState.defaults());
final ProjectLocalStudioState nextState = ProjectLocalStudioState.defaults()
.withOpenShellState(new ProjectLocalStudioState.OpenShellState("ASSETS"));
@@ -61,23 +57,18 @@ final class StudioProjectSessionTest {
void closeShutsDownLspServerOnlyOnce() {
final RecordingProjectLocalStudioStateService stateService = new RecordingProjectLocalStudioStateService();
final RecordingLspServerLifecycle lspServerLifecycle = new RecordingLspServerLifecycle();
final LspServerHandle lspServerHandle = new LspServerHandle(
new LspProjectContext("demo", "pbs", Path.of("/tmp/example")),
new LspServerEndpoint("127.0.0.1", 7777));
final StudioProjectSession session = new StudioProjectSession(
projectReference(),
stateService,
ProjectLocalStudioSetup.defaults(),
new StudioExecutionSessionService(),
lspServerLifecycle,
lspServerHandle,
ProjectLocalStudioState.defaults());
session.close();
session.close();
assertEquals(1, lspServerLifecycle.shutdownCalls);
assertEquals(lspServerHandle.project(), lspServerLifecycle.lastProject);
}
private ProjectReference projectReference() {
@@ -99,17 +90,15 @@ final class StudioProjectSessionTest {
private static final class RecordingLspServerLifecycle implements LspServerLifecycle {
private int shutdownCalls;
private LspProjectContext lastProject;
@Override
public LspServerHandle bootServer(final LspServerBootRequest request) {
public void bootServer(LspServerConfiguration serverConfiguration, LspProjectContext context) {
throw new UnsupportedOperationException();
}
@Override
public void shutdownServer(final LspProjectContext project) {
shutdownCalls++;
lastProject = project;
}
}
}