Merge branch 'develop' into Null_for_join_2283_2

# Conflicts:
#	src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FieldsFromJoinsWithoutIsNullDiagnostic.java
#	src/test/resources/diagnostics/FieldsFromJoinsWithoutIsNullDiagnostic.bsl

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

.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.5
+        uses: cirrus-actions/rebase@1.6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -95,7 +95,7 @@ jobs:
                 name: bsl-language-server_${{ matrix.prefix }}.zip
                 path: ./${{ matrix.app-image }}
             - name: Upload assets to release
-              uses: AButler/upload-release-assets@v1.0
+              uses: AButler/upload-release-assets@v2.0
               with:
                   files: './bsl-language-server_${{ matrix.prefix }}.zip'
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -104,7 +104,7 @@ jobs:
               run: ./gradlew build
             - name: Upload jar to release
               if: matrix.prefix == 'nix'
-              uses: AButler/upload-release-assets@v1.0
+              uses: AButler/upload-release-assets@v2.0
               with:
                   files: './build/libs/*.jar'
                   repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -9,14 +9,14 @@ plugins {
     signing
     id("org.cadixdev.licenser") version "0.6.1"
     id("org.sonarqube") version "3.3"
-    id("io.freefair.lombok") version "6.4.2"
-    id("io.freefair.javadoc-links") version "6.4.2"
-    id("io.freefair.javadoc-utf-8") version "6.4.2"
-    id("io.freefair.aspectj.post-compile-weaving") version "6.4.1"
-    id("io.freefair.maven-central.validate-poms") version "6.4.2"
-    id("me.qoomon.git-versioning") version "5.1.5"
+    id("io.freefair.lombok") version "6.4.3"
+    id("io.freefair.javadoc-links") version "6.4.3"
+    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 "6.1.1"
     id("com.github.ben-manes.versions") version "0.42.0"
-    id("org.springframework.boot") version "2.6.6"
+    id("org.springframework.boot") version "2.6.7"
     id("io.spring.dependency-management") version "1.0.11.RELEASE"
     id("io.github.1c-syntax.bslls-dev-tools") version "0.7.0"
     id("ru.vyarus.pom") version "2.2.1"
@@ -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);
+  }
+
 }