Перетряхивание логики работы с состоянием документ-контекста

Author: nixel2007

src/main/java/com/github/_1c_syntax/bsl/languageserver/AnalyzeProjectOnStart.java

@@ -53,14 +53,10 @@ public void handleEvent(ServerContextPopulatedEvent event) {
 
       progress.tick();
 
-      var withContent = documentContext.isWithContent();
-      if (!withContent) {
-        documentContext.rebuild();
-      }
+      serverContext.rebuildDocument(documentContext);
       diagnosticProvider.computeAndPublishDiagnostics(documentContext);
-      if (!withContent) {
-        documentContext.clearSecondaryData();
-      }
+
+      serverContext.tryClearDocument(documentContext);
 
     });
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLTextDocumentService.java

@@ -92,11 +92,10 @@
 import org.eclipse.lsp4j.services.TextDocumentService;
 import org.springframework.stereotype.Component;
 
+import java.net.URI;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 @Component
@@ -120,8 +119,6 @@ public class BSLTextDocumentService implements TextDocumentService, ProtocolExte
   private final ColorProvider colorProvider;
   private final RenameProvider renameProvider;
 
-  private final Set<DocumentContext> openedDocuments = ConcurrentHashMap.newKeySet();
-
   @Override
   public CompletableFuture<Hover> hover(HoverParams params) {
     var documentContext = context.getDocument(params.getTextDocument().getUri());
@@ -309,11 +306,14 @@ public CompletableFuture<List<ColorPresentation>> colorPresentation(ColorPresent
 
   @Override
   public void didOpen(DidOpenTextDocumentParams params) {
-    var documentContext = context.addDocument(params.getTextDocument());
+    var textDocumentItem = params.getTextDocument();
+    var documentContext = context.addDocument(URI.create(textDocumentItem.getUri()));
+
+    context.openDocument(documentContext, textDocumentItem.getText(), textDocumentItem.getVersion());
+
     if (configuration.getDiagnosticsOptions().getComputeTrigger() != ComputeTrigger.NEVER) {
       validate(documentContext);
     }
-    openedDocuments.add(documentContext);
   }
 
   @Override
@@ -325,7 +325,11 @@ public void didChange(DidChangeTextDocumentParams params) {
       return;
     }
 
-    documentContext.rebuild(params.getContentChanges().get(0).getText(), params.getTextDocument().getVersion());
+    context.rebuildDocument(
+      documentContext,
+      params.getContentChanges().get(0).getText(),
+      params.getTextDocument().getVersion()
+    );
 
     if (configuration.getDiagnosticsOptions().getComputeTrigger() == ComputeTrigger.ONTYPE) {
       validate(documentContext);
@@ -338,9 +342,8 @@ public void didClose(DidCloseTextDocumentParams params) {
     if (documentContext == null) {
       return;
     }
-    openedDocuments.remove(documentContext);
 
-    documentContext.clearSecondaryData();
+    context.closeDocument(documentContext);
 
     diagnosticProvider.publishEmptyDiagnosticList(documentContext);
   }

src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/AnalyzeCommand.java

@@ -27,6 +27,7 @@
 import com.github._1c_syntax.bsl.languageserver.reporters.ReportersAggregator;
 import com.github._1c_syntax.bsl.languageserver.reporters.data.AnalysisInfo;
 import com.github._1c_syntax.bsl.languageserver.reporters.data.FileInfo;
+import com.github._1c_syntax.bsl.types.MdoReference;
 import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.RequiredArgsConstructor;
@@ -41,12 +42,10 @@
 import picocli.CommandLine.Command;
 
 import java.io.File;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
@@ -202,23 +201,21 @@ public String[] getReportersOptions() {
 
   @SneakyThrows
   private FileInfo getFileInfoFromFile(Path srcDir, File file) {
-    var textDocumentContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
-
-    var documentContext = context.addDocument(file.toURI(), textDocumentContent, 1);
+    var documentContext = context.addDocument(file.toURI());
+    context.rebuildDocument(documentContext);
 
     var filePath = srcDir.relativize(Absolute.path(file));
     List<Diagnostic> diagnostics = documentContext.getDiagnostics();
     MetricStorage metrics = documentContext.getMetrics();
-    var mdoRef = "";
-    Optional<AbstractMDObjectBase> mdObjectBase = documentContext.getMdObject();
-    if (mdObjectBase.isPresent()) {
-      mdoRef = mdObjectBase.get().getMdoReference().getMdoRef();
-    }
+    var mdoRef = documentContext.getMdObject()
+      .map(AbstractMDObjectBase::getMdoReference)
+      .map(MdoReference::getMdoRef)
+      .orElse("");
 
     var fileInfo = new FileInfo(filePath, mdoRef, diagnostics, metrics);
 
     // clean up AST after diagnostic computing to free up RAM.
-    documentContext.clearSecondaryData();
+    context.tryClearDocument(documentContext);
 
     return fileInfo;
   }

src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java

@@ -37,7 +37,6 @@
 import org.springframework.stereotype.Component;
 
 import java.io.File;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -147,13 +146,13 @@ private List<File> findFilesForFormatting(String[] filePaths) {
 
   @SneakyThrows
   private void formatFile(File file) {
-    String textDocumentContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
-    final URI uri = file.toURI();
+    var uri = file.toURI();
 
-    var documentContext = serverContext.addDocument(uri, textDocumentContent, 1);
+    var documentContext = serverContext.addDocument(uri);
+    serverContext.rebuildDocument(documentContext);
 
-    DocumentFormattingParams params = new DocumentFormattingParams();
-    FormattingOptions options = new FormattingOptions();
+    var params = new DocumentFormattingParams();
+    var options = new FormattingOptions();
     options.setInsertSpaces(false);
 
     params.setOptions(options);

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java

@@ -93,9 +93,6 @@ public class DocumentContext {
   @Getter
   private int version;
 
-  @Getter
-  private boolean withContent;
-
   @Setter(onMethod = @__({@Autowired}))
   private ServerContext context;
   @Setter(onMethod = @__({@Autowired}))
@@ -274,12 +271,12 @@ public void unfreezeComputedData() {
     isComputedDataFrozen = false;
   }
 
-  public void rebuild(String content, int version) {
+  protected void rebuild(String content, int version) {
     computeLock.lock();
 
     boolean versionMatches = version == this.version && version != 0;
 
-    if (versionMatches && withContent) {
+    if (versionMatches && (this.content != null)) {
       clearDependantData();
       computeLock.unlock();
       return;
@@ -293,12 +290,11 @@ public void rebuild(String content, int version) {
     tokenizer = new BSLTokenizer(content);
     this.version = version;
     symbolTree = computeSymbolTree();
-    withContent = true;
 
     computeLock.unlock();
   }
 
-  public void rebuild() {
+  protected void rebuild() {
     try {
       var newContent = FileUtils.readFileToString(new File(uri), StandardCharsets.UTF_8);
       rebuild(newContent, 0);
@@ -307,10 +303,9 @@ public void rebuild() {
     }
   }
 
-  public void clearSecondaryData() {
+  protected void clearSecondaryData() {
     computeLock.lock();
 
-    withContent = false;
     content = null;
     contentList.clear();
     tokenizer = null;