refactor, rename and reducing complexity

This commit is contained in:
2026-04-02 11:55:09 +01:00
parent b64be2a9a1
commit ba55b8e65f
120 changed files with 1134 additions and 1025 deletions
@@ -1,10 +1,12 @@
package p.studio.vfs;
import p.studio.vfs.messages.VfsProjectContext;
import java.util.Objects;
public final class FilesystemProjectDocumentVfsFactory implements ProjectDocumentVfsFactory {
@Override
public ProjectDocumentVfs open(final VfsProjectContext projectContext) {
return new FilesystemProjectDocumentVfs(Objects.requireNonNull(projectContext, "projectContext"));
public VfsProjectDocument open(final VfsProjectContext projectContext) {
return new FilesystemVfsProjectDocument(Objects.requireNonNull(projectContext, "projectContext"));
}
}
@@ -2,6 +2,7 @@ package p.studio.vfs;
import p.studio.compiler.FrontendRegistryService;
import p.studio.compiler.models.FrontendSpec;
import p.studio.vfs.messages.*;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -11,24 +12,17 @@ import java.nio.charset.CodingErrorAction;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
final class FilesystemProjectDocumentVfs implements ProjectDocumentVfs {
final class FilesystemVfsProjectDocument implements VfsProjectDocument {
private final VfsProjectContext projectContext;
private final Map<Path, EditableDocumentSnapshot> editableSnapshots = new LinkedHashMap<>();
private final Map<Path, Map<String, String>> accessContextAttributes = new HashMap<>();
private VfsProjectSnapshot snapshot;
FilesystemProjectDocumentVfs(final VfsProjectContext projectContext) {
FilesystemVfsProjectDocument(final VfsProjectContext projectContext) {
this.projectContext = Objects.requireNonNull(projectContext, "projectContext");
this.snapshot = buildSnapshot();
}
@@ -73,7 +67,7 @@ final class FilesystemProjectDocumentVfs implements ProjectDocumentVfs {
final var supportedDocument = requireSupportedDocument(path);
return openSupportedDocument(supportedDocument);
} catch (UnsupportedDocumentException unsupportedDocumentException) {
return new VfsUnsupportedDocument(
return new VfsDocumentOpenResult.VfsUnsupportedDocument(
unsupportedDocumentException.path(),
unsupportedDocumentException.reason());
}
@@ -92,7 +86,7 @@ final class FilesystemProjectDocumentVfs implements ProjectDocumentVfs {
}
@Override
public VfsTextDocument updateDocument(final Path path, final String content) {
public VfsDocumentOpenResult.VfsTextDocument updateDocument(final Path path, final String content) {
final var supportedDocument = requireSupportedDocument(path);
if (supportedDocument.accessMode() != VfsDocumentAccessMode.EDITABLE) {
throw new IllegalStateException("Document is hard read-only: " + supportedDocument.path());
@@ -194,11 +188,11 @@ final class FilesystemProjectDocumentVfs implements ProjectDocumentVfs {
return toVfsTextDocument(supportedDocument, false, accessContext);
}
private VfsTextDocument toVfsTextDocument(
private VfsDocumentOpenResult.VfsTextDocument toVfsTextDocument(
final SupportedDocument supportedDocument,
final boolean dirty,
final VfsDocumentAccessContext accessContext) {
return new VfsTextDocument(
return new VfsDocumentOpenResult.VfsTextDocument(
supportedDocument.path(),
supportedDocument.documentName(),
supportedDocument.typeId(),