sq fixes

Author: theshadowco

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

@@ -107,7 +107,7 @@ public class BSLLanguageServer implements LanguageServer, ProtocolExtension {
   public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
 
     clientCapabilitiesHolder.setCapabilities(params.getCapabilities());
-    
+
     setConfigurationRoot(params);
 
     var capabilities = new ServerCapabilities();
@@ -143,7 +143,7 @@ private void setConfigurationRoot(InitializeParams params) {
       return;
     }
 
-    String rootUri = workspaceFolders.get(0).getUri();
+    var rootUri = workspaceFolders.get(0).getUri();
     Path rootPath;
     try {
       rootPath = new File(new URI(rootUri).getPath()).getCanonicalFile().toPath();
@@ -152,7 +152,7 @@ private void setConfigurationRoot(InitializeParams params) {
       return;
     }
 
-    Path configurationRoot = LanguageServerConfiguration.getCustomConfigurationRoot(
+    var configurationRoot = LanguageServerConfiguration.getCustomConfigurationRoot(
       configuration,
       rootPath);
     context.setConfigurationRoot(configurationRoot);

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

@@ -37,7 +37,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 
-import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -87,15 +86,15 @@ private void logException(Throwable ex) {
         if (sentryId.equals(SentryId.EMPTY_ID)) {
           return;
         }
-        if (languageClientHolder == null) {
+        var clientHolder = languageClientHolder;
+        if (clientHolder == null) {
           return;
         }
         var messageType = MessageType.Info;
         var message = resources.getResourceString(getClass(), "logMessage", sentryId);
         var messageParams = new MessageParams(messageType, message);
 
-        Objects.requireNonNull(languageClientHolder)
-          .execIfConnected(languageClient -> languageClient.showMessage(messageParams));
+        clientHolder.execIfConnected(languageClient -> languageClient.showMessage(messageParams));
       },
       executorService);
   }

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java

@@ -163,7 +163,7 @@ public void reset() {
    *
    * @param configuration Конфигурация language server
    * @param srcDir Директория исходных файлов
-   * @return Корневой каталог для анализа
+   * @return Корневой каталог для анализа, или {@code null} если конфигурация находится вне srcDir
    */
   public static @Nullable Path getCustomConfigurationRoot(LanguageServerConfiguration configuration, Path srcDir) {
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractMagicValueDiagnostic.java

@@ -131,8 +131,9 @@ private static boolean isSecondParameterOfStructureInsert(BSLParser.CallParamCon
       return false;
     }
 
-    var variableType = getVariableTypeFromCallParamList(callParamList);
-    return variableType.filter(aBoolean -> !aBoolean).isPresent();
+    return getVariableTypeFromCallParamList(callParamList)
+      .map(typeIsCorrespondence -> !typeIsCorrespondence)
+      .orElse(false);
   }
 
   /**
@@ -486,9 +487,11 @@ private static boolean checkInsideStructureConstructor(BSLParser.ExpressionConte
       return false;
     }
 
-    var typeNameOpt = getStructureTypeName(callParamContextOpt.get());
-    return typeNameOpt.filter(typeNameContext ->
-      isValidStructureConstructorParameter(callParamContextOpt.get(), typeNameContext)).isPresent();
+    var callParamContext = callParamContextOpt.get();
+    var typeNameOpt = getStructureTypeName(callParamContext);
+    return typeNameOpt
+      .map(typeName -> isValidStructureConstructorParameter(callParamContext, typeName))
+      .orElse(false);
   }
 
   /**

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MagicNumberDiagnostic.java

@@ -120,15 +120,14 @@ private boolean isWrongExpression(BSLParser.NumericContext ctx, ParserRuleContex
 
     var expression = getExpression(numericContextParent);
     if (expression.isPresent()) {
-      if (insideStructureOrCorrespondence(expression.get())) {
+      var context = expression.get();
+      if (insideStructureOrCorrespondence(context)) {
         return false;
       }
-      if (insideReturnStatement(expression.get())) {
+      if (insideReturnStatement(context)) {
         return true;
       }
-      return expression
-        .filter(expr -> (!isNumericExpression(expr) || insideCallParam(expr)))
-        .isPresent();
+      return !isNumericExpression(context) || insideCallParam(context);
     }
     return false;
   }

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/RefOveruseDiagnostic.java

@@ -116,8 +116,9 @@ private Stream<SDBLParser.ColumnContext> checkQuery(SDBLParser.QueryContext ctx)
     var columns = Trees.findAllTopLevelDescendantNodes(ctx, RULE_COLUMNS).stream()
       .filter(parserRuleContext -> parserRuleContext.getRuleIndex() == SDBLParser.RULE_column)
       .filter(parserRuleContext ->
-        Objects.requireNonNull(Trees.getRootParent(parserRuleContext, EXCLUDED_COLUMNS_ROOT))
-          .getRuleIndex() == SDBLParser.RULE_query
+        Optional.ofNullable(Trees.getRootParent(parserRuleContext, EXCLUDED_COLUMNS_ROOT))
+          .map(root -> root.getRuleIndex() == SDBLParser.RULE_query)
+          .orElse(false)
       )
       .map(SDBLParser.ColumnContext.class::cast)
       .collect(Collectors.toList());

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnsafeFindByCodeDiagnostic.java

@@ -159,19 +159,16 @@ private boolean checkMetadataObject(String mdoRef) {
 
     var mdo = mdoOpt.get();
     var mdoType = mdo.getMdoType();
-    boolean result;
 
     if (mdoType == MDOType.CATALOG) {
-      result = isUnsafeCatalogUsage((Catalog) mdo);
+      return isUnsafeCatalogUsage((Catalog) mdo);
     } else if (mdoType == MDOType.CHART_OF_CHARACTERISTIC_TYPES) {
-      result = isUnsafeChartOfCharacteristicTypesUsage((ChartOfCharacteristicTypes) mdo);
+      return isUnsafeChartOfCharacteristicTypesUsage((ChartOfCharacteristicTypes) mdo);
     } else if (mdoType == MDOType.CHART_OF_ACCOUNTS) {
-      result = isUnsafeChartOfAccountsUsage((ChartOfAccounts) mdo);
+      return isUnsafeChartOfAccountsUsage((ChartOfAccounts) mdo);
     } else {
-      result = false;
+      return false;
     }
-
-    return result;
   }
 
   /**

src/main/java/com/github/_1c_syntax/bsl/languageserver/hover/ModuleSymbolMarkupContentBuilder.java

@@ -31,6 +31,7 @@
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.StringJoiner;
 
 /**
@@ -111,7 +112,7 @@ private String getModuleInfo(ModuleSymbol symbol) {
     return moduleInfoBuilder.toString();
   }
 
-  private ArrayList<String> getModuleFlags(CommonModule commonModule) {
+  private List<String> getModuleFlags(CommonModule commonModule) {
     var flags = new ArrayList<String>();
 
     if (commonModule.isServer()) {

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

@@ -101,7 +101,7 @@ public <T> T get(Object key, Callable<T> valueLoader) {
   @Override
   public void put(Object key, @Nullable Object value) {
     if(value == null) { // не будем в кеш класть null-значения
-      return;
+      throw new NullPointerException("Null values are not allowed for cache \"" + name + "\"");
     }
 
     @SuppressWarnings("unchecked")

src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/DiagnosticProvider.java

@@ -63,7 +63,7 @@ public final class DiagnosticProvider {
 
   private final LanguageClientHolder clientHolder;
   private final ClientCapabilitiesHolder clientCapabilitiesHolder;
-  
+
   private boolean clientSupportsRefresh;
 
   /**