0.27.0

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
 {
 	"name": "Java",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/java:1-25-bookworm",
+	"image": "mcr.microsoft.com/devcontainers/java:25-jdk-bookworm",
 
 	"features": {
 		"ghcr.io/devcontainers/features/java:1": {

.git-blame-ignore-revs

@@ -1,3 +1,5 @@
+# happy new year 2026
+b286fdd9efe4754aebabc861310637d8ae7783c2
 # happy new year 2025
 e84a3f81035a6e76c042b406d5ad6e986a91d8e1
 # happy new year 2024

.github/workflows/gradle.yml

@@ -55,7 +55,7 @@ jobs:
         path: "**/test-results/test/**/*.xml"
     - name: Publish Test report
       if: failure()
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: junit_report_${{ matrix.os }}_${{ matrix.java_version }}
         path: build/reports/tests/test    

build.gradle.kts

@@ -88,7 +88,7 @@ dependencies {
         exclude("org.antlr", "antlr-runtime")
     }
     api("io.github.1c-syntax", "utils", "0.6.8")
-    api("io.github.1c-syntax", "mdclasses", "0.17.0")
+    api("io.github.1c-syntax", "mdclasses", "0.17.1")
     api("io.github.1c-syntax", "bsl-common-library", "0.9.0")
     api("io.github.1c-syntax", "supportconf", "0.15.0")
 

src/jmh/java/com/github/_1c_syntax/bsl/languageserver/IncrementalTextChangeBenchmark.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/jmh/java/com/github/_1c_syntax/bsl/languageserver/context/symbol/VariableSymbolCreate.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -47,6 +47,7 @@
 import com.github._1c_syntax.bsl.languageserver.providers.SelectionRangeProvider;
 import com.github._1c_syntax.bsl.languageserver.providers.SemanticTokensProvider;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
+import com.github._1c_syntax.utils.Absolute;
 import jakarta.annotation.PreDestroy;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -140,6 +141,7 @@
 public class BSLTextDocumentService implements TextDocumentService, ProtocolExtension {
 
   private static final long AWAIT_CLOSE = 30;
+  private static final long AWAIT_FORCE_TERMINATION = 1;
 
   private final ServerContext context;
   private final LanguageServerConfiguration configuration;
@@ -184,7 +186,7 @@ private void onDestroy() {
       return CompletableFuture.completedFuture(null);
     }
 
-    return withFreshDocumentContext(
+    return withFreshDocumentContextNullable(
       documentContext,
       () -> hoverProvider.getHover(documentContext, params).orElse(null)
     );
@@ -328,7 +330,7 @@ public CompletableFuture<List<FoldingRange>> foldingRange(FoldingRangeRequestPar
       return CompletableFuture.completedFuture(null);
     }
 
-    return withFreshDocumentContext(
+    return withFreshDocumentContextNullable(
       documentContext,
       () -> {
         List<CallHierarchyItem> callHierarchyItems = callHierarchyProvider.prepareCallHierarchy(documentContext, params);
@@ -466,51 +468,68 @@ public CompletableFuture<List<InlayHint>> inlayHint(InlayHintParams params) {
   @Override
   public void didOpen(DidOpenTextDocumentParams params) {
     var textDocumentItem = params.getTextDocument();
-    var documentContext = context.addDocument(URI.create(textDocumentItem.getUri()));
-
-    // Create single-threaded executor for this document to serialize didChange operations
-    var uri = documentContext.getUri();
-    documentExecutors.computeIfAbsent(uri, key ->
-      new DocumentChangeExecutor(
-        documentContext,
-        BSLTextDocumentService::applyTextDocumentChanges,
-        this::processDocumentChange,
-        "doc-" + documentContext.getUri() + "-"
-      )
-    );
+    var uri = Absolute.uri(textDocumentItem.getUri());
+    var lock = context.getDocumentLock(uri);
+    lock.writeLock().lock();
+
+    try {
+      var documentContext = context.addDocument(uri);
+
+      // Create single-threaded executor for this document to serialize didChange operations
+      documentExecutors.computeIfAbsent(uri, key ->
+        new DocumentChangeExecutor(
+          documentContext,
+          BSLTextDocumentService::applyTextDocumentChanges,
+          this::processDocumentChange,
+          "doc-" + documentContext.getUri() + "-"
+        )
+      );
 
-    context.openDocument(documentContext, textDocumentItem.getText(), textDocumentItem.getVersion());
+      context.openDocument(documentContext, textDocumentItem.getText(), textDocumentItem.getVersion());
 
-    if (configuration.getDiagnosticsOptions().getComputeTrigger() != ComputeTrigger.NEVER) {
-      validate(documentContext);
+      if (configuration.getDiagnosticsOptions().getComputeTrigger() != ComputeTrigger.NEVER) {
+        validate(documentContext);
+      }
+    } finally {
+      lock.writeLock().unlock();
     }
+
   }
 
   @Override
   public void didChange(DidChangeTextDocumentParams params) {
     var documentContext = context.getDocumentUnsafe(params.getTextDocument().getUri());
     if (documentContext == null) {
+      LOGGER.warn("Received didChange, but document is not found in context. uri={}", params.getTextDocument().getUri());
       return;
     }
 
     var uri = documentContext.getUri();
 
-    // Get executor for this document
-    var executor = documentExecutors.get(uri);
-    if (executor == null) {
-      // Document not opened or already closed
-      return;
-    }
+    // Acquire read lock to ensure document is not being modified by addDocument/removeDocument
+    var lock = context.getDocumentLock(uri);
+    lock.readLock().lock();
+    try {
+      // Get executor for this document
+      var executor = documentExecutors.get(uri);
+      if (executor == null) {
+        // Document not opened or already closed
+        LOGGER.warn("Received didChange, but document executor is not created yet. uri={}", uri);
+        return;
+      }
 
-    var version = params.getTextDocument().getVersion();
+      var version = params.getTextDocument().getVersion();
 
-    if (version == null) {
-      LOGGER.warn("Received didChange without version for {}", uri);
-      return;
-    }
+      if (version == null) {
+        LOGGER.warn("Received didChange without version for {}", uri);
+        return;
+      }
 
-    // Submit change operation to document's executor to serialize operations.
-    executor.submit(version, params.getContentChanges());
+      // Submit change operation to document's executor to serialize operations.
+      executor.submit(version, params.getContentChanges());
+    } finally {
+      lock.readLock().unlock();
+    }
   }
 
   @Override
@@ -530,16 +549,43 @@ public void didClose(DidCloseTextDocumentParams params) {
         // Wait for all queued changes to complete (with timeout to avoid hanging)
         if (!docExecutor.awaitTermination(AWAIT_CLOSE, TimeUnit.SECONDS)) {
           docExecutor.shutdownNow();
+          // Must wait for worker thread to finish even after shutdownNow,
+          // because finally block in worker may still be executing flushPendingChanges
+          boolean terminated = docExecutor.awaitTermination(AWAIT_FORCE_TERMINATION, TimeUnit.SECONDS);
+          if (!terminated) {
+            LOGGER.warn(
+              "Document executor for URI {} did not terminate within the additional timeout after shutdownNow()",
+              uri
+            );
+          }
         }
       } catch (InterruptedException e) {
         docExecutor.shutdownNow();
+        // Wait briefly for worker to finish after interrupt
+        try {
+          boolean terminated = docExecutor.awaitTermination(AWAIT_FORCE_TERMINATION, TimeUnit.SECONDS);
+          if (!terminated) {
+            LOGGER.warn(
+              "Document executor for URI {} did not terminate within {} seconds after interrupt during document close",
+              uri,
+              AWAIT_FORCE_TERMINATION
+            );
+          }
+        } catch (InterruptedException ignored) {
+          LOGGER.warn(
+            "Interrupted again while waiting for document executor for URI {} to terminate after shutdownNow",
+            uri
+          );
+        }
         Thread.currentThread().interrupt();
       }
     }
 
     context.closeDocument(documentContext);
 
-    diagnosticProvider.publishEmptyDiagnosticList(documentContext);
+    if (!clientSupportsPullDiagnostics) {
+      diagnosticProvider.publishEmptyDiagnosticList(documentContext);
+    }
   }
 
   @Override
@@ -768,9 +814,23 @@ private void processDocumentChange(
     }
   }
 
-  private <T> CompletableFuture<@Nullable T> withFreshDocumentContext(
+  private <T> CompletableFuture<@Nullable T> withFreshDocumentContextNullable(
     DocumentContext documentContext,
     Supplier<@Nullable T> supplier
+  ) {
+    return withFreshDocumentContextInternal(documentContext, supplier);
+  }
+
+  private <T> CompletableFuture<T> withFreshDocumentContext(
+    DocumentContext documentContext,
+    Supplier<T> supplier
+  ) {
+    return withFreshDocumentContextInternal(documentContext, supplier);
+  }
+
+  private <T> CompletableFuture<T> withFreshDocumentContextInternal(
+    DocumentContext documentContext,
+    Supplier<T> supplier
   ) {
     var executor = documentExecutors.get(documentContext.getUri());
     CompletableFuture<Void> waitFuture;
@@ -785,7 +845,13 @@ private void processDocumentChange(
         executorService,
         cancelChecker -> {
           cancelChecker.checkCanceled();
-          return supplier.get();
+          var lock = context.getDocumentLock(documentContext.getUri());
+          lock.readLock().lock();
+          try {
+            return supplier.get();
+          } finally {
+            lock.readLock().unlock();
+          }
         }
       )
     );

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

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

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/AspectJConfiguration.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/EventPublisherAspect.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/MeasuresAspect.java

@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Language Server.
  *
- * Copyright (c) 2018-2025
+ * Copyright (c) 2018-2026
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later