Merge branch 'develop' into WriteLogEvent-1714

# Conflicts:
#	src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsageWriteLogEventDiagnostic.java
#	src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UsageWriteLogEventDiagnosticTest.java

Author: artbear

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: java
@@ -52,4 +52,4 @@ jobs:
     - run: ./gradlew jar
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/pre-qa.yml

@@ -0,0 +1,27 @@
+name: Pre-QA
+
+on:
+  push:
+    branches-ignore:
+      - "translations_*"
+  pull_request:
+
+jobs:
+  gatekeeper:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'translations_') == false || github.event_name == 'push'
+    steps:
+      - run: echo 'Open the Golden Gate'
+  build:
+    needs: gatekeeper
+    runs-on: ubuntu-latest
+    steps:
+    - name: Save PR number to file
+      if: github.event_name == 'pull_request'
+      run: echo ${{ github.event.number }} > PR_NUMBER.txt
+    - name: Archive PR number
+      if: github.event_name == 'pull_request'
+      uses: actions/upload-artifact@v3
+      with:
+        name: PR_NUMBER
+        path: PR_NUMBER.txt

.github/workflows/qa.yml

@@ -1,35 +1,66 @@
 name: QA
 
 on: 
-  push:
-    branches: [develop, master]
-
-  pull_request:
+  workflow_run:
+    workflows: [Pre-QA]
+    types: [completed]
 
 jobs:
-  gatekeeper:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request' && (!startsWith(github.head_ref, 'translations_') == false || github.event.pull_request.user.login != 'dependabot[bot]') || github.event_name == 'push'
-    steps:
-      - run: echo 'Open the Golden Gate'
 
   QA:
-    needs: gatekeeper
     runs-on: ubuntu-latest
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
+    if: github.event.workflow_run.conclusion == 'success'
     steps:
+    - name: Download PR number artifact
+      if: github.event.workflow_run.event == 'pull_request'
+      uses: dawidd6/action-download-artifact@v2
+      with:
+        workflow: ${{ github.event.workflow_run.name }}
+        run_id: ${{ github.event.workflow_run.id }}
+        name: PR_NUMBER
+    - name: Read PR_NUMBER.txt
+      if: github.event.workflow_run.event == 'pull_request'
+      id: pr_number
+      uses: juliangruber/read-file-action@v1
+      with:
+        path: ./PR_NUMBER.txt
+    - name: Request GitHub API for PR data
+      if: github.event.workflow_run.event == 'pull_request'
+      uses: octokit/request-action@v2.x
+      id: get_pr_data
+      with:
+        route: GET /repos/{full_name}/pulls/{number}
+        number: ${{ steps.pr_number.outputs.content }}
+        full_name: ${{ github.event.repository.full_name }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - uses: actions/checkout@v3
       with:
-        fetch-depth: ''
-    - run: |
-        git fetch --prune --unshallow
+          repository: ${{ github.event.workflow_run.head_repository.full_name }}
+          ref: ${{ github.event.workflow_run.head_branch }}
+          fetch-depth: 0
+    - name: Checkout base branch
+      if: github.event.workflow_run.event == 'pull_request'
+      run: |
+        git remote add upstream ${{ github.event.repository.clone_url }}
+        git fetch upstream
+        git checkout -B ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }} upstream/${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}
+        git checkout ${{ github.event.workflow_run.head_branch }}
+        git clean -ffdx && git reset --hard HEAD
     - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         java-version: 11
         distribution: 'temurin'
-    - name: SonarCloud Scan
-      run: ./gradlew check sonarqube
+    - name: SonarCloud Scan on PR
+      if: github.event.workflow_run.event == 'pull_request'
+      run: ./gradlew check sonarqube -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} -Dsonar.pullrequest.key=${{ fromJson(steps.get_pr_data.outputs.data).number }} -Dsonar.pullrequest.branch=${{ fromJson(steps.get_pr_data.outputs.data).head.ref }} -Dsonar.pullrequest.base=${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}
+      env:
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: SonarCloud Scan on push
+      if: github.event.workflow_run.event == 'push' && github.event.workflow_run.head_repository.full_name == github.event.repository.full_name
+      run: ./gradlew check sonarqube -Dsonar.scm.revision=${{ github.event.workflow_run.head_sha }} -Dsonar.branch.name=${{ github.event.workflow_run.head_branch }}
       env:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/qodana.yml

@@ -20,10 +20,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v4.2.5
+        uses: JetBrains/qodana-action@v5.1.0
         with:
           linter: jetbrains/qodana-jvm-community
-      - uses: github/codeql-action/upload-sarif@v1
+      - uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
       - name: Deploy to GitHub Pages

build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
     id("io.freefair.javadoc-utf-8") version "6.4.3"
     id("io.freefair.aspectj.post-compile-weaving") version "6.4.3"
     id("io.freefair.maven-central.validate-poms") version "6.4.3"
-    id("me.qoomon.git-versioning") version "5.2.0"
+    id("me.qoomon.git-versioning") version "6.1.1"
     id("com.github.ben-manes.versions") version "0.42.0"
     id("org.springframework.boot") version "2.6.7"
     id("io.spring.dependency-management") version "1.0.11.RELEASE"
@@ -63,7 +63,7 @@ dependencies {
     api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.12.0")
 
     // 1c-syntax
-    api("com.github.1c-syntax", "bsl-parser", "0.20.3") {
+    api("com.github.1c-syntax", "bsl-parser", "0.21.0") {
         exclude("com.tunnelvisionlabs", "antlr4-annotations")
         exclude("com.ibm.icu", "*")
         exclude("org.antlr", "ST4")

qodana.yaml

@@ -1,5 +1,7 @@
 version: "1.0"
 profile:
   name: qodana.starter
+include:
+  - name: CheckDependencyLicenses
 exclude:
   - name: OptionalUsedAsFieldOrParameterType

src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java

@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.cli;
 
-import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.context.ServerContext;
 import com.github._1c_syntax.bsl.languageserver.providers.FormatProvider;
 import com.github._1c_syntax.utils.Absolute;
@@ -41,10 +40,10 @@
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.regex.Pattern;
 
 import static picocli.CommandLine.Command;
 import static picocli.CommandLine.Option;
@@ -75,6 +74,7 @@
 @RequiredArgsConstructor
 public class FormatCommand implements Callable<Integer> {
 
+  private static final Pattern COMMA_PATTERN = Pattern.compile(",");
   private final ServerContext serverContext;
   private final FormatProvider formatProvider;
 
@@ -99,18 +99,12 @@ public class FormatCommand implements Callable<Integer> {
   public Integer call() {
     serverContext.clear();
 
-    Path srcDir = Absolute.path(srcDirOption);
-    if (!srcDir.toFile().exists()) {
-      LOGGER.error("Source dir `{}` is not exists", srcDir);
-      return 1;
-    }
+    String[] filePaths = COMMA_PATTERN.split(srcDirOption);
 
-    Collection<File> files;
+    List<File> files = findFilesForFormatting(filePaths);
 
-    if(srcDir.toFile().isDirectory()) {
-      files = FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true);
-    } else {
-      files = Collections.singletonList(srcDir.toFile());
+    if (files.isEmpty()) {
+      return 1;
     }
 
     if (silentMode) {
@@ -132,6 +126,25 @@ public Integer call() {
     return 0;
   }
 
+  private List<File> findFilesForFormatting(String[] filePaths) {
+    List<File> files = new ArrayList<>();
+    for (String filePath : filePaths) {
+      Path srcDir = Absolute.path(filePath);
+      if (!srcDir.toFile().exists()) {
+        LOGGER.error("Source dir `{}` is not exists", srcDir);
+        continue;
+      }
+
+      if(srcDir.toFile().isDirectory()) {
+        files.addAll(FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true));
+      } else {
+        files.add(srcDir.toFile());
+      }
+    }
+
+    return files;
+  }
+
   @SneakyThrows
   private void formatFile(File file) {
     String textDocumentContent = FileUtils.readFileToString(file, StandardCharsets.UTF_8);

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

@@ -23,6 +23,8 @@
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo;
+import com.github._1c_syntax.bsl.languageserver.utils.Trees;
+import com.github._1c_syntax.bsl.parser.SDBLParser;
 import com.github._1c_syntax.bsl.parser.SDBLParserBaseVisitor;
 import lombok.Getter;
 import lombok.Setter;
@@ -49,4 +51,13 @@ public List<Diagnostic> getDiagnostics(DocumentContext documentContext) {
 
     return diagnosticStorage.getDiagnostics();
   }
+
+  @Override
+  public ParseTree visitQueryPackage(SDBLParser.QueryPackageContext ctx) {
+    if (Trees.treeContainsErrors(ctx)) {
+      return ctx;
+    }
+    return super.visitQueryPackage(ctx);
+  }
+
 }

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

@@ -44,6 +44,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @DiagnosticMetadata(
@@ -145,7 +147,7 @@ public ParseTree visitModuleVar(BSLParser.ModuleVarContext ctx) {
         && !(node instanceof TerminalNode))
       .findFirst()
       .ifPresent((Tree node) -> {
-          Range ctxRange = Ranges.create((BSLParserRuleContext) node);
+          var ctxRange = Ranges.create((BSLParserRuleContext) node);
           if (regionsRanges.stream().noneMatch(regionRange ->
             Ranges.containsRange(regionRange, ctxRange))) {
             diagnosticStorage.addDiagnostic(ctx);
@@ -182,14 +184,26 @@ private void addDiagnosticForFileCodeBlock(BSLParserRuleContext ctx) {
       .stream()
       .filter(node -> node.getParent().getParent() == ctx)
       .forEach((ParseTree child) -> {
-        if (child.getChildCount() > 1
-          || !(child.getChild(0) instanceof BSLParser.PreprocessorContext)) {
-          Range ctxRange = Ranges.create((BSLParser.StatementContext) child);
+        if ((child.getChildCount() > 1
+          || !(child.getChild(0) instanceof BSLParser.PreprocessorContext))
+          && !isRaiseStatement(child)) {
+
+          var ctxRange = Ranges.create((BSLParser.StatementContext) child);
           if (regionsRanges.stream().noneMatch(regionRange ->
             Ranges.containsRange(regionRange, ctxRange))) {
             diagnosticStorage.addDiagnostic((BSLParser.StatementContext) child);
           }
         }
       });
   }
+
+  private static boolean isRaiseStatement(ParseTree child) {
+    return Optional.of(child).stream()
+      .filter(BSLParser.StatementContext.class::isInstance)
+      .map(BSLParser.StatementContext.class::cast)
+      .map(BSLParser.StatementContext::compoundStatement)
+      .filter(Objects::nonNull)
+      .map(BSLParser.CompoundStatementContext::raiseStatement)
+      .anyMatch(Objects::nonNull);
+  }
 }

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

@@ -62,14 +62,14 @@ public class FieldsFromJoinsWithoutIsNullDiagnostic extends AbstractSDBLVisitorD
   private static final Integer SELECT_ROOT = SDBLParser.RULE_selectedField;
   private static final Collection<Integer> SELECT_STATEMENTS = Set.of(SELECT_ROOT, SDBLParser.RULE_builtInFunctions);
 
-  private static final Integer WHERE_ROOT = SDBLParser.RULE_searchCondition;
+  private static final Integer WHERE_ROOT = SDBLParser.RULE_predicate;
   private static final Collection<Integer> WHERE_STATEMENTS = Set.of(WHERE_ROOT, SDBLParser.RULE_builtInFunctions,
     SDBLParser.RULE_isNullPredicate);
 
   private static final Integer JOIN_ROOT = SDBLParser.RULE_joinPart;
   private static final Collection<Integer> JOIN_STATEMENTS = Set.of(JOIN_ROOT, SDBLParser.RULE_builtInFunctions);
 
-  public static final Collection<Integer> RULES_OF_PARENT_FOR_SEARCH_CONDITION = Set.of(SDBLParser.RULE_searchCondition,
+  public static final Collection<Integer> RULES_OF_PARENT_FOR_SEARCH_CONDITION = Set.of(SDBLParser.RULE_predicate,
     SDBLParser.RULE_query);
 
   public static final int NOT_WITH_PARENS_EXPR_MEMBERS_COUNT = 4;
@@ -128,7 +128,7 @@ private void checkQuery(String joinedTableName, SDBLParser.JoinPartContext joinP
       });
   }
 
-  private static boolean haveExprNotIsNullInsideWhere(@Nullable SDBLParser.SearchConditionsContext whereCtx) {
+  private static boolean haveExprNotIsNullInsideWhere(@Nullable SDBLParser.LogicalExpressionContext whereCtx) {
     return Optional.ofNullable(whereCtx)
       .stream().flatMap(ctx -> Trees.findAllRuleNodes(ctx, SDBLParser.RULE_isNullPredicate).stream())
       .map(SDBLParser.IsNullPredicateContext.class::cast)
@@ -142,7 +142,7 @@ private static boolean haveFirstIsThenNotThenNull(SDBLParser.IsNullPredicateCont
   }
 
   private static boolean haveExprNotIsNullInsideWhere(SDBLParser.IsNullPredicateContext isNullPredicateCtx) {
-    final var parent = (SDBLParser.SearchConditionContext) isNullPredicateCtx.getParent();
+    final var parent = (SDBLParser.PredicateContext) isNullPredicateCtx.getParent();
     if (parent.getChildCount() == NOT_IS_NULL_EXPR_MEMBER_COUNT && parent.NOT() != null) {
       return true;
     }
@@ -153,7 +153,7 @@ private static boolean isTerminalNodeNOT(ParseTree node) {
     return node instanceof TerminalNode && ((TerminalNode) node).getSymbol().getType() == SDBLParser.NOT;
   }
 
-  private static boolean haveExprNotWithParens(SDBLParser.SearchConditionContext ctx) {
+  private static boolean haveExprNotWithParens(SDBLParser.PredicateContext ctx) {
     final var rootCtx = Trees.getRootParent(ctx, RULES_OF_PARENT_FOR_SEARCH_CONDITION);
     if (rootCtx == null || rootCtx.getRuleIndex() == SDBLParser.RULE_query) {
       return false;
@@ -214,11 +214,10 @@ private static boolean haveIsNullFunction(BSLParserRuleContext ctx) {
       .filter(SDBLParser.BuiltInFunctionsContext.class::isInstance)
       .map(SDBLParser.BuiltInFunctionsContext.class::cast)
       .map(SDBLParser.BuiltInFunctionsContext::ISNULL)
-      .filter(Objects::nonNull)
       .isPresent();
   }
 
-  private void checkWhere(String tableName, @Nullable SDBLParser.SearchConditionsContext where) {
+  private void checkWhere(String tableName, @Nullable SDBLParser.LogicalExpressionContext where) {
     Optional.ofNullable(where)
       .stream().flatMap(searchConditionsContext -> searchConditionsContext.condidions.stream())
       .forEach(searchConditionContext -> checkStatements(tableName, searchConditionContext,
@@ -230,7 +229,7 @@ private void checkAllJoins(String tableName, SDBLParser.JoinPartContext currentJ
       .filter(SDBLParser.DataSourceContext.class::isInstance)
       .stream().flatMap(ctx -> ((SDBLParser.DataSourceContext) ctx).joinPart().stream())
       .filter(joinPartContext -> joinPartContext != currentJoinPart)
-      .map(SDBLParser.JoinPartContext::searchConditions)
+      .map(SDBLParser.JoinPartContext::logicalExpression)
       .forEach(searchConditionsContext -> checkStatements(tableName, searchConditionsContext,
         JOIN_STATEMENTS, JOIN_ROOT, false));
   }