Merge branch 'develop' into Null_for_join_2283_2

Author: nixel2007

.github/workflows/rebase.yml

@@ -14,6 +14,6 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
       - name: Automatic Rebase
-        uses: cirrus-actions/rebase@1.6
+        uses: cirrus-actions/rebase@1.7
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

@@ -29,6 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.configuration.codelens.CodeLensOptions;
 import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.DiagnosticsOptions;
 import com.github._1c_syntax.bsl.languageserver.configuration.documentlink.DocumentLinkOptions;
+import com.github._1c_syntax.bsl.languageserver.configuration.formating.FormattingOptions;
 import com.github._1c_syntax.utils.Absolute;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -88,6 +89,10 @@ public class LanguageServerConfiguration {
   @JsonProperty("documentLink")
   @Setter(value = AccessLevel.NONE)
   private DocumentLinkOptions documentLinkOptions = new DocumentLinkOptions();
+  
+  @JsonProperty("formatting")
+  @Setter(value = AccessLevel.NONE)
+  private FormattingOptions formattingOptions = new FormattingOptions();
 
   private String siteRoot = "https://1c-syntax.github.io/bsl-language-server";
   private boolean useDevSite;
@@ -213,6 +218,7 @@ private void copyPropertiesFrom(LanguageServerConfiguration configuration) {
     PropertyUtils.copyProperties(this.codeLensOptions, configuration.codeLensOptions);
     PropertyUtils.copyProperties(this.diagnosticsOptions, configuration.diagnosticsOptions);
     PropertyUtils.copyProperties(this.documentLinkOptions, configuration.documentLinkOptions);
+    PropertyUtils.copyProperties(this.formattingOptions, configuration.formattingOptions);
   }
 
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/formating/FormattingOptions.java

@@ -0,0 +1,37 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2022
+ * 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.configuration.formating;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor(onConstructor = @__({@JsonCreator(mode = JsonCreator.Mode.DISABLED)}))
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class FormattingOptions {
+  private boolean useUpperCaseForOrNotAndKeywords = true;
+  private boolean useKeywordsFormatting = true;
+}

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/formating/package-info.java

@@ -0,0 +1,25 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2022
+ * 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.
+ */
+/**
+ * Пакет содержит настройки {@link com.github._1c_syntax.bsl.languageserver.providers.FormatProvider}
+ */
+package com.github._1c_syntax.bsl.languageserver.configuration.formating;

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

@@ -40,6 +40,7 @@
 import com.github._1c_syntax.bsl.languageserver.utils.expressiontree.TransitiveOperationsIgnoringComparer;
 import com.github._1c_syntax.bsl.languageserver.utils.expressiontree.UnaryOperationNode;
 import com.github._1c_syntax.bsl.parser.BSLParser;
+import lombok.RequiredArgsConstructor;
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.eclipse.lsp4j.FormattingOptions;
@@ -60,6 +61,7 @@
     DiagnosticTag.SUSPICIOUS
   }
 )
+@RequiredArgsConstructor
 public class IdenticalExpressionsDiagnostic extends AbstractVisitorDiagnostic {
 
   private static final int MIN_EXPRESSION_SIZE = 3;
@@ -70,7 +72,8 @@ public class IdenticalExpressionsDiagnostic extends AbstractVisitorDiagnostic {
     defaultValue = POPULAR_DIVISORS_DEFAULT_VALUE
   )
   private Set<String> popularDivisors = parseCommaSeparatedSet(POPULAR_DIVISORS_DEFAULT_VALUE);
-
+  private final FormatProvider formatProvider;
+  
   private static Set<String> parseCommaSeparatedSet(String values) {
     if (values.trim().isEmpty()) {
       return Collections.emptySet();
@@ -169,7 +172,7 @@ private boolean isPopularQuantification(BinaryOperationNode node) {
     return false;
   }
 
-  private static String getOperandText(BinaryOperationNode node) {
+  private String getOperandText(BinaryOperationNode node) {
 
     assert node.getRepresentingAst() != null;
 
@@ -179,7 +182,8 @@ private static String getOperandText(BinaryOperationNode node) {
     fillTokens(pairedOperand, tokens);
 
     // todo: очень плохое место для этого метода
-    return FormatProvider.getNewText(tokens, Ranges.create(), 0, new FormattingOptions()).trim();
+    return formatProvider.getNewText(
+      tokens, documentContext.getScriptVariantLocale(), Ranges.create(), 0, new FormattingOptions()).trim();
 
   }
 

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

@@ -23,7 +23,10 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.Symbol;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.annotations.Annotation;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.annotations.AnnotationKind;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticMetadata;
+import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticParameter;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
@@ -48,10 +51,29 @@ public class NonExportMethodsInApiRegionDiagnostic extends AbstractVisitorDiagno
     "^(?:ПрограммныйИнтерфейс|СлужебныйПрограммныйИнтерфейс|Public|Internal)$"
   );
 
+  private static final boolean SKIP_ANNOTATED_METHODS = false;
+
+  @DiagnosticParameter(
+    type = Boolean.class,
+    defaultValue = "" + SKIP_ANNOTATED_METHODS
+  )
+  private boolean skipAnnotatedMethods = SKIP_ANNOTATED_METHODS;
+
   @Override
   public ParseTree visitSub(BSLParser.SubContext ctx) {
 
-    documentContext.getSymbolTree().getMethodSymbol(ctx).ifPresent((MethodSymbol methodSymbol) -> {
+    var optionalMethodSymbol = documentContext.getSymbolTree().getMethodSymbol(ctx);
+
+    if (skipAnnotatedMethods
+      && optionalMethodSymbol
+      .stream()
+      .flatMap(methodSymbol -> methodSymbol.getAnnotations().stream())
+      .map(Annotation::getKind)
+      .anyMatch((AnnotationKind kind) -> kind != AnnotationKind.CUSTOM)) {
+      return ctx;
+    }
+
+    optionalMethodSymbol.ifPresent((MethodSymbol methodSymbol) -> {
       if (methodSymbol.isExport()) {
         return;
       }