Merge pull request #3555 from 1c-syntax/feature/optimizedMem

Оптимизация хранения + некоторые фиксы сонара

Author: nixel2007

build.gradle.kts

@@ -88,7 +88,7 @@ dependencies {
         exclude("org.antlr", "antlr-runtime")
     }
     api("io.github.1c-syntax", "utils", "0.6.4")
-    api("io.github.1c-syntax", "mdclasses", "0.16.0")
+    api("io.github.1c-syntax", "mdclasses", "0.16.1-rc.1")
     api("io.github.1c-syntax", "bsl-common-library", "0.9.0")
     api("io.github.1c-syntax", "supportconf", "0.15.0")
     api("io.github.1c-syntax", "bsl-parser-core", "0.3.1")

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

@@ -45,7 +45,6 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static picocli.CommandLine.Command;
 
@@ -134,7 +133,7 @@ public void run(String... args) {
       var parseResult = cmd.parseArgs(args);
       var unmatchedArgs = parseResult.unmatched().stream()
         .filter(s -> allowedAdditionalArgs.stream().noneMatch(pattern -> pattern.matcher(s).matches()))
-        .collect(Collectors.toList());
+        .toList();
 
       if (!unmatchedArgs.isEmpty()) {
         unmatchedArgs.forEach(s -> cmd.getErr().println("Unknown option: '" + s + "'"));

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

@@ -31,6 +31,7 @@
 import io.sentry.Hint;
 import io.sentry.SentryEvent;
 import io.sentry.SentryOptions.BeforeSendCallback;
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.lsp4j.MessageActionItem;
@@ -70,7 +71,7 @@ public class PermissionFilterBeforeSendCallback implements BeforeSendCallback {
   private final AtomicBoolean questionWasSend = new AtomicBoolean(false);
 
   @Override
-  public SentryEvent execute(SentryEvent event, Hint hint) {
+  public SentryEvent execute(@NonNull SentryEvent event, @NonNull Hint hint) {
     if (sendToSentry()) {
       return event;
     }

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

@@ -28,7 +28,6 @@
 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;
 

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

@@ -31,8 +31,6 @@
 import lombok.RequiredArgsConstructor;
 import org.eclipse.lsp4j.ClientInfo;
 import org.eclipse.lsp4j.InitializeParams;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;

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

@@ -44,6 +44,6 @@ public CognitiveComplexityCodeLensSupplier(
 
   @Override
   protected Map<MethodSymbol, Integer> getMethodsComplexity(DocumentContext documentContext) {
-    return documentContext.getCognitiveComplexityData().getMethodsComplexity();
+    return documentContext.getCognitiveComplexityData().methodsComplexity();
   }
 }

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

@@ -44,6 +44,6 @@ public CyclomaticComplexityCodeLensSupplier(
 
   @Override
   protected Map<MethodSymbol, Integer> getMethodsComplexity(DocumentContext documentContext) {
-    return documentContext.getCyclomaticComplexityData().getMethodsComplexity();
+    return documentContext.getCyclomaticComplexityData().methodsComplexity();
   }
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/databind/ParametersDeserializer.java

@@ -34,7 +34,6 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -77,7 +76,8 @@ private static Map<String, Object> getParameterConfiguration(
   ) {
     Map<String, Object> parameterConfiguration;
     try {
-      JavaType type = mapper.getTypeFactory().constructType(new TypeReference<Map<String, Object>>() {});
+      JavaType type = mapper.getTypeFactory().constructType(new TypeReference<Map<String, Object>>() {
+      });
       parameterConfiguration = mapper.readValue(mapper.treeAsTokens(parameterConfig), type);
     } catch (IOException e) {
       LOGGER.error("Can't deserialize parameter configuration", e);

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/events/LanguageServerConfigurationChangedEvent.java

@@ -24,13 +24,16 @@
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import org.springframework.context.ApplicationEvent;
 
+import java.io.Serial;
+
 /**
  * Описание события изменения конфигурации.
  * <p>
  * В качестве источника события содержит ссылку на конфигурацию.
  */
 public class LanguageServerConfigurationChangedEvent extends ApplicationEvent {
 
+  @Serial
   private static final long serialVersionUID = 649143503434640953L;
 
   public LanguageServerConfigurationChangedEvent(LanguageServerConfiguration configuration) {

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

@@ -426,8 +426,8 @@ private MetricStorage computeMetrics() {
     int statements = Trees.findAllRuleNodes(getAst(), BSLParser.RULE_statement).size();
     metricsTemp.setStatements(statements);
 
-    metricsTemp.setCognitiveComplexity(getCognitiveComplexityData().getFileComplexity());
-    metricsTemp.setCyclomaticComplexity(getCyclomaticComplexityData().getFileComplexity());
+    metricsTemp.setCognitiveComplexity(getCognitiveComplexityData().fileComplexity());
+    metricsTemp.setCyclomaticComplexity(getCyclomaticComplexityData().fileComplexity());
 
     return metricsTemp;
   }