Merge pull request #3686 from 1c-syntax/develop

0.25.2

Author: nixel2007

.github/copilot-instructions.md

@@ -10,6 +10,8 @@ This is a Java-based language server that provides code analysis, diagnostics, c
 - Project site: https://1c-syntax.github.io/bsl-language-server
 - Documentation: [docs/index.md](../docs/index.md) (Russian), [docs/en/index.md](../docs/en/index.md) (English)
 - Contributor's Guide: [docs/en/contributing/index.md](../docs/en/contributing/index.md)
+- BSL grammar used in BSLParser: https://github.com/1c-syntax/bsl-parser/blob/develop/src/main/antlr/BSLParser.g4
+- SDBL grammar used in BSLParser: https://github.com/1c-syntax/bsl-parser/blob/develop/src/main/antlr/SDBLParser.g4
 
 ## Technology Stack
 

.github/workflows/dependabot-automerge.yaml

@@ -0,0 +1,29 @@
+name: Dependabot auto-merge
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == '1c-syntax/bsl-language-server'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Approve a PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -15,13 +15,13 @@ plugins {
     id("io.freefair.aspectj.post-compile-weaving") version "9.1.0"
     // id("io.freefair.maven-central.validate-poms") version "9.0.0" // TODO: Re-enable when compatible with Gradle 9
     id("com.github.ben-manes.versions") version "0.53.0"
-    id("org.springframework.boot") version "3.5.8"
+    id("org.springframework.boot") version "3.5.9"
     id("io.spring.dependency-management") version "1.1.7"
     id("io.sentry.jvm.gradle") version "5.12.2"
     id("io.github.1c-syntax.bslls-dev-tools") version "0.8.1"
     id("ru.vyarus.pom") version "3.0.0"
     id("org.jreleaser") version "1.21.0"
-    id("org.sonarqube") version "7.2.1.6560"
+    id("org.sonarqube") version "7.2.2.6593"
     id("me.champeau.jmh") version "0.7.3"
     id("com.gorylenko.gradle-git-properties") version "2.5.4"
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/CognitiveComplexityCodeLensSupplier.java

@@ -25,6 +25,7 @@
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -33,6 +34,7 @@
  * Сапплаер линз, показывающий когнитивную сложность методов.
  */
 @Component
+@Order(4)
 public class CognitiveComplexityCodeLensSupplier extends AbstractMethodComplexityCodeLensSupplier {
 
   public CognitiveComplexityCodeLensSupplier(

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/CyclomaticComplexityCodeLensSupplier.java

@@ -25,14 +25,16 @@
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
 /**
- * Сапплаер линз, показывающий когнитивную сложность методов.
+ * Сапплаер линз, показывающий цикломатическую сложность методов.
  */
 @Component
+@Order(5)
 public class CyclomaticComplexityCodeLensSupplier extends AbstractMethodComplexityCodeLensSupplier {
 
   public CyclomaticComplexityCodeLensSupplier(

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/DebugTestCodeLensSupplier.java

@@ -0,0 +1,171 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2025
+ * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * BSL Language Server is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * BSL Language Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with BSL Language Server.
+ */
+package com.github._1c_syntax.bsl.languageserver.codelenses;
+
+import com.github._1c_syntax.bsl.languageserver.codelenses.testrunner.TestRunnerAdapter;
+import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.FileType;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
+import com.github._1c_syntax.bsl.languageserver.utils.Resources;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.ToString;
+import lombok.Value;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.lsp4j.CodeLens;
+import org.eclipse.lsp4j.Command;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.beans.ConstructorProperties;
+import java.net.URI;
+import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+@Slf4j
+@Order(3)
+public class DebugTestCodeLensSupplier
+  extends AbstractRunTestsCodeLensSupplier<DebugTestCodeLensSupplier.DebugTestCodeLensData> {
+
+  private static final String COMMAND_ID = "language-1c-bsl.languageServer.debugTest";
+
+  private final TestRunnerAdapter testRunnerAdapter;
+  private final Resources resources;
+
+  // Self-injection для работы кэша в базовом классе.
+  @Autowired
+  @Lazy
+  @Getter
+  @SuppressWarnings("NullAway.Init")
+  private DebugTestCodeLensSupplier self;
+
+  public DebugTestCodeLensSupplier(
+    LanguageServerConfiguration configuration,
+    TestRunnerAdapter testRunnerAdapter,
+    Resources resources
+  ) {
+    super(configuration);
+    this.testRunnerAdapter = testRunnerAdapter;
+    this.resources = resources;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public List<CodeLens> getCodeLenses(DocumentContext documentContext) {
+
+    if (documentContext.getFileType() == FileType.BSL) {
+      return Collections.emptyList();
+    }
+
+    var options = configuration.getCodeLensOptions().getTestRunnerAdapterOptions();
+
+    if (options.getDebugTestArguments().isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    var testIds = testRunnerAdapter.getTestIds(documentContext);
+    var symbolTree = documentContext.getSymbolTree();
+
+    return testIds.stream()
+      .map(symbolTree::getMethodSymbol)
+      .flatMap(Optional::stream)
+      .map(methodSymbol -> toCodeLens(methodSymbol, documentContext))
+      .toList();
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public Class<DebugTestCodeLensSupplier.DebugTestCodeLensData> getCodeLensDataClass() {
+    return DebugTestCodeLensSupplier.DebugTestCodeLensData.class;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public CodeLens resolve(DocumentContext documentContext, CodeLens unresolved, DebugTestCodeLensData data) {
+
+    var path = Paths.get(documentContext.getUri());
+    var testId = data.getTestId();
+
+    var options = configuration.getCodeLensOptions().getTestRunnerAdapterOptions();
+    var executable = options.getExecutableForCurrentOS();
+    String runText = executable + " " + options.getDebugTestArguments();
+    runText = String.format(runText, path, testId);
+
+    var command = new Command();
+    command.setTitle(resources.getResourceString(getClass(), "title"));
+    command.setCommand(COMMAND_ID);
+    command.setArguments(List.of(Map.of("text", runText)));
+
+    unresolved.setCommand(command);
+
+    return unresolved;
+
+  }
+
+  private CodeLens toCodeLens(MethodSymbol method, DocumentContext documentContext) {
+    var testId = method.getName();
+    var codeLensData = new DebugTestCodeLensSupplier.DebugTestCodeLensData(documentContext.getUri(), getId(), testId);
+
+    var codeLens = new CodeLens(method.getSubNameRange());
+    codeLens.setData(codeLensData);
+
+    return codeLens;
+  }
+
+  /**
+   * DTO для хранения данных линз для отладки теста.
+   */
+  @Value
+  @EqualsAndHashCode(callSuper = true)
+  @ToString(callSuper = true)
+  public static class DebugTestCodeLensData extends DefaultCodeLensData {
+    /**
+     * Имя метода.
+     */
+    String testId;
+
+    /**
+     * @param uri    URI документа.
+     * @param id     Идентификатор линзы.
+     * @param testId Идентификатор теста.
+     */
+    @ConstructorProperties({"uri", "id", "testId"})
+    public DebugTestCodeLensData(URI uri, String id, String testId) {
+      super(uri, id);
+      this.testId = testId;
+    }
+  }
+
+}

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunAllTestsCodeLensSupplier.java

@@ -32,6 +32,7 @@
 import org.eclipse.lsp4j.Command;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Paths;
@@ -44,6 +45,7 @@
  */
 @Component
 @Slf4j
+@Order(1)
 public class RunAllTestsCodeLensSupplier
   extends AbstractRunTestsCodeLensSupplier<DefaultCodeLensData> {
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunTestCodeLensSupplier.java

@@ -36,6 +36,7 @@
 import org.eclipse.lsp4j.Command;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.beans.ConstructorProperties;
@@ -51,6 +52,7 @@
  */
 @Component
 @Slf4j
+@Order(2)
 public class RunTestCodeLensSupplier
   extends AbstractRunTestsCodeLensSupplier<RunTestCodeLensSupplier.RunTestCodeLensData> {
 
@@ -139,7 +141,7 @@ private CodeLens toCodeLens(MethodSymbol method, DocumentContext documentContext
   }
 
   /**
-   * DTO для хранения данных линз о сложности методов в документе.
+   * DTO для хранения данных линз для запуска теста.
    */
   @Value
   @EqualsAndHashCode(callSuper = true)

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/infrastructure/CodeLensesConfiguration.java

@@ -29,10 +29,14 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.OrderUtils;
 
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -77,6 +81,8 @@ public List<CodeLensSupplier<CodeLensData>> enabledCodeLensSuppliers(
     var parameters = configuration.getCodeLensOptions().getParameters();
     return codeLensSuppliersById.values().stream()
       .filter(supplier -> supplierIsEnabled(supplier.getId(), parameters))
+      .sorted(Comparator.comparing(o ->
+        Objects.requireNonNullElse(OrderUtils.getOrder(o.getClass()), Ordered.LOWEST_PRECEDENCE)))
       .collect(Collectors.toList());
   }
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/testrunner/TestRunnerAdapter.java

@@ -144,6 +144,7 @@ private List<String> computeTestIdsByTestRunner(DocumentContext documentContext)
       .map(getTestsRegex::matcher)
       .filter(Matcher::matches)
       .map(matcher -> matcher.group(1))
+      .distinct()
       .toList();
   }