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

0.24.2

Author: nixel2007

.github/workflows/qa.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
     - name: Download PR number artifact
       if: github.event.workflow_run.event == 'pull_request'
-      uses: dawidd6/action-download-artifact@v8
+      uses: dawidd6/action-download-artifact@v9
       with:
         workflow: ${{ github.event.workflow_run.name }}
         run_id: ${{ github.event.workflow_run.id }}

.github/workflows/sentry.yml

@@ -25,12 +25,24 @@ jobs:
       - name: Get version from Gradle
         id: get_version
         run: echo "RELEASE_VERSION=$(./gradlew version -q)" >> $GITHUB_ENV
+      - name: Get Sentry environment from project version 
+        id: get_env
+        run: |
+          if [[ "${{ env.RELEASE_VERSION }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "ENVIRONMENT=production" >> $GITHUB_ENV
+          elif [[ "${{ env.RELEASE_VERSION }}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-r[ca][0-9]+$ ]]; then
+            echo "ENVIRONMENT=pre-release" >> $GITHUB_ENV
+          elif [[ "${{ env.RELEASE_VERSION }}" == develop-* && ! "${{ env.RELEASE_VERSION }}" == *-DIRTY-* ]]; then
+            echo "ENVIRONMENT=develop" >> $GITHUB_ENV
+          else
+            echo "ENVIRONMENT=feature" >> $GITHUB_ENV
+          fi
       - name: Create Sentry release
-        uses: getsentry/action-release@v1
+        uses: getsentry/action-release@v3
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
           SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
         with:
-          environment: production
+          environment: ${{ env.ENVIRONMENT }}
           version: ${{ env.RELEASE_VERSION }}

build.gradle.kts

@@ -9,20 +9,20 @@ plugins {
     jacoco
     signing
     id("org.cadixdev.licenser") version "0.6.1"
-    id("org.sonarqube") version "6.0.1.5171"
-    id("io.freefair.lombok") version "8.12.1"
-    id("io.freefair.javadoc-links") version "8.12.1"
-    id("io.freefair.javadoc-utf-8") version "8.12.1"
-    id("io.freefair.aspectj.post-compile-weaving") version "8.12.1"
-    id("io.freefair.maven-central.validate-poms") version "8.12.1"
+    id("org.sonarqube") version "6.1.0.5360"
+    id("io.freefair.lombok") version "8.13.1"
+    id("io.freefair.javadoc-links") version "8.13.1"
+    id("io.freefair.javadoc-utf-8") version "8.13.1"
+    id("io.freefair.aspectj.post-compile-weaving") version "8.13.1"
+    id("io.freefair.maven-central.validate-poms") version "8.13.1"
     id("me.qoomon.git-versioning") version "6.4.4"
     id("com.github.ben-manes.versions") version "0.52.0"
-    id("org.springframework.boot") version "3.4.3"
+    id("org.springframework.boot") version "3.4.4"
     id("io.spring.dependency-management") version "1.1.7"
-    id("io.sentry.jvm.gradle") version "5.2.0"
+    id("io.sentry.jvm.gradle") version "5.3.0"
     id("io.github.1c-syntax.bslls-dev-tools") version "0.8.1"
     id("ru.vyarus.pom") version "3.0.0"
-    id("com.gorylenko.gradle-git-properties") version "2.4.2"
+    id("com.gorylenko.gradle-git-properties") version "2.5.0"
     id("io.codearte.nexus-staging") version "0.30.0"
     id("me.champeau.jmh") version "0.7.3"
 }
@@ -68,8 +68,12 @@ dependencies {
     api("org.springframework.boot:spring-boot-starter")
     api("org.springframework.boot:spring-boot-starter-websocket")
     api("org.springframework.boot:spring-boot-starter-cache")
+
     api("info.picocli:picocli-spring-boot-starter:4.7.6")
 
+    // кэширование
+    api("com.github.ben-manes.caffeine", "caffeine", "3.2.0")
+
     // lsp4j core
     api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.24.0")
     api("org.eclipse.lsp4j", "org.eclipse.lsp4j.websocket.jakarta", "0.24.0")
@@ -128,7 +132,7 @@ dependencies {
     }
 
     // COMPILE
-    compileOnly("com.github.spotbugs:spotbugs-annotations:4.9.1")
+    compileOnly("com.github.spotbugs:spotbugs-annotations:4.9.3")
 
     // TEST
 

docs/diagnostics/AllFunctionPathMustHaveReturn.md

@@ -13,7 +13,7 @@
 ### Неправильно
 
 ```bsl
-// если ставка заполнена, но не НДС10 и не НДС10 - вернется Неопределено
+// если ставка заполнена, но не равна НДС20 и не равна НДС10 - вернется Неопределено
 // это может быть, как запланированное поведение, 
 // так и ошибка проверки прочих вариантов.
 Функция ОпределитьСтавкуНДС(Знач Ставка)

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew

@@ -31,6 +31,7 @@
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -40,6 +41,7 @@
 
 @EnableAutoConfiguration
 @ComponentScan("com.github._1c_syntax.bsl.languageserver")
+@EnableCaching(proxyTargetClass = true)
 public class BSLLSBinding {
 
   @Getter(lazy = true, value = AccessLevel.PRIVATE)
@@ -74,17 +76,22 @@ public static ServerContext getServerContext() {
   }
 
   private static SpringApplication createApplication() {
-    return new SpringApplicationBuilder(BSLLSBinding.class)
+    var app = new SpringApplicationBuilder(BSLLSBinding.class)
       .bannerMode(Banner.Mode.OFF)
       .web(WebApplicationType.NONE)
       .logStartupInfo(false)
       .resourceLoader(new DefaultResourceLoader(BSLLSBinding.class.getClassLoader()))
       .lazyInitialization(true)
       .properties(Map.of(
         "app.command.line.runner.enabled", "false",
-        "app.scheduling.enabled", "false"
+        "app.scheduling.enabled", "false",
+        "spring.cache.caffeine.spec", "maximumSize=500,expireAfterAccess=600s",
+        "spring.cache.cache-names", "testIds,testSources"
       ))
       .build();
+
+    app.setRegisterShutdownHook(false);
+    return app;
   }
 
   private static ConfigurableApplicationContext createContext() {

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

@@ -70,7 +70,8 @@ public void watch() {
       .orElse(false);
 
     if (!processIsAlive) {
-      LOGGER.info("Parent process with pid {} is not found. Closing application...", parentProcessId);
+      //noinspection StringConcatenationArgumentToLogCall - форматирование через {} не работает из-за NoClassDefException
+      LOGGER.info("Parent process with pid " + parentProcessId + " is not found. Closing application...");
       languageServer.exit();
     }
   }

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

@@ -28,6 +28,7 @@
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import org.eclipse.lsp4j.ServerInfo;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -50,16 +51,13 @@ public class SentryScopeConfigurer {
   @Value("${sentry.dsn:}")
   private final String dsn;
 
-  @Value("${sentry.environment:dummy}")
-  private final String environment;
-
   @PostConstruct
   public void init() {
     if (dsn != null && !dsn.isEmpty()) {
       Sentry.init(options -> {
         options.setDsn(dsn);
-        options.setEnvironment(environment);
-        options.setRelease(serverInfo.getVersion());
+        options.setEnvironment(getEnvironment());
+        options.setRelease(getVersion());
         options.setAttachServerName(false);
         options.setServerName(getServerName());
         options.setBeforeSend(beforeSendCallback);
@@ -74,6 +72,26 @@ public void init() {
     });
   }
 
+  private String getEnvironment() {
+    String version = getVersion();
+    String environment;
+
+    if (version.matches("\\d+\\.\\d+\\.\\d+")) {
+      environment = "production";
+    } else if (version.matches("\\d+\\.\\d+\\.\\d+-r[ca]\\d+")) {
+      environment = "pre-release";
+    } else if (version.startsWith("develop-") && !version.contains("-DIRTY-")) {
+      environment = "develop";
+    } else {
+      environment = "feature";
+    }
+    return environment;
+  }
+
+  private String getVersion() {
+    return serverInfo.getVersion();
+  }
+
   @Nullable
   private String getServerName() {
     try {

src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java

@@ -114,7 +114,9 @@ public ParseTree visitIfStatement(BSLParser.IfStatementContext ctx) {
 
     // тело true
     blocks.enterBlock();
-    ctx.ifBranch().codeBlock().accept(this);
+    if (ctx.ifBranch().codeBlock() != null) {
+      ctx.ifBranch().codeBlock().accept(this);
+    }
     var truePart = blocks.leaveBlock();
 
     graph.addEdge(conditionStatement, truePart.begin(), CfgEdgeType.TRUE_BRANCH);

src/main/java/com/github/_1c_syntax/bsl/languageserver/cfg/CfgBuildingParseTreeVisitor.java

@@ -21,7 +21,11 @@
  */
 package com.github._1c_syntax.bsl.languageserver.infrastructure;
 
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -30,4 +34,15 @@
 @Configuration
 @EnableCaching
 public class CacheConfiguration {
+  @Bean
+  public CacheManager cacheManager(Caffeine<Object, Object> caffeine) {
+    var caffeineCacheManager = new CaffeineCacheManager();
+    caffeineCacheManager.setCaffeine(caffeine);
+    return caffeineCacheManager;
+  }
+
+  @Bean
+  public Caffeine<Object, Object> caffeineConfig() {
+    return Caffeine.newBuilder();
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/infrastructure/CacheConfiguration.java

@@ -0,0 +1,44 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2025
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com> 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.utils.expressiontree;
+
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.Value;
+import lombok.experimental.NonFinal;
+import org.antlr.v4.runtime.tree.ParseTree;
+
+@Value
+@NonFinal
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ErrorExpressionNode extends BslExpression {
+
+  protected ErrorExpressionNode() {
+    super(ExpressionNodeType.ERROR);
+  }
+
+  protected ErrorExpressionNode(ParseTree sourceCodeOperator) {
+    super(ExpressionNodeType.ERROR, sourceCodeOperator, null);
+  }
+
+}

src/main/java/com/github/_1c_syntax/bsl/languageserver/utils/expressiontree/ErrorExpressionNode.java

@@ -28,5 +28,6 @@ public enum ExpressionNodeType {
   UNARY_OP,
   CALL,
   TERNARY_OP,
-  SKIPPED_CALL_ARG
+  SKIPPED_CALL_ARG,
+  ERROR
 }