From da2163445fe56b4448a3cf43065b3e68eac2a07a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 May 2022 02:14:57 +0000 Subject: [PATCH 01/82] Bump assertj-core from 3.22.0 to 3.23.0 Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.0. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.22.0...assertj-core-3.23.0) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5542ae01..53e1ac6c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.0") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") - testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("org.assertj:assertj-core:3.23.0") testImplementation("org.mockito:mockito-core:4.5.1") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) From c3a7835b36e8136ed25f124e4b12400ad8dc6fee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 May 2022 19:05:01 +0000 Subject: [PATCH 02/82] Bump mockito-core from 4.5.1 to 4.6.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.5.1 to 4.6.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.5.1...v4.6.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 53e1ac6c..3c4bcdb2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.23.0") - testImplementation("org.mockito:mockito-core:4.5.1") + testImplementation("org.mockito:mockito-core:4.6.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 9f957bca159c33dbc075c7f73fc89b144c377b8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jun 2022 03:32:22 +0000 Subject: [PATCH 03/82] Bump assertj-core from 3.23.0 to 3.23.1 Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.23.0 to 3.23.1. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](https://github.com/assertj/assertj-core/compare/assertj-core-3.23.0...assertj-core-3.23.1) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3c4bcdb2..71e9e161 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.0") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") - testImplementation("org.assertj:assertj-core:3.23.0") + testImplementation("org.assertj:assertj-core:3.23.1") testImplementation("org.mockito:mockito-core:4.6.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) From 925e565b4fb272f6fd943307aca9e889ad8df304 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jun 2022 06:11:06 +0000 Subject: [PATCH 04/82] Bump mockito-core from 4.6.0 to 4.6.1 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.0 to 4.6.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.0...v4.6.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 71e9e161..32539e2e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.mockito:mockito-core:4.6.0") + testImplementation("org.mockito:mockito-core:4.6.1") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 7ee6abbf932f6a4e0516de8ddf43ecc5eb9b519b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 02:24:20 +0000 Subject: [PATCH 05/82] Bump org.sonarqube from 3.3 to 3.4.0.2513 Bumps org.sonarqube from 3.3 to 3.4.0.2513. --- updated-dependencies: - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 32539e2e..b7f6f396 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { jacoco java `maven-publish` - id("org.sonarqube") version "3.3" + id("org.sonarqube") version "3.4.0.2513" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.42.0" From 40b02981159cf6d2f789821a6b6db44c03a45bbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Jun 2022 02:24:25 +0000 Subject: [PATCH 06/82] Bump io.freefair.lombok from 6.4.3 to 6.4.3.1 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.4.3 to 6.4.3.1. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.4.3...6.4.3.1) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 32539e2e..f8e8ad56 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.42.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.4.3" + id("io.freefair.lombok") version "6.4.3.1" } group = "io.github.1c-syntax" From 9fde5e2310400154359253e6579f5e3b01496c1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Jun 2022 02:37:21 +0000 Subject: [PATCH 07/82] Bump io.freefair.lombok from 6.4.3.1 to 6.5.0.2 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.4.3.1 to 6.5.0.2. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.4.3.1...6.5.0.2) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a3b30e0c..ed02881e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.42.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.4.3.1" + id("io.freefair.lombok") version "6.5.0.2" } group = "io.github.1c-syntax" From 9f89e6892ec85e4aac789399ee5d86a23fdeecf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 02:27:44 +0000 Subject: [PATCH 08/82] Bump actions/setup-java from 3.3.0 to 3.4.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.3.0...v3.4.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 61307918..31509119 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index f66afac1..f63e9032 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index b5093baf..5165c99a 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb9794ba..2275e048 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.3.0 + uses: actions/setup-java@v3.4.0 with: java-version: 11 distribution: 'adopt' From 89af2293fea6d2111085585e5d02240422f540cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jul 2022 02:18:31 +0000 Subject: [PATCH 09/82] Bump actions/setup-java from 3.4.0 to 3.4.1 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.4.0...v3.4.1) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 31509119..73084cde 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index f63e9032..d425ebeb 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 5165c99a..21c620aa 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2275e048..db1320eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.4.0 + uses: actions/setup-java@v3.4.1 with: java-version: 11 distribution: 'adopt' From 7f122a6105ae063f7d535f816ef4e67d6ac14d27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Jul 2022 02:21:50 +0000 Subject: [PATCH 10/82] Bump io.freefair.lombok from 6.5.0.2 to 6.5.0.3 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.5.0.2 to 6.5.0.3. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.5.0.2...6.5.0.3) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ed02881e..ed162c82 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.42.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.5.0.2" + id("io.freefair.lombok") version "6.5.0.3" } group = "io.github.1c-syntax" From 9d8bb13b639b79915edfb6e3d79a388a8b24a1ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 02:28:31 +0000 Subject: [PATCH 11/82] Bump sonar-analyzer-commons from 1.25.0.1003 to 1.26.0.1029 Bumps [sonar-analyzer-commons](https://github.com/SonarSource/sonar-analyzer-commons) from 1.25.0.1003 to 1.26.0.1029. - [Release notes](https://github.com/SonarSource/sonar-analyzer-commons/releases) - [Commits](https://github.com/SonarSource/sonar-analyzer-commons/compare/1.25.0.1003...1.26.0.1029) --- updated-dependencies: - dependency-name: org.sonarsource.analyzer-commons:sonar-analyzer-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ed162c82..f95f92cf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons - implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.25.0.1003") + implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.26.0.1029") // MD to HTML converter of BSL LS rule descriptions implementation("com.atlassian.commonmark", "commonmark", commonmarkVersion) From bf99ac48fba4396e3616525ab567679f4d780922 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Aug 2022 02:24:00 +0000 Subject: [PATCH 12/82] Bump WebFreak001/deploy-nightly from 1.1.0 to 1.2.0 Bumps [WebFreak001/deploy-nightly](https://github.com/WebFreak001/deploy-nightly) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/WebFreak001/deploy-nightly/releases) - [Commits](https://github.com/WebFreak001/deploy-nightly/compare/v1.1.0...v1.2.0) --- updated-dependencies: - dependency-name: WebFreak001/deploy-nightly dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/night_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index d425ebeb..0183602e 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -28,7 +28,7 @@ jobs: - name: Save current date run: echo "PLUGIN_CURRENT_DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV - name: Deploy build - uses: WebFreak001/deploy-nightly@v1.1.0 + uses: WebFreak001/deploy-nightly@v1.2.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From e9d5b2a90ad171a44b82fdbcca59cb71939805a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Aug 2022 02:24:24 +0000 Subject: [PATCH 13/82] Bump mockito-core from 4.6.1 to 4.7.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.1 to 4.7.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f95f92cf..0ba44be8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.mockito:mockito-core:4.6.1") + testImplementation("org.mockito:mockito-core:4.7.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 3ab5e3524a826a7a4387bd68fdb93166a7a54846 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Sep 2022 02:30:36 +0000 Subject: [PATCH 14/82] Bump io.freefair.lombok from 6.5.0.3 to 6.5.1 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.5.0.3 to 6.5.1. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.5.0.3...6.5.1) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0ba44be8..02736271 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.42.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.5.0.3" + id("io.freefair.lombok") version "6.5.1" } group = "io.github.1c-syntax" From e5e0c8e7974a1ba9525730182b7ca237090ad4ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Sep 2022 12:58:33 +0000 Subject: [PATCH 15/82] Bump jackson-databind from 2.13.3 to 2.13.4 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.3 to 2.13.4. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0ba44be8..be46437d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("io.github.1c-syntax", "bsl-language-server", "0.20.0") implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3") + implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.26.0.1029") From 686490146d54a7e92e62ac4efb4428372c31ffb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 09:00:52 +0000 Subject: [PATCH 16/82] Bump sonar-analyzer-commons from 1.26.0.1029 to 1.28.0.1058 Bumps [sonar-analyzer-commons](https://github.com/SonarSource/sonar-analyzer-commons) from 1.26.0.1029 to 1.28.0.1058. - [Release notes](https://github.com/SonarSource/sonar-analyzer-commons/releases) - [Commits](https://github.com/SonarSource/sonar-analyzer-commons/compare/1.26.0.1029...1.28.0.1058) --- updated-dependencies: - dependency-name: org.sonarsource.analyzer-commons:sonar-analyzer-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d2929106..233a40ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons - implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.26.0.1029") + implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.28.0.1058") // MD to HTML converter of BSL LS rule descriptions implementation("com.atlassian.commonmark", "commonmark", commonmarkVersion) From 6aba8404046561218f1ce15f2a8ce2026f1b9b37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 02:16:48 +0000 Subject: [PATCH 17/82] Bump mockito-core from 4.7.0 to 4.8.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d2929106..dce2704d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.mockito:mockito-core:4.7.0") + testImplementation("org.mockito:mockito-core:4.8.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 4429b6d22e6392c66cadbb5b88d675ce7b0be4e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 02:27:18 +0000 Subject: [PATCH 18/82] Bump actions/setup-java from 3.4.1 to 3.5.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.4.1...v3.5.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 73084cde..1f60bc6d 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index d425ebeb..0b22da33 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 21c620aa..adabec75 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db1320eb..2b799af2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.4.1 + uses: actions/setup-java@v3.5.0 with: java-version: 11 distribution: 'adopt' From 9e11332821ec4177ecd5fb51ee74afa184cfb170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 02:27:08 +0000 Subject: [PATCH 19/82] Bump progressbar from 0.9.3 to 0.9.4 Bumps [progressbar](https://github.com/ctongfei/progressbar) from 0.9.3 to 0.9.4. - [Release notes](https://github.com/ctongfei/progressbar/releases) - [Changelog](https://github.com/ctongfei/progressbar/blob/main/CHANGELOG.md) - [Commits](https://github.com/ctongfei/progressbar/compare/0.9.3...0.9.4) --- updated-dependencies: - dependency-name: me.tongfei:progressbar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d2929106..e4c9fd03 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { implementation("com.atlassian.commonmark", "commonmark-ext-autolink", commonmarkVersion) implementation("com.atlassian.commonmark", "commonmark-ext-heading-anchor", commonmarkVersion) - implementation("me.tongfei:progressbar:0.9.3") + implementation("me.tongfei:progressbar:0.9.4") compileOnly("com.google.code.findbugs:jsr305:3.0.2") From f24e47d96ed506311252e5eee1888a77750d893a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Sep 2022 02:32:34 +0000 Subject: [PATCH 20/82] Bump actions/setup-java from 3.5.0 to 3.5.1 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.5.0...v3.5.1) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1f60bc6d..77312fa6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.5.0 + uses: actions/setup-java@v3.5.1 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index 8c6951f3..25a9416d 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.5.0 + uses: actions/setup-java@v3.5.1 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index adabec75..6d6ef888 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.5.0 + uses: actions/setup-java@v3.5.1 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b799af2..586049db 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.5.0 + uses: actions/setup-java@v3.5.1 with: java-version: 11 distribution: 'adopt' From 7949772d0b7c8c81274445a5422c53e167984f09 Mon Sep 17 00:00:00 2001 From: theshadowco Date: Fri, 30 Sep 2022 10:20:00 +0300 Subject: [PATCH 21/82] =?UTF-8?q?1.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B4=D0=BB=D1=8F=20=D0=95?= =?UTF-8?q?=D0=94=D0=A2=20+=20=D0=B4=D0=BE=D0=BA=D0=B0=202.=20=D0=94=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D1=83=D0=B5=D0=BC=D0=BE=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=20-?= =?UTF-8?q?=20=D0=B8=D0=B4=D0=B5=D0=BD=D1=82=D0=B8=D1=84=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B5=D0=B9?= =?UTF-8?q?=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/index.md | 4 + .../bsl/sonar/ext_issues/RulesFile.java | 5 + src/main/resources/edt.json | 1104 ++++++++++++++--- .../sonar/ext_issues/RuleDefinitionTest.java | 6 +- 4 files changed, 974 insertions(+), 145 deletions(-) diff --git a/docs/index.md b/docs/index.md index 3adc0323..2d7bb868 100644 --- a/docs/index.md +++ b/docs/index.md @@ -171,3 +171,7 @@ Cвойство `sonar.bsl.acc.accRulesPaths`. Правила из постав Cвойство `sonar.bsl.acc.createExternalIssues`. Определяет как поступить с ошибками, которые были в файле, но для них не было найдено активного правила. Для фильтрации ошибок поступающих от АПК на строне sonarqube потребуется отключить свойство. + +## Интеграция с 1C:EDT + +Стоит воспользоваться утилитой конвертации отчета EDT в формат понятный плагину [edt-ripper](https://github.com/bia-technologies/edt_ripper) diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java index 51fcfd06..c7fcc385 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java @@ -79,5 +79,10 @@ public static class Rule { * Время на исправление (в минутах) */ int effortMinutes; + + /** + * Идентификатор правила внешней системы + */ + String internalCode; } } diff --git a/src/main/resources/edt.json b/src/main/resources/edt.json index 28989c7b..968542a0 100644 --- a/src/main/resources/edt.json +++ b/src/main/resources/edt.json @@ -1,364 +1,1184 @@ { "Rules": [ + { + "Code": "edt-001", + "InternalCode": "Переменная %1 не определена", + "Name": "Переменная %1 не определена", + "Description": "\n\n\n\n

Например, имеем следущий код в модулях конфигурации:

\n
ШаблонТекста = НСтр(\"ru='Первый параметр %1, второй параметр %2'\");
Текст = СтроковыеФункцииКлиентСервер.ПодставитьПараметрыВСтроку(ШаблонТекста, 1, 2);
\n

Избавимся от прослойки вызовов и лишних методов с помощью метода СтрШаблон():

\n
ШаблонТекста = НСтр(\"ru='Первый параметр %1, второй параметр %2'\");
Текст = СтрШаблон(ШаблонТекста, 1, 2);
\n

Конфигурация не всегда сразу полностью переводится на другой язык. И, если в системе будет работать пользователь, у которого будет установлен язык не RU, то первый код отработает корректно, а второй выдаст ошибку исполнения.

\n

Во втором случае локализованной строки нет, следовательно, параметров в строке нет,  следовательно, возникает ошибка исполнения.

\n

В связи с этим, в модулях конфигураций принято решение не использовать СтрШаблон() до исправления ошибки платформы.

", + "Type": "BUG", + "Severity": "CRITICAL", + "EffortMinutes": 1, + "Active": true + }, { "Code": "EDT-2", - "Name": "Возвращает тип, который имеет отличное окружение от контекста вызова", + "InternalCode": "com.e1c.v8codestyle.bsl:invocation-form-event-handler", + "Name": "Программный вызов обработчика события формы", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "INFO", "Active": true, - "EffortMinutes": 1 + "EffortMinutes": 3 }, { "Code": "EDT-3", - "Name": "Возможно, выражение не является объектом коллекции", + "InternalCode": "com.e1c.v8codestyle.bsl:empty-except-statement", + "Name": "не содержит кода в исключении", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 1 + "EffortMinutes": 3 }, { "Code": "EDT-4", - "Name": "Возможно, недостижимое выражение", + "InternalCode": "Возвращает тип, который имеет отличное окружение от контекста вызова", + "Name": "Возвращает тип, который имеет отличное окружение от контекста вызова", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-5", - "Name": "Неиспользуемая локальная переменная", + "InternalCode": "Возможно, выражение не является объектом коллекции", + "Name": "Возможно, выражение не является объектом коллекции", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-6", - "Name": "Возможно, строковый литерал содержит ошибку", + "InternalCode": "Возможно, недостижимое выражение", + "Name": "Возможно, недостижимое выражение", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "INFO", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 1 + "EffortMinutes": 3 }, { "Code": "EDT-7", - "Name": "Менеджер записи не может быть использован для регистра с режимом записи", + "InternalCode": "com.e1c.v8codestyle.bsl:module-unused-local-variable", + "Name": "Возможно, переменная еще не была проинициализирована", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-8", - "Name": "Метод устарел", + "InternalCode": "Возможно, строковый литерал содержит ошибку", + "Name": "Возможно, строковый литерал содержит ошибку", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-9", - "Name": "Неизвестное имя типа", + "InternalCode": "com.e1c.v8codestyle.bsl:new-color", + "Name": "Для изменения оформления следует использовать элементы стиля, а не задавать конкретные значения непосредственно в элементах управления", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-10", - "Name": "Неиспользуемый локальный метод", + "InternalCode": "Для объекта определен ручной порядок подсистем, но подсистема отсутствует в порядке подсистем", + "Name": "Для объекта определен ручной порядок подсистем, но подсистема отсутствует в порядке подсистем", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-11", - "Name": "Нельзя передавать объект типа между клиентом и сервером", + "InternalCode": "com.e1c.v8codestyle.md:mdo-scheduled-job-description", + "Name": "Задано наименование предопределенного регламентного задания", "Description": "Отсутствует", "Type": "BUG", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-12", - "Name": "Нельзя присваивать атрибуту формы значение типа", + "InternalCode": "com.e1c.v8codestyle.bsl:use-non-recommended-method", + "Name": "Используется не рекомендуемый метод", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-13", - "Name": "Нет соответствия между ожидаемыми типами", + "InternalCode": "com.e1c.v8codestyle.bsl:using-isinrole", + "Name": "Используйте функцию вместо", "Description": "Отсутствует", "Type": "CODE_SMELL", "Severity": "MINOR", "Active": true, - "EffortMinutes": 1 + "EffortMinutes": 3 }, { "Code": "EDT-14", - "Name": "Объект данного тип не может быть создан через оператор", + "InternalCode": "com.e1c.v8codestyle.bsl:structure-consructor-too-many-keys", + "Name": "Конструктор структуры содержит более чем 5 ключей", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-15", - "Name": "Пустой метод модуля", + "InternalCode": "Менеджер записи не может быть использован для регистра с режимом записи", + "Name": "Менеджер записи не может быть использован для регистра с режимом записи", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "INFO", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 1 + "EffortMinutes": 3 }, { "Code": "EDT-16", - "Name": "Свойство объекта не обнаружено", + "InternalCode": "com.e1c.v8codestyle.bsl:lock-out-of-try", + "Name": "Метод Заблокировать() вне блока Попытка-Исключение", "Description": "Отсутствует", "Type": "CODE_SMELL", "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-17", - "Name": "Свойство устарело", + "InternalCode": "com.e1c.v8codestyle.bsl:module-accessibility-at-client", + "Name": "Метод доступен НаКлиенте", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-18", - "Name": "Тип устарел", + "InternalCode": "Метод устарел", + "Name": "Метод устарел", "Description": "Отсутствует", "Type": "CODE_SMELL", - "Severity": "MAJOR", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-19", - "Name": "Функция должна возвращать значение", + "InternalCode": "com.e1c.v8codestyle.bsl:bsl-nstr-string-literal-format", + "Name": "НСтр метод должен принимать строку первым параметром", "Description": "Отсутствует", - "Type": "BUG", + "Type": "CODE_SMELL", "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-20", - "Name": "Элемент с таким именем уже есть в глобальном контексте", + "InternalCode": "Не рекомендуется создавать подсистемы глубиной вложенности более трех", + "Name": "Не рекомендуется создавать подсистемы глубиной вложенности более трех", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-21", - "Name": "Код никогда не будет скомпилирован", + "InternalCode": "com.e1c.v8codestyle.bsl:export-method-in-command-form-module", + "Name": "Не следует размещать экспортные процедуры и функции в модулях команд и форм. К этим модулям нет возможности обращаться из внешнего по отношению к ним кода, поэтому экспортные процедуры и функции в этих модулях не имеют смысла.", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-22", - "Name": "Недостаточное число параметров", + "InternalCode": "Неизвестное имя типа", + "Name": "Неизвестное имя типа", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-23", - "Name": "Неизвестный оператор", + "InternalCode": "com.e1c.v8codestyle.bsl:module-unused-method", + "Name": "Неиспользуемый метод", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-24", - "Name": "Переменная не определена", + "InternalCode": "Некорректное значение свойства XDTO-пакета. Пространство имен пакета совпадает с пространством имен пакета", + "Name": "Некорректное значение свойства XDTO-пакета. Пространство имен пакета совпадает с пространством имен пакета", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-25", - "Name": "Процедура или функция не определена", + "InternalCode": "Нельзя передавать объект типа между клиентом и сервером", + "Name": "Нельзя передавать объект типа между клиентом и сервером", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-26", - "Name": "Свойство не предназначено для записи у типа", + "InternalCode": "Нельзя присваивать атрибуту формы значение типа", + "Name": "Нельзя присваивать атрибуту формы значение типа", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-27", - "Name": "Синтаксическая ошибка. Неверный ввод - ожидается", + "InternalCode": "Нет соответствия между ожидаемыми типами", + "Name": "Нет соответствия между ожидаемыми типами", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "MAJOR", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-28", - "Name": "Синтаксическая ошибка. Недопустимая лексема в данном контексте", + "InternalCode": "Объект данного тип не может быть создан через оператор", + "Name": "Объект данного тип не может быть создан через оператор", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "MAJOR", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-29", - "Name": "Синтаксическая ошибка. Неизвестная лексема", + "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-procedure-return-section", + "Name": "Описание процедуры не должно содержать блок", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-30", - "Name": "Синтаксическая ошибка. Пропущена лексема y", + "InternalCode": "com.e1c.v8codestyle.bsl:event-heandler-boolean-param", + "Name": "Параметр должен устанавливаться в Ложь, но выражение может заменить текущее значение в Истина", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-31", - "Name": "Слишком много параметров", + "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-parameter-section", + "Name": "Пропущено определение параметра для", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-32", - "Name": "Слишком много параметров для типа(ов)", + "InternalCode": "com.e1c.v8codestyle.bsl:module-empty-method", + "Name": "Пустой метод", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-33", - "Name": "Тип неопределен", + "InternalCode": "Свойство объекта не обнаружено", + "Name": "Свойство объекта не обнаружено", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "MAJOR", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-34", - "Name": "Функция не определена", + "InternalCode": "Свойство устарело", + "Name": "Свойство устарело", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-35", - "Name": "Данный модуль не поддерживает данный тип директив компиляции", + "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-ref-link", + "Name": "Ссылка на несуществующий объект", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "MAJOR", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 5 + "EffortMinutes": 3 }, { "Code": "EDT-36", - "Name": "Данный модуль может содержать только процедуры и функции", + "InternalCode": "com.e1c.v8codestyle.ql:ql-camel-case-string-literal", + "Name": "Строковый литерал содержит не CamelCase символы", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-37", - "Name": "Недостаточное число параметров для типа(ов)", + "InternalCode": "Тип устарел", + "Name": "Тип устарел", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-38", - "Name": "Оператор может использоваться только внутри процедур и функций", + "InternalCode": "com.e1c.v8codestyle.form:input-field-list-choice-mode", + "Name": "У поля ввода формы с заполненным списком выбора отключено свойство", "Description": "Отсутствует", "Type": "BUG", - "Severity": "BLOCKER", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-39", - "Name": "Процедура вызывается как функция", + "InternalCode": "Функция должна возвращать значение", + "Name": "Функция должна возвращать значение", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "CRITICAL", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-40", - "Name": "Синтаксическая ошибка. Неверная лексема - ожидается ", + "InternalCode": "Элемент с таким именем уже есть в глобальном контексте", + "Name": "Элемент с таким именем уже есть в глобальном контексте", "Description": "Отсутствует", - "Type": "BUG", - "Severity": "BLOCKER", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 }, { "Code": "EDT-41", - "Name": "Синтаксическая ошибка. Пропущена лексема", + "InternalCode": "com.e1c.dt.check.form:form-named-element-name", + "Name": "Имя именованного элемента формы пустое", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-42", + "InternalCode": "com.e1c.v8codestyle.bsl:form-module-pragma", + "Name": "Использована директива компиляции модуля формы", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-43", + "InternalCode": "com.e1c.v8codestyle.ql:ql-temp-table-index", + "Name": "Новая временная таблица должна содержать индексы", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-44", + "InternalCode": "com.e1c.v8codestyle.bsl:notify-description-to-server-procedure", + "Name": "Описание оповещения на серверную процедуру", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-45", + "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-export-function-return-section", + "Name": "Описание экспортируемой функции должно содержать блок", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-46", + "InternalCode": "com.e1c.v8codestyle.ql:ql-virtual-table-filters", + "Name": "Отбор ABCXYZКлассификацияКлиентовСрезПоследних.ТипКлассификации для виртуальной таблицы ABCXYZКлассификацияКлиентовСрезПоследних должен быть в параметрах", "Description": "Отсутствует", "Type": "BUG", - "Severity": "BLOCKER", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-47", + "InternalCode": "com.e1c.v8codestyle.bsl:data-exchange-load", + "Name": "Отсутствует обязательная проверка признака ОбменДанными.Загрузка в обработчике события", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-48", + "InternalCode": "com.e1c.v8codestyle.md:shceduled-job-periodicity-too-short", + "Name": "Периодичность выполнения регламентного задания меньше 60сек", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-49", + "InternalCode": "com.e1c.v8codestyle.right:right-start-web-client", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-50", + "InternalCode": "com.e1c.v8codestyle.right:right-output-to-printer-file-clipboard", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-51", + "InternalCode": "com.e1c.v8codestyle.right:right-interactive-set-deletion-mark-predefined-data", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-52", + "InternalCode": "com.e1c.v8codestyle.right:right-interactive-clear-deletion-mark-predefined-data", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-53", + "InternalCode": "com.e1c.v8codestyle.right:right-interactive-delete", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-54", + "InternalCode": "com.e1c.v8codestyle.right:right-interactive-delete-marked-predefined-data", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-55", + "InternalCode": "com.e1c.v8codestyle.right:right-interactive-delete-predefined-data", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-56", + "InternalCode": "com.e1c.v8codestyle.right:right-exclusive-mode", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-57", + "InternalCode": "com.e1c.v8codestyle.right:right-save-user-data", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-58", + "InternalCode": "com.e1c.v8codestyle.right:right-start-thin-client", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-59", + "InternalCode": "com.e1c.v8codestyle.bsl:form-module-missing-pragma", + "Name": "Пропущена директива компиляции", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-60", + "InternalCode": "com.e1c.dt.check.form:form-data-path", + "Name": "Свойство имеет некорректное значение", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-61", + "InternalCode": "com.e1c.v8codestyle.ql:ql-join-to-sub-query", + "Name": "Соединение в запросе с подзапросом не разрешено", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-62", + "InternalCode": "com.e1c.v8codestyle.bsl:module-structure-top-region", + "Name": "Стандартная область структуры модуля является вложенной", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-63", + "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-use-minus", + "Name": "Только символ дефис-минуса разрешено использовать в документирующем комментарии, но найдено", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-64", + "InternalCode": "com.e1c.v8codestyle.md:common-module-name-global", + "Name": "Глобальный общий модуль должен оканчиваться на суффикс", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "CRITICAL", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-65", + "InternalCode": "com.e1c.v8codestyle.md:mdo-name-length", + "Name": "Длина имени объекта метаданного должна быть меньше чем 80", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "CRITICAL", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-66", + "InternalCode": "com.e1c.v8codestyle.bsl:query-in-loop", + "Name": "Цикл содержит вызов метода с запросом", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "CRITICAL", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-67", + "InternalCode": "Can be only one default item in root subgroup", + "Name": "Can be only one default item in root subgroup", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-68", + "InternalCode": "Duplicate id", + "Name": "Duplicate id", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-69", + "InternalCode": "Для команды категория группы команд по умолчанию может быть только Панель навигации или Панель действий", + "Name": "Для команды категория группы команд по умолчанию может быть только Панель навигации или Панель действий", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-70", + "InternalCode": "Для команды формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", + "Name": "Для команды формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-71", + "InternalCode": "Для события элемента формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", + "Name": "Для события элемента формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-72", + "InternalCode": "Для события формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", + "Name": "Для события формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-73", + "InternalCode": "Код никогда не будет скомпилирован", + "Name": "Код никогда не будет скомпилирован", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-74", + "InternalCode": "Лексическое значение значения по умолчанию не соответствует типу \"{http", + "Name": "Лексическое значение значения по умолчанию не соответствует типу \"{http", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-75", + "InternalCode": "Не найден обработчик для Подписки на событие", + "Name": "Не найден обработчик для Подписки на событие", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-76", + "InternalCode": "Не найден обработчик для Регламентного задания", + "Name": "Не найден обработчик для Регламентного задания", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-77", + "InternalCode": "Недостаточное число параметров", + "Name": "Недостаточное число параметров", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-78", + "InternalCode": "Некорректное значение свойства характеристики. Значение свойства не определено", + "Name": "Некорректное значение свойства характеристики. Значение свойства не определено", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-79", + "InternalCode": "Некорректное значение свойства. Дублирование имени объекта метаданных", + "Name": "Некорректное значение свойства. Дублирование имени объекта метаданных", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-80", + "InternalCode": "Некорректный тип параметра для стандартной команды. Допустимые типы, а получены", + "Name": "Некорректный тип параметра для стандартной команды. Допустимые типы, а получены", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-81", + "InternalCode": "Неподдерживаемый оператор", + "Name": "Неподдерживаемый оператор", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-82", + "InternalCode": "Переменная не определена", + "Name": "Переменная не определена", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-83", + "InternalCode": "Поле связи параметра выбора не указано или некорректно", + "Name": "Поле связи параметра выбора не указано или некорректно", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-84", + "InternalCode": "Поле связи параметра выбора не является допустимым", + "Name": "Поле связи параметра выбора не является допустимым", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-85", + "InternalCode": "Процедура или функция не определена", + "Name": "Процедура или функция не определена", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-86", + "InternalCode": "Процедура или функция с таким именем уже определена", + "Name": "Процедура или функция с таким именем уже определена", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-87", + "InternalCode": "Свойство не предназначено для записи у типа", + "Name": "Свойство не предназначено для записи у типа", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-88", + "InternalCode": "Синтаксическая ошибка. Недопустимая лексема в данном контексте", + "Name": "Синтаксическая ошибка. Недопустимая лексема в данном контексте", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-89", + "InternalCode": "Синтаксическая ошибка. Пропущена лексема у", + "Name": "Синтаксическая ошибка. Пропущена лексема у", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-90", + "InternalCode": "Слишком много параметров", + "Name": "Слишком много параметров", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-91", + "InternalCode": "Слишком много параметров для типа(ов)", + "Name": "Слишком много параметров для типа(ов)", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-92", + "InternalCode": "Тип не может иметь фасет", + "Name": "Тип не может иметь фасет", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-93", + "InternalCode": "Тип неопределен", + "Name": "Тип неопределен", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-94", + "InternalCode": "Функция не определена", + "Name": "Функция не определена", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-95", + "InternalCode": "Этот тип не может входить в состав составного типа", + "Name": "Этот тип не может входить в состав составного типа", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MAJOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-96", + "InternalCode": "Данный модуль не поддерживает данный тип директив компиляции", + "Name": "Данный модуль не поддерживает данный тип директив компиляции", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-97", + "InternalCode": "com.e1c.v8codestyle.right:right-view-event-log", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-98", + "InternalCode": "com.e1c.v8codestyle.right:right-interactive-open-external-data-processors", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-99", + "InternalCode": "com.e1c.v8codestyle.right:right-interactive-open-external-reports", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-100", + "InternalCode": "com.e1c.v8codestyle.md:common-module-name-client-server", + "Name": "Клиент-серверный общий модуль должен оканчиваться на суффикс", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-101", + "InternalCode": "Duplicate column name", + "Name": "Duplicate column name", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-102", + "InternalCode": "Duplicate content", + "Name": "Duplicate content", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-103", + "InternalCode": "Illegal ShortCut", + "Name": "Illegal ShortCut", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-104", + "InternalCode": "Данный модуль может содержать только процедуры и функции", + "Name": "Данный модуль может содержать только процедуры и функции", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-105", + "InternalCode": "Недостаточное число параметров для типа(ов)", + "Name": "Недостаточное число параметров для типа(ов)", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-106", + "InternalCode": "Неизвестный оператор", + "Name": "Неизвестный оператор", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-107", + "InternalCode": "Некорректное значение свойства. Указан нумератор. Свойства документа должны совпадать с соответствующими свойствами нумератора.", + "Name": "Некорректное значение свойства. Указан нумератор. Свойства документа должны совпадать с соответствующими свойствами нумератора.", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-108", + "InternalCode": "Некорректное значение свойства реквизита. Тип использования реквизита противоречит выбранному типу иерархии", + "Name": "Некорректное значение свойства реквизита. Тип использования реквизита противоречит выбранному типу иерархии", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-109", + "InternalCode": "Оператор может использоваться только внутри процедур и функций", + "Name": "Оператор может использоваться только внутри процедур и функций", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-110", + "InternalCode": "Процедура вызывается как функция", + "Name": "Процедура вызывается как функция", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-111", + "InternalCode": "Синтаксическая ошибка. Неверная лексема - ожидается", + "Name": "Синтаксическая ошибка. Неверная лексема - ожидается", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-112", + "InternalCode": "Синтаксическая ошибка. Неверный ввод - ожидается", + "Name": "Синтаксическая ошибка. Неверный ввод - ожидается", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-113", + "InternalCode": "Указанный обработчик события не существует", + "Name": "Указанный обработчик события не существует", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-114", + "InternalCode": "Встроенная функция может быть использована только в выражении.", + "Name": "Встроенная функция может быть использована только в выражении.", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-115", + "InternalCode": "Ошибочный порядок грамматических элементов", + "Name": "Ошибочный порядок грамматических элементов", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-116", + "InternalCode": "Синтаксическая ошибка. Неверный ввод", + "Name": "Синтаксическая ошибка. Неверный ввод", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-117", + "InternalCode": "Тип не определен", + "Name": "Тип не определен", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-118", + "InternalCode": "Синтаксическая ошибка. Неизвестная лексема", + "Name": "Синтаксическая ошибка. Неизвестная лексема", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", "Active": true, - "EffortMinutes": 10 + "EffortMinutes": 3 } ] -} +} \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java index 1cae3928..7065267b 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java @@ -46,7 +46,7 @@ void testDefine() { assertThat(context.repositories()).hasSize(1); var repository = context.repository(reporter.getRepositoryKey()); assertThat(repository).isNotNull(); - assertThat(repository.rules()).hasSize(40); + assertThat(repository.rules()).hasSize(118); } @Test @@ -62,7 +62,7 @@ void testEmptyExternalFilePath() { assertThat(context.repositories()).hasSize(1); var repository = context.repository(reporter.getRepositoryKey()); assertThat(repository).isNotNull(); - assertThat(repository.rules()).hasSize(40); + assertThat(repository.rules()).hasSize(118); } @Test @@ -84,7 +84,7 @@ void testExternalFile() { assertThat(context.repositories()).hasSize(1); var repository = context.repository(reporter.getRepositoryKey()); assertThat(repository).isNotNull(); - assertThat(repository.rules()).hasSize(44); + assertThat(repository.rules()).hasSize(122); } } From fdfb8fbcdfc106e5f0bedfd6fc68874c97022c3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 02:18:27 +0000 Subject: [PATCH 22/82] Bump progressbar from 0.9.4 to 0.9.5 Bumps [progressbar](https://github.com/ctongfei/progressbar) from 0.9.4 to 0.9.5. - [Release notes](https://github.com/ctongfei/progressbar/releases) - [Changelog](https://github.com/ctongfei/progressbar/blob/main/CHANGELOG.md) - [Commits](https://github.com/ctongfei/progressbar/commits) --- updated-dependencies: - dependency-name: me.tongfei:progressbar dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b149e037..29afc5b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { implementation("com.atlassian.commonmark", "commonmark-ext-autolink", commonmarkVersion) implementation("com.atlassian.commonmark", "commonmark-ext-heading-anchor", commonmarkVersion) - implementation("me.tongfei:progressbar:0.9.4") + implementation("me.tongfei:progressbar:0.9.5") compileOnly("com.google.code.findbugs:jsr305:3.0.2") From 62b2cb9da592a19c419b6dfa4df3be926a857c65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Oct 2022 02:15:29 +0000 Subject: [PATCH 23/82] Bump jackson-databind from 2.13.4 to 2.13.4.2 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.4 to 2.13.4.2. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 29afc5b2..8a717ea1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("io.github.1c-syntax", "bsl-language-server", "0.20.0") implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4") + implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.28.0.1058") From 11e4b0f7ca13785dbc90f54321abb148110f79b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Oct 2022 02:18:34 +0000 Subject: [PATCH 24/82] Bump sonar-analyzer-commons from 1.28.0.1058 to 2.0.0.1075 Bumps [sonar-analyzer-commons](https://github.com/SonarSource/sonar-analyzer-commons) from 1.28.0.1058 to 2.0.0.1075. - [Release notes](https://github.com/SonarSource/sonar-analyzer-commons/releases) - [Commits](https://github.com/SonarSource/sonar-analyzer-commons/compare/1.28.0.1058...2.0.0.1075) --- updated-dependencies: - dependency-name: org.sonarsource.analyzer-commons:sonar-analyzer-commons dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8a717ea1..f798cd41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons - implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:1.28.0.1058") + implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.0.0.1075") // MD to HTML converter of BSL LS rule descriptions implementation("com.atlassian.commonmark", "commonmark", commonmarkVersion) From d1dcb7f4647e3737ea028a18ef08d86fe3c6c28c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Oct 2022 02:18:03 +0000 Subject: [PATCH 25/82] Bump com.github.ben-manes.versions from 0.42.0 to 0.43.0 Bumps com.github.ben-manes.versions from 0.42.0 to 0.43.0. --- updated-dependencies: - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f798cd41..7d3fb3e0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("org.sonarqube") version "3.4.0.2513" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") - id("com.github.ben-manes.versions") version "0.42.0" + id("com.github.ben-manes.versions") version "0.43.0" id("com.github.gradle-git-version-calculator") version "1.1.0" id("io.freefair.lombok") version "6.5.1" } From 8aff7fbc307adcae7a207e63f55ed96ced09ad33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 02:26:26 +0000 Subject: [PATCH 26/82] Bump actions/setup-java from 3.5.1 to 3.6.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.5.1...v3.6.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 77312fa6..1db009e7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.5.1 + uses: actions/setup-java@v3.6.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index 25a9416d..2a9f09f2 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.5.1 + uses: actions/setup-java@v3.6.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 6d6ef888..d2951bc8 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.5.1 + uses: actions/setup-java@v3.6.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 586049db..72d9b042 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.5.1 + uses: actions/setup-java@v3.6.0 with: java-version: 11 distribution: 'adopt' From 81c78599deecf921b38b1fd0f9e1adab166e5c47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 02:21:37 +0000 Subject: [PATCH 27/82] Bump mockito-core from 4.8.0 to 4.8.1 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7d3fb3e0..0c7c4a3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.mockito:mockito-core:4.8.0") + testImplementation("org.mockito:mockito-core:4.8.1") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From e1d550e34cd12125ed706970741a8110b5fcd980 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Oct 2022 02:19:26 +0000 Subject: [PATCH 28/82] Bump org.sonarqube from 3.4.0.2513 to 3.5.0.2730 Bumps org.sonarqube from 3.4.0.2513 to 3.5.0.2730. --- updated-dependencies: - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 0c7c4a3c..ac410905 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { jacoco java `maven-publish` - id("org.sonarqube") version "3.4.0.2513" + id("org.sonarqube") version "3.5.0.2730" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.43.0" From 9474959295feae08768e0a403a7f938f476430df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 02:21:48 +0000 Subject: [PATCH 29/82] Bump sonar-analyzer-commons from 2.0.0.1075 to 2.0.1.1099 Bumps [sonar-analyzer-commons](https://github.com/SonarSource/sonar-analyzer-commons) from 2.0.0.1075 to 2.0.1.1099. - [Release notes](https://github.com/SonarSource/sonar-analyzer-commons/releases) - [Commits](https://github.com/SonarSource/sonar-analyzer-commons/compare/2.0.0.1075...2.0.1.1099) --- updated-dependencies: - dependency-name: org.sonarsource.analyzer-commons:sonar-analyzer-commons dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ac410905..94736145 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons - implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.0.0.1075") + implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.0.1.1099") // MD to HTML converter of BSL LS rule descriptions implementation("com.atlassian.commonmark", "commonmark", commonmarkVersion) From 1c9bfb5493e59f213d36ad554c48bc60991539ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Nov 2022 02:34:02 +0000 Subject: [PATCH 30/82] Bump sonar-analyzer-commons from 2.0.1.1099 to 2.1.0.1111 Bumps [sonar-analyzer-commons](https://github.com/SonarSource/sonar-analyzer-commons) from 2.0.1.1099 to 2.1.0.1111. - [Release notes](https://github.com/SonarSource/sonar-analyzer-commons/releases) - [Commits](https://github.com/SonarSource/sonar-analyzer-commons/compare/2.0.1.1099...2.1.0.1111) --- updated-dependencies: - dependency-name: org.sonarsource.analyzer-commons:sonar-analyzer-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 94736145..2bb7f34e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons - implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.0.1.1099") + implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.1.0.1111") // MD to HTML converter of BSL LS rule descriptions implementation("com.atlassian.commonmark", "commonmark", commonmarkVersion) From cc498c3478cd01c430e832cd10dfebc10fff77d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Nov 2022 02:07:12 +0000 Subject: [PATCH 31/82] Bump com.github.ben-manes.versions from 0.43.0 to 0.44.0 Bumps com.github.ben-manes.versions from 0.43.0 to 0.44.0. --- updated-dependencies: - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 94736145..82ee48df 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("org.sonarqube") version "3.5.0.2730" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") - id("com.github.ben-manes.versions") version "0.43.0" + id("com.github.ben-manes.versions") version "0.44.0" id("com.github.gradle-git-version-calculator") version "1.1.0" id("io.freefair.lombok") version "6.5.1" } From 509eb54d7ea12c65ef905c415e97b5a3250dcb70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Nov 2022 02:02:50 +0000 Subject: [PATCH 32/82] Bump mockito-core from 4.8.1 to 4.9.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.9.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.9.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 94736145..653f651d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.mockito:mockito-core:4.8.1") + testImplementation("org.mockito:mockito-core:4.9.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 800904d5fc95665d1a68b68444f7f53e403c7b42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Nov 2022 02:10:48 +0000 Subject: [PATCH 33/82] Bump WebFreak001/deploy-nightly from 1.2.0 to 2.0.0 Bumps [WebFreak001/deploy-nightly](https://github.com/WebFreak001/deploy-nightly) from 1.2.0 to 2.0.0. - [Release notes](https://github.com/WebFreak001/deploy-nightly/releases) - [Commits](https://github.com/WebFreak001/deploy-nightly/compare/v1.2.0...v2.0.0) --- updated-dependencies: - dependency-name: WebFreak001/deploy-nightly dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/night_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index 2a9f09f2..1292f8df 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -28,7 +28,7 @@ jobs: - name: Save current date run: echo "PLUGIN_CURRENT_DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV - name: Deploy build - uses: WebFreak001/deploy-nightly@v1.2.0 + uses: WebFreak001/deploy-nightly@v2.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 218182c82c4dfe6d409892765db18f367a48f7fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 02:03:36 +0000 Subject: [PATCH 34/82] Bump actions/setup-java from 3.6.0 to 3.7.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.6.0...v3.7.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1db009e7..e20e7671 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.7.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index 2a9f09f2..f7d061ce 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.7.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index d2951bc8..05adbfb5 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.7.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 72d9b042..0febe5a7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.7.0 with: java-version: 11 distribution: 'adopt' From d0a8d6c75ef60cef23aef0e2ee6bb36345e79628 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 02:03:40 +0000 Subject: [PATCH 35/82] Bump io.freefair.lombok from 6.5.1 to 6.6 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.5.1 to 6.6. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.5.1...6.6) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 63d6e424..71c9cb33 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.44.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.5.1" + id("io.freefair.lombok") version "6.6" } group = "io.github.1c-syntax" From b10349e3179baeb149b66af7897eb0cf6395559e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 08:44:40 +0000 Subject: [PATCH 36/82] Bump jackson-databind from 2.13.4.2 to 2.14.1 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.4.2 to 2.14.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 947eda77..52433d1f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("io.github.1c-syntax", "bsl-language-server", "0.20.0") implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.13.4.2") + implementation("com.fasterxml.jackson.core:jackson-databind:2.14.1") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.1.0.1111") From 9d41766fcb87744c42759fede0c69195d389bd6a Mon Sep 17 00:00:00 2001 From: theshadowco Date: Tue, 6 Dec 2022 11:57:13 +0300 Subject: [PATCH 37/82] revert java-setup action --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- .gitignore | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e20e7671..1db009e7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.7.0 + uses: actions/setup-java@v3.6.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index eb572520..1292f8df 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.7.0 + uses: actions/setup-java@v3.6.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 05adbfb5..d2951bc8 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.7.0 + uses: actions/setup-java@v3.6.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0febe5a7..72d9b042 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.7.0 + uses: actions/setup-java@v3.6.0 with: java-version: 11 distribution: 'adopt' diff --git a/.gitignore b/.gitignore index 14edc643..8ee70ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ gen/ /.idea/jarRepositories.xml /.idea/vcs.xml /.idea/compiler.xml +/.idea/inspectionProfiles/Project_Default.xml From 18f4d85936b8306e4c06d993f2d175a68ec04d98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Dec 2022 02:03:51 +0000 Subject: [PATCH 38/82] Bump actions/setup-java from 3.6.0 to 3.8.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.6.0 to 3.8.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.6.0...v3.8.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1db009e7..ec1d5d98 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.8.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index 1292f8df..879d976d 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.8.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index d2951bc8..ea23e271 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.8.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 72d9b042..afc0de57 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.8.0 with: java-version: 11 distribution: 'adopt' From ca35b414bee6bd713c9f7126c952526654d7977c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Dec 2022 02:03:24 +0000 Subject: [PATCH 39/82] Bump actions/setup-java from 3.8.0 to 3.9.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.8.0 to 3.9.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.8.0...v3.9.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ec1d5d98..c53d3ce4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.8.0 + uses: actions/setup-java@v3.9.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index 879d976d..ca09af4c 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.8.0 + uses: actions/setup-java@v3.9.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index ea23e271..2021e9e3 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.8.0 + uses: actions/setup-java@v3.9.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index afc0de57..660bab75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.8.0 + uses: actions/setup-java@v3.9.0 with: java-version: 11 distribution: 'adopt' From 3dc0096a25c4c70ed4e94221247a96de2cf7fc91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 02:08:09 +0000 Subject: [PATCH 40/82] Bump io.freefair.lombok from 6.6 to 6.6.1 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.6 to 6.6.1. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.6...6.6.1) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 26832a58..0875d960 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.44.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.6" + id("io.freefair.lombok") version "6.6.1" } group = "io.github.1c-syntax" From 3ca279fef1d0606e856cda9368ad2b0ec5337f85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Dec 2022 02:03:39 +0000 Subject: [PATCH 41/82] Bump mockito-core from 4.9.0 to 4.11.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.9.0 to 4.11.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.9.0...v4.11.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 26832a58..4e94cdf5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.mockito:mockito-core:4.9.0") + testImplementation("org.mockito:mockito-core:4.11.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 0f6156f3c1fa0cb818343a1ce2675ce6c946dfcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jan 2023 02:04:33 +0000 Subject: [PATCH 42/82] Bump assertj-core from 3.23.1 to 3.24.0 Bumps assertj-core from 3.23.1 to 3.24.0. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4e94cdf5..deeca565 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.0") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") - testImplementation("org.assertj:assertj-core:3.23.1") + testImplementation("org.assertj:assertj-core:3.24.0") testImplementation("org.mockito:mockito-core:4.11.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) From 1be11c348c62bc55e9dda8f260a0b2983d0b44e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 02:10:35 +0000 Subject: [PATCH 43/82] Bump assertj-core from 3.24.0 to 3.24.1 Bumps assertj-core from 3.24.0 to 3.24.1. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index deeca565..fe9f0b6a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.0") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") - testImplementation("org.assertj:assertj-core:3.24.0") + testImplementation("org.assertj:assertj-core:3.24.1") testImplementation("org.mockito:mockito-core:4.11.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) From 3d5b58403a7417dce870cde51892b47af710edbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 02:02:51 +0000 Subject: [PATCH 44/82] Bump assertj-core from 3.24.1 to 3.24.2 Bumps assertj-core from 3.24.1 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index fe9f0b6a..5ec472f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.8.0") testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") - testImplementation("org.assertj:assertj-core:3.24.1") + testImplementation("org.assertj:assertj-core:3.24.2") testImplementation("org.mockito:mockito-core:4.11.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) From 9f0f66e9c8f504b87ad79e6774e8755c9f676772 Mon Sep 17 00:00:00 2001 From: Alexey Sosnoviy Date: Tue, 24 Jan 2023 11:45:39 +0300 Subject: [PATCH 45/82] happy new year --- .../com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java | 2 +- .../java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java | 2 +- .../java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java | 2 +- src/main/java/com/github/_1c_syntax/bsl/sonar/BSLPlugin.java | 2 +- src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java | 2 +- .../bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java | 2 +- .../com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java | 2 +- .../com/github/_1c_syntax/bsl/sonar/ext_issues/EdtReporter.java | 2 +- .../_1c_syntax/bsl/sonar/ext_issues/ExternalReporters.java | 2 +- .../bsl/sonar/ext_issues/QualityProfilesContainer.java | 2 +- .../com/github/_1c_syntax/bsl/sonar/ext_issues/Reporter.java | 2 +- .../bsl/sonar/ext_issues/RuleDefinitionsContainer.java | 2 +- .../com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java | 2 +- .../github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java | 2 +- .../_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java | 2 +- .../github/_1c_syntax/bsl/sonar/ext_issues/package-info.java | 2 +- .../com/github/_1c_syntax/bsl/sonar/language/BSLLanguage.java | 2 +- .../bsl/sonar/language/BSLLanguageServerRuleDefinition.java | 2 +- .../github/_1c_syntax/bsl/sonar/language/BSLQualityProfile.java | 2 +- .../com/github/_1c_syntax/bsl/sonar/language/package-info.java | 2 +- src/main/java/com/github/_1c_syntax/bsl/sonar/package-info.java | 2 +- .../java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java | 2 +- .../com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java | 2 +- .../java/com/github/_1c_syntax/bsl/sonar/BSLPluginTest.java | 2 +- .../java/com/github/_1c_syntax/bsl/sonar/IssuesLoaderTest.java | 2 +- .../bsl/sonar/LanguageServerDiagnosticsLoaderSensorTest.java | 2 +- src/test/java/com/github/_1c_syntax/bsl/sonar/Tools.java | 2 +- .../_1c_syntax/bsl/sonar/ext_issues/ExternalReportersTest.java | 2 +- .../_1c_syntax/bsl/sonar/ext_issues/QualityProfileTest.java | 2 +- .../_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java | 2 +- .../bsl/sonar/language/BSLLanguageServerRuleDefinitionTest.java | 2 +- .../github/_1c_syntax/bsl/sonar/language/BSLLanguageTest.java | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java index dfa15722..778a9287 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCommunityProperties.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java index 5acbca94..b5df89c2 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java index 3bb5856f..c546f189 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLPlugin.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLPlugin.java index 9ae1d79e..ff3a7235 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLPlugin.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLPlugin.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java index 8af7a624..e75d7b6e 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java index f88960ec..70ab4a8a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java index b7efa231..6e1a1fc6 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/EdtReporter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/EdtReporter.java index 8d8a6913..6aa82e86 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/EdtReporter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/EdtReporter.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReporters.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReporters.java index 7649bba4..a70bae91 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReporters.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReporters.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfilesContainer.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfilesContainer.java index 362d11c9..f5f2598b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfilesContainer.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfilesContainer.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/Reporter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/Reporter.java index 9576cd0e..83e109a6 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/Reporter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/Reporter.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java index 704378ea..5cfb6a2c 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java index c7fcc385..7d3f61cd 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFile.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java index 20045608..66daff81 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java index 01c18edb..8db0cf90 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/package-info.java index 316ca4dc..12805272 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/package-info.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/package-info.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguage.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguage.java index b31c1ba3..55035894 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguage.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguage.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java index 9699403e..08a0765e 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLQualityProfile.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLQualityProfile.java index 586cb81a..08a7942d 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLQualityProfile.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLQualityProfile.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/package-info.java index bb01b4c3..67a7872e 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/package-info.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/package-info.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/package-info.java index c8fc5847..9f0d71eb 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/package-info.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/package-info.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java index 9aff2553..ffc42640 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java index c8ba2e0f..764b8548 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLPluginTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLPluginTest.java index 22ca386d..1126cb81 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLPluginTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLPluginTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/IssuesLoaderTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/IssuesLoaderTest.java index d8c0799a..b107ef07 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/IssuesLoaderTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/IssuesLoaderTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensorTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensorTest.java index ae2dcbd2..860fe6f3 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensorTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensorTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/Tools.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/Tools.java index 02fb90d6..14ed7c9e 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/Tools.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/Tools.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReportersTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReportersTest.java index d99fcc20..f336ef79 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReportersTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/ExternalReportersTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfileTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfileTest.java index 840f1645..8520efb4 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfileTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/QualityProfileTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java index 7065267b..66d987a9 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinitionTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinitionTest.java index 3fff54f4..4782b131 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinitionTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinitionTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageTest.java index 62ba2b7b..0195e776 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageTest.java @@ -1,7 +1,7 @@ /* * This file is a part of SonarQube 1C (BSL) Community Plugin. * - * Copyright (c) 2018-2022 + * Copyright (c) 2018-2023 * Alexey Sosnoviy , Nikita Fedkin * * SPDX-License-Identifier: LGPL-3.0-or-later From ed833e0eda6efe1463cac9211380a109e3dd12ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Jan 2023 11:46:26 +0000 Subject: [PATCH 46/82] Bump mockito-core from 4.11.0 to 5.0.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 4.11.0 to 5.0.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v4.11.0...v5.0.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1f00df75..fd45b015 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:4.11.0") + testImplementation("org.mockito:mockito-core:5.0.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From cfc31fe2a5528e0f5b3bbb2bf8ebd93867b8d7cf Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Tue, 24 Jan 2023 15:27:59 +0300 Subject: [PATCH 47/82] Update qa.yml --- .github/workflows/qa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 2021e9e3..8b5c4a73 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -22,7 +22,7 @@ jobs: java-version: 11 distribution: 'adopt' - name: SonarCloud Scan - run: ./gradlew check sonarqube + run: ./gradlew check sonar env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 8e504a27fc29b9e7d0c3deb3411b32680653eb3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 02:17:19 +0000 Subject: [PATCH 48/82] Bump jackson-databind from 2.14.1 to 2.14.2 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.14.1 to 2.14.2. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index fd45b015..ab135831 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("io.github.1c-syntax", "bsl-language-server", "0.20.0") implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.14.1") + implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.1.0.1111") From da573fbb9933d37b29b45180cfe491d66c8172e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 02:17:35 +0000 Subject: [PATCH 49/82] Bump mockito-core from 5.0.0 to 5.1.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.0.0...v5.1.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index fd45b015..8b57309b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:5.0.0") + testImplementation("org.mockito:mockito-core:5.1.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 6e9c73c1bc6220dc22e23f8260b4b6ac95849f6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 Jan 2023 02:02:24 +0000 Subject: [PATCH 50/82] Bump org.mockito:mockito-core from 5.1.0 to 5.1.1 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.1.0...v5.1.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8b57309b..cb37119d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:5.1.0") + testImplementation("org.mockito:mockito-core:5.1.1") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 6eec5f3fe6c616f28fa4909ac488edaf6e0a3f77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 02:06:31 +0000 Subject: [PATCH 51/82] Bump com.github.ben-manes.versions from 0.44.0 to 0.45.0 Bumps com.github.ben-manes.versions from 0.44.0 to 0.45.0. --- updated-dependencies: - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index cb37119d..7ca830c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("org.sonarqube") version "3.5.0.2730" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") - id("com.github.ben-manes.versions") version "0.44.0" + id("com.github.ben-manes.versions") version "0.45.0" id("com.github.gradle-git-version-calculator") version "1.1.0" id("io.freefair.lombok") version "6.6.1" } From 243277e22adbdba87b5a83eb6f387b50b5c7d3d4 Mon Sep 17 00:00:00 2001 From: Artur Ayukhanov Date: Tue, 24 Jan 2023 10:14:28 +0300 Subject: [PATCH 52/82] =?UTF-8?q?=D0=A1=D0=BE=D0=BA=D1=80=D0=B0=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BD=D0=B0=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20EDT-21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/edt.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/edt.json b/src/main/resources/edt.json index 968542a0..908dc044 100644 --- a/src/main/resources/edt.json +++ b/src/main/resources/edt.json @@ -203,8 +203,8 @@ { "Code": "EDT-21", "InternalCode": "com.e1c.v8codestyle.bsl:export-method-in-command-form-module", - "Name": "Не следует размещать экспортные процедуры и функции в модулях команд и форм. К этим модулям нет возможности обращаться из внешнего по отношению к ним кода, поэтому экспортные процедуры и функции в этих модулях не имеют смысла.", - "Description": "Отсутствует", + "Name": "Не следует размещать экспортные процедуры и функции в модулях команд и форм.", + "Description": "Не следует размещать экспортные процедуры и функции в модулях команд и форм. К этим модулям нет возможности обращаться из внешнего по отношению к ним кода, поэтому экспортные процедуры и функции в этих модулях не имеют смысла.", "Type": "CODE_SMELL", "Severity": "MINOR", "Active": true, @@ -1181,4 +1181,4 @@ "EffortMinutes": 3 } ] -} \ No newline at end of file +} From 11e29e2cb721ac9542e47e02ef6c1ab3e7b48286 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 02:02:53 +0000 Subject: [PATCH 53/82] Bump actions/setup-java from 3.9.0 to 3.10.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.9.0...v3.10.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c53d3ce4..fc3102a7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.10.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index ca09af4c..d486a254 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.10.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 8b5c4a73..4dfb0b51 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 11 - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.10.0 with: java-version: 11 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 660bab75..f1492d4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.10.0 with: java-version: 11 distribution: 'adopt' From eb31f0198ec023cb359400ad738e3aa8b14505f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Feb 2023 03:13:06 +0000 Subject: [PATCH 54/82] Bump org.sonarqube from 3.5.0.2730 to 4.0.0.2929 Bumps org.sonarqube from 3.5.0.2730 to 4.0.0.2929. --- updated-dependencies: - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7ca830c8..644b406a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { jacoco java `maven-publish` - id("org.sonarqube") version "3.5.0.2730" + id("org.sonarqube") version "4.0.0.2929" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.45.0" From 9630804052019ed7e2255fabeb1e2c06499dc00e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 03:10:54 +0000 Subject: [PATCH 55/82] Bump io.freefair.lombok from 6.6.1 to 6.6.3 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.6.1 to 6.6.3. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.6.1...6.6.3) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7ca830c8..c6afa349 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.45.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.6.1" + id("io.freefair.lombok") version "6.6.3" } group = "io.github.1c-syntax" From 9df150dfce9191836d593e5ba9cfba5769b71258 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 04:41:03 +0000 Subject: [PATCH 56/82] Bump com.github.ben-manes.versions from 0.45.0 to 0.46.0 Bumps com.github.ben-manes.versions from 0.45.0 to 0.46.0. --- updated-dependencies: - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6afa349..b58f9f42 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("org.sonarqube") version "3.5.0.2730" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") - id("com.github.ben-manes.versions") version "0.45.0" + id("com.github.ben-manes.versions") version "0.46.0" id("com.github.gradle-git-version-calculator") version "1.1.0" id("io.freefair.lombok") version "6.6.3" } From 592cd2900f06e7e9410b9a88413a2da9170cd8f6 Mon Sep 17 00:00:00 2001 From: Valery Maximov Date: Wed, 1 Mar 2023 14:45:55 +0300 Subject: [PATCH 57/82] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B3=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=B0=20html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 19 ------------------- .idea/misc.xml | 7 ------- build.gradle.kts | 9 ++++----- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/misc.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 5108ea54..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 62269dfc..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 0f33040e..d2391c41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,6 @@ repositories { } } -val commonmarkVersion = "0.17.0" val sonarQubeVersion = "8.9.0.43852" dependencies { @@ -42,10 +41,10 @@ dependencies { implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.1.0.1111") // MD to HTML converter of BSL LS rule descriptions - implementation("com.atlassian.commonmark", "commonmark", commonmarkVersion) - implementation("com.atlassian.commonmark", "commonmark-ext-gfm-tables", commonmarkVersion) - implementation("com.atlassian.commonmark", "commonmark-ext-autolink", commonmarkVersion) - implementation("com.atlassian.commonmark", "commonmark-ext-heading-anchor", commonmarkVersion) + implementation("org.commonmark", "commonmark", "0.21.0") + implementation("org.commonmark", "commonmark-ext-gfm-tables", "0.21.0") + implementation("org.commonmark", "commonmark-ext-autolink", "0.21.0") + implementation("org.commonmark", "commonmark-ext-heading-anchor", "0.21.0") implementation("me.tongfei:progressbar:0.9.5") From 733b840290c703fe90895619ed8cfdf4b2d48812 Mon Sep 17 00:00:00 2001 From: Valery Maximov Date: Wed, 1 Mar 2023 14:46:39 +0300 Subject: [PATCH 58/82] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=BC=D1=8F=20source=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=90=D0=9F=D0=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes: #248 --- .../com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java | 2 +- .../_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java index 6e1a1fc6..126a46e6 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java @@ -37,7 +37,7 @@ public class AccReporter implements Reporter { String rulesPathsKey = "sonar.bsl.acc.accRulesPaths"; String rulesDefaultPath = "acc.json"; String repositoryKey = "acc-rules"; - String source = "acc"; + String source = "acc-rules"; String repositoryName = "ACC rules"; String ruleTag = "acc"; int startIndex = 30; diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java index 8db0cf90..2494370d 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/UniversalReporter.java @@ -24,7 +24,7 @@ import lombok.Value; /** - * Настройки внешнего анализатора 1С:EDT + * Настройки внешнего анализатора */ @Value(staticConstructor = "create") public class UniversalReporter implements Reporter { From bc0121fda3745c4256b01921f2047c4c7ffbd9c8 Mon Sep 17 00:00:00 2001 From: Valery Maximov Date: Wed, 1 Mar 2023 15:10:54 +0300 Subject: [PATCH 59/82] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B5=D0=B4=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/main/resources/edt.json | 671 ++++++++++++++---- .../sonar/ext_issues/RuleDefinitionTest.java | 6 +- 3 files changed, 555 insertions(+), 123 deletions(-) diff --git a/.gitignore b/.gitignore index 8ee70ea0..8715ed0c 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ gen/ /.idea/vcs.xml /.idea/compiler.xml /.idea/inspectionProfiles/Project_Default.xml +/.idea/misc.xml diff --git a/src/main/resources/edt.json b/src/main/resources/edt.json index 908dc044..eb65335e 100644 --- a/src/main/resources/edt.json +++ b/src/main/resources/edt.json @@ -2,7 +2,6 @@ "Rules": [ { "Code": "edt-001", - "InternalCode": "Переменная %1 не определена", "Name": "Переменная %1 не определена", "Description": "\n\n\n\n

Например, имеем следущий код в модулях конфигурации:

\n
ШаблонТекста = НСтр(\"ru='Первый параметр %1, второй параметр %2'\");
Текст = СтроковыеФункцииКлиентСервер.ПодставитьПараметрыВСтроку(ШаблонТекста, 1, 2);
\n

Избавимся от прослойки вызовов и лишних методов с помощью метода СтрШаблон():

\n
ШаблонТекста = НСтр(\"ru='Первый параметр %1, второй параметр %2'\");
Текст = СтрШаблон(ШаблонТекста, 1, 2);
\n

Конфигурация не всегда сразу полностью переводится на другой язык. И, если в системе будет работать пользователь, у которого будет установлен язык не RU, то первый код отработает корректно, а второй выдаст ошибку исполнения.

\n

Во втором случае локализованной строки нет, следовательно, параметров в строке нет,  следовательно, возникает ошибка исполнения.

\n

В связи с этим, в модулях конфигураций принято решение не использовать СтрШаблон() до исправления ошибки платформы.

", "Type": "BUG", @@ -12,7 +11,6 @@ }, { "Code": "EDT-2", - "InternalCode": "com.e1c.v8codestyle.bsl:invocation-form-event-handler", "Name": "Программный вызов обработчика события формы", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -22,7 +20,6 @@ }, { "Code": "EDT-3", - "InternalCode": "com.e1c.v8codestyle.bsl:empty-except-statement", "Name": "не содержит кода в исключении", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -32,7 +29,6 @@ }, { "Code": "EDT-4", - "InternalCode": "Возвращает тип, который имеет отличное окружение от контекста вызова", "Name": "Возвращает тип, который имеет отличное окружение от контекста вызова", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -42,7 +38,6 @@ }, { "Code": "EDT-5", - "InternalCode": "Возможно, выражение не является объектом коллекции", "Name": "Возможно, выражение не является объектом коллекции", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -52,7 +47,6 @@ }, { "Code": "EDT-6", - "InternalCode": "Возможно, недостижимое выражение", "Name": "Возможно, недостижимое выражение", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -62,7 +56,6 @@ }, { "Code": "EDT-7", - "InternalCode": "com.e1c.v8codestyle.bsl:module-unused-local-variable", "Name": "Возможно, переменная еще не была проинициализирована", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -72,7 +65,6 @@ }, { "Code": "EDT-8", - "InternalCode": "Возможно, строковый литерал содержит ошибку", "Name": "Возможно, строковый литерал содержит ошибку", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -82,7 +74,6 @@ }, { "Code": "EDT-9", - "InternalCode": "com.e1c.v8codestyle.bsl:new-color", "Name": "Для изменения оформления следует использовать элементы стиля, а не задавать конкретные значения непосредственно в элементах управления", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -92,7 +83,6 @@ }, { "Code": "EDT-10", - "InternalCode": "Для объекта определен ручной порядок подсистем, но подсистема отсутствует в порядке подсистем", "Name": "Для объекта определен ручной порядок подсистем, но подсистема отсутствует в порядке подсистем", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -102,7 +92,6 @@ }, { "Code": "EDT-11", - "InternalCode": "com.e1c.v8codestyle.md:mdo-scheduled-job-description", "Name": "Задано наименование предопределенного регламентного задания", "Description": "Отсутствует", "Type": "BUG", @@ -112,7 +101,6 @@ }, { "Code": "EDT-12", - "InternalCode": "com.e1c.v8codestyle.bsl:use-non-recommended-method", "Name": "Используется не рекомендуемый метод", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -122,7 +110,6 @@ }, { "Code": "EDT-13", - "InternalCode": "com.e1c.v8codestyle.bsl:using-isinrole", "Name": "Используйте функцию вместо", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -132,7 +119,6 @@ }, { "Code": "EDT-14", - "InternalCode": "com.e1c.v8codestyle.bsl:structure-consructor-too-many-keys", "Name": "Конструктор структуры содержит более чем 5 ключей", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -142,7 +128,6 @@ }, { "Code": "EDT-15", - "InternalCode": "Менеджер записи не может быть использован для регистра с режимом записи", "Name": "Менеджер записи не может быть использован для регистра с режимом записи", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -152,7 +137,6 @@ }, { "Code": "EDT-16", - "InternalCode": "com.e1c.v8codestyle.bsl:lock-out-of-try", "Name": "Метод Заблокировать() вне блока Попытка-Исключение", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -162,7 +146,6 @@ }, { "Code": "EDT-17", - "InternalCode": "com.e1c.v8codestyle.bsl:module-accessibility-at-client", "Name": "Метод доступен НаКлиенте", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -172,7 +155,6 @@ }, { "Code": "EDT-18", - "InternalCode": "Метод устарел", "Name": "Метод устарел", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -182,7 +164,6 @@ }, { "Code": "EDT-19", - "InternalCode": "com.e1c.v8codestyle.bsl:bsl-nstr-string-literal-format", "Name": "НСтр метод должен принимать строку первым параметром", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -192,7 +173,6 @@ }, { "Code": "EDT-20", - "InternalCode": "Не рекомендуется создавать подсистемы глубиной вложенности более трех", "Name": "Не рекомендуется создавать подсистемы глубиной вложенности более трех", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -202,9 +182,8 @@ }, { "Code": "EDT-21", - "InternalCode": "com.e1c.v8codestyle.bsl:export-method-in-command-form-module", - "Name": "Не следует размещать экспортные процедуры и функции в модулях команд и форм.", - "Description": "Не следует размещать экспортные процедуры и функции в модулях команд и форм. К этим модулям нет возможности обращаться из внешнего по отношению к ним кода, поэтому экспортные процедуры и функции в этих модулях не имеют смысла.", + "Name": "Не следует размещать экспортные процедуры и функции в модулях команд и форм. К этим модулям нет возможности обращаться из внешнего по отношению к ним кода, поэтому экспортные процедуры и функции в этих модулях не имеют смысла.", + "Description": "Отсутствует", "Type": "CODE_SMELL", "Severity": "MINOR", "Active": true, @@ -212,7 +191,6 @@ }, { "Code": "EDT-22", - "InternalCode": "Неизвестное имя типа", "Name": "Неизвестное имя типа", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -222,7 +200,6 @@ }, { "Code": "EDT-23", - "InternalCode": "com.e1c.v8codestyle.bsl:module-unused-method", "Name": "Неиспользуемый метод", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -232,7 +209,6 @@ }, { "Code": "EDT-24", - "InternalCode": "Некорректное значение свойства XDTO-пакета. Пространство имен пакета совпадает с пространством имен пакета", "Name": "Некорректное значение свойства XDTO-пакета. Пространство имен пакета совпадает с пространством имен пакета", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -242,7 +218,6 @@ }, { "Code": "EDT-25", - "InternalCode": "Нельзя передавать объект типа между клиентом и сервером", "Name": "Нельзя передавать объект типа между клиентом и сервером", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -252,7 +227,6 @@ }, { "Code": "EDT-26", - "InternalCode": "Нельзя присваивать атрибуту формы значение типа", "Name": "Нельзя присваивать атрибуту формы значение типа", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -262,7 +236,6 @@ }, { "Code": "EDT-27", - "InternalCode": "Нет соответствия между ожидаемыми типами", "Name": "Нет соответствия между ожидаемыми типами", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -272,7 +245,6 @@ }, { "Code": "EDT-28", - "InternalCode": "Объект данного тип не может быть создан через оператор", "Name": "Объект данного тип не может быть создан через оператор", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -282,7 +254,6 @@ }, { "Code": "EDT-29", - "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-procedure-return-section", "Name": "Описание процедуры не должно содержать блок", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -292,7 +263,6 @@ }, { "Code": "EDT-30", - "InternalCode": "com.e1c.v8codestyle.bsl:event-heandler-boolean-param", "Name": "Параметр должен устанавливаться в Ложь, но выражение может заменить текущее значение в Истина", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -302,7 +272,6 @@ }, { "Code": "EDT-31", - "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-parameter-section", "Name": "Пропущено определение параметра для", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -312,7 +281,6 @@ }, { "Code": "EDT-32", - "InternalCode": "com.e1c.v8codestyle.bsl:module-empty-method", "Name": "Пустой метод", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -322,7 +290,6 @@ }, { "Code": "EDT-33", - "InternalCode": "Свойство объекта не обнаружено", "Name": "Свойство объекта не обнаружено", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -332,7 +299,6 @@ }, { "Code": "EDT-34", - "InternalCode": "Свойство устарело", "Name": "Свойство устарело", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -342,7 +308,6 @@ }, { "Code": "EDT-35", - "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-ref-link", "Name": "Ссылка на несуществующий объект", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -352,7 +317,6 @@ }, { "Code": "EDT-36", - "InternalCode": "com.e1c.v8codestyle.ql:ql-camel-case-string-literal", "Name": "Строковый литерал содержит не CamelCase символы", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -362,7 +326,6 @@ }, { "Code": "EDT-37", - "InternalCode": "Тип устарел", "Name": "Тип устарел", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -372,7 +335,6 @@ }, { "Code": "EDT-38", - "InternalCode": "com.e1c.v8codestyle.form:input-field-list-choice-mode", "Name": "У поля ввода формы с заполненным списком выбора отключено свойство", "Description": "Отсутствует", "Type": "BUG", @@ -382,7 +344,6 @@ }, { "Code": "EDT-39", - "InternalCode": "Функция должна возвращать значение", "Name": "Функция должна возвращать значение", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -392,7 +353,6 @@ }, { "Code": "EDT-40", - "InternalCode": "Элемент с таким именем уже есть в глобальном контексте", "Name": "Элемент с таким именем уже есть в глобальном контексте", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -402,7 +362,6 @@ }, { "Code": "EDT-41", - "InternalCode": "com.e1c.dt.check.form:form-named-element-name", "Name": "Имя именованного элемента формы пустое", "Description": "Отсутствует", "Type": "BUG", @@ -412,7 +371,6 @@ }, { "Code": "EDT-42", - "InternalCode": "com.e1c.v8codestyle.bsl:form-module-pragma", "Name": "Использована директива компиляции модуля формы", "Description": "Отсутствует", "Type": "BUG", @@ -422,7 +380,6 @@ }, { "Code": "EDT-43", - "InternalCode": "com.e1c.v8codestyle.ql:ql-temp-table-index", "Name": "Новая временная таблица должна содержать индексы", "Description": "Отсутствует", "Type": "BUG", @@ -432,7 +389,6 @@ }, { "Code": "EDT-44", - "InternalCode": "com.e1c.v8codestyle.bsl:notify-description-to-server-procedure", "Name": "Описание оповещения на серверную процедуру", "Description": "Отсутствует", "Type": "BUG", @@ -442,7 +398,6 @@ }, { "Code": "EDT-45", - "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-export-function-return-section", "Name": "Описание экспортируемой функции должно содержать блок", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -452,7 +407,6 @@ }, { "Code": "EDT-46", - "InternalCode": "com.e1c.v8codestyle.ql:ql-virtual-table-filters", "Name": "Отбор ABCXYZКлассификацияКлиентовСрезПоследних.ТипКлассификации для виртуальной таблицы ABCXYZКлассификацияКлиентовСрезПоследних должен быть в параметрах", "Description": "Отсутствует", "Type": "BUG", @@ -462,7 +416,6 @@ }, { "Code": "EDT-47", - "InternalCode": "com.e1c.v8codestyle.bsl:data-exchange-load", "Name": "Отсутствует обязательная проверка признака ОбменДанными.Загрузка в обработчике события", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -472,7 +425,6 @@ }, { "Code": "EDT-48", - "InternalCode": "com.e1c.v8codestyle.md:shceduled-job-periodicity-too-short", "Name": "Периодичность выполнения регламентного задания меньше 60сек", "Description": "Отсутствует", "Type": "BUG", @@ -482,7 +434,6 @@ }, { "Code": "EDT-49", - "InternalCode": "com.e1c.v8codestyle.right:right-start-web-client", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -492,7 +443,6 @@ }, { "Code": "EDT-50", - "InternalCode": "com.e1c.v8codestyle.right:right-output-to-printer-file-clipboard", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -502,7 +452,6 @@ }, { "Code": "EDT-51", - "InternalCode": "com.e1c.v8codestyle.right:right-interactive-set-deletion-mark-predefined-data", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -512,7 +461,6 @@ }, { "Code": "EDT-52", - "InternalCode": "com.e1c.v8codestyle.right:right-interactive-clear-deletion-mark-predefined-data", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -522,7 +470,6 @@ }, { "Code": "EDT-53", - "InternalCode": "com.e1c.v8codestyle.right:right-interactive-delete", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -532,7 +479,6 @@ }, { "Code": "EDT-54", - "InternalCode": "com.e1c.v8codestyle.right:right-interactive-delete-marked-predefined-data", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -542,7 +488,6 @@ }, { "Code": "EDT-55", - "InternalCode": "com.e1c.v8codestyle.right:right-interactive-delete-predefined-data", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -552,7 +497,6 @@ }, { "Code": "EDT-56", - "InternalCode": "com.e1c.v8codestyle.right:right-exclusive-mode", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -562,7 +506,6 @@ }, { "Code": "EDT-57", - "InternalCode": "com.e1c.v8codestyle.right:right-save-user-data", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -572,7 +515,6 @@ }, { "Code": "EDT-58", - "InternalCode": "com.e1c.v8codestyle.right:right-start-thin-client", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -582,7 +524,6 @@ }, { "Code": "EDT-59", - "InternalCode": "com.e1c.v8codestyle.bsl:form-module-missing-pragma", "Name": "Пропущена директива компиляции", "Description": "Отсутствует", "Type": "BUG", @@ -592,7 +533,6 @@ }, { "Code": "EDT-60", - "InternalCode": "com.e1c.dt.check.form:form-data-path", "Name": "Свойство имеет некорректное значение", "Description": "Отсутствует", "Type": "BUG", @@ -602,7 +542,6 @@ }, { "Code": "EDT-61", - "InternalCode": "com.e1c.v8codestyle.ql:ql-join-to-sub-query", "Name": "Соединение в запросе с подзапросом не разрешено", "Description": "Отсутствует", "Type": "BUG", @@ -612,7 +551,6 @@ }, { "Code": "EDT-62", - "InternalCode": "com.e1c.v8codestyle.bsl:module-structure-top-region", "Name": "Стандартная область структуры модуля является вложенной", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -622,7 +560,6 @@ }, { "Code": "EDT-63", - "InternalCode": "com.e1c.v8codestyle.bsl:doc-comment-use-minus", "Name": "Только символ дефис-минуса разрешено использовать в документирующем комментарии, но найдено", "Description": "Отсутствует", "Type": "BUG", @@ -632,7 +569,6 @@ }, { "Code": "EDT-64", - "InternalCode": "com.e1c.v8codestyle.md:common-module-name-global", "Name": "Глобальный общий модуль должен оканчиваться на суффикс", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -642,7 +578,6 @@ }, { "Code": "EDT-65", - "InternalCode": "com.e1c.v8codestyle.md:mdo-name-length", "Name": "Длина имени объекта метаданного должна быть меньше чем 80", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -652,7 +587,6 @@ }, { "Code": "EDT-66", - "InternalCode": "com.e1c.v8codestyle.bsl:query-in-loop", "Name": "Цикл содержит вызов метода с запросом", "Description": "Отсутствует", "Type": "BUG", @@ -662,7 +596,6 @@ }, { "Code": "EDT-67", - "InternalCode": "Can be only one default item in root subgroup", "Name": "Can be only one default item in root subgroup", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -672,7 +605,6 @@ }, { "Code": "EDT-68", - "InternalCode": "Duplicate id", "Name": "Duplicate id", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -682,7 +614,6 @@ }, { "Code": "EDT-69", - "InternalCode": "Для команды категория группы команд по умолчанию может быть только Панель навигации или Панель действий", "Name": "Для команды категория группы команд по умолчанию может быть только Панель навигации или Панель действий", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -692,7 +623,6 @@ }, { "Code": "EDT-70", - "InternalCode": "Для команды формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", "Name": "Для команды формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -702,7 +632,6 @@ }, { "Code": "EDT-71", - "InternalCode": "Для события элемента формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", "Name": "Для события элемента формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -712,7 +641,6 @@ }, { "Code": "EDT-72", - "InternalCode": "Для события формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", "Name": "Для события формы назначен обработчик, но метод с таким именем отсутствует в модуле формы", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -722,7 +650,6 @@ }, { "Code": "EDT-73", - "InternalCode": "Код никогда не будет скомпилирован", "Name": "Код никогда не будет скомпилирован", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -732,7 +659,6 @@ }, { "Code": "EDT-74", - "InternalCode": "Лексическое значение значения по умолчанию не соответствует типу \"{http", "Name": "Лексическое значение значения по умолчанию не соответствует типу \"{http", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -742,7 +668,6 @@ }, { "Code": "EDT-75", - "InternalCode": "Не найден обработчик для Подписки на событие", "Name": "Не найден обработчик для Подписки на событие", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -752,7 +677,6 @@ }, { "Code": "EDT-76", - "InternalCode": "Не найден обработчик для Регламентного задания", "Name": "Не найден обработчик для Регламентного задания", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -762,7 +686,6 @@ }, { "Code": "EDT-77", - "InternalCode": "Недостаточное число параметров", "Name": "Недостаточное число параметров", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -772,7 +695,6 @@ }, { "Code": "EDT-78", - "InternalCode": "Некорректное значение свойства характеристики. Значение свойства не определено", "Name": "Некорректное значение свойства характеристики. Значение свойства не определено", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -782,7 +704,6 @@ }, { "Code": "EDT-79", - "InternalCode": "Некорректное значение свойства. Дублирование имени объекта метаданных", "Name": "Некорректное значение свойства. Дублирование имени объекта метаданных", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -792,7 +713,6 @@ }, { "Code": "EDT-80", - "InternalCode": "Некорректный тип параметра для стандартной команды. Допустимые типы, а получены", "Name": "Некорректный тип параметра для стандартной команды. Допустимые типы, а получены", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -802,7 +722,6 @@ }, { "Code": "EDT-81", - "InternalCode": "Неподдерживаемый оператор", "Name": "Неподдерживаемый оператор", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -812,7 +731,6 @@ }, { "Code": "EDT-82", - "InternalCode": "Переменная не определена", "Name": "Переменная не определена", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -822,7 +740,6 @@ }, { "Code": "EDT-83", - "InternalCode": "Поле связи параметра выбора не указано или некорректно", "Name": "Поле связи параметра выбора не указано или некорректно", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -832,7 +749,6 @@ }, { "Code": "EDT-84", - "InternalCode": "Поле связи параметра выбора не является допустимым", "Name": "Поле связи параметра выбора не является допустимым", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -842,7 +758,6 @@ }, { "Code": "EDT-85", - "InternalCode": "Процедура или функция не определена", "Name": "Процедура или функция не определена", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -852,7 +767,6 @@ }, { "Code": "EDT-86", - "InternalCode": "Процедура или функция с таким именем уже определена", "Name": "Процедура или функция с таким именем уже определена", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -862,7 +776,6 @@ }, { "Code": "EDT-87", - "InternalCode": "Свойство не предназначено для записи у типа", "Name": "Свойство не предназначено для записи у типа", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -872,7 +785,6 @@ }, { "Code": "EDT-88", - "InternalCode": "Синтаксическая ошибка. Недопустимая лексема в данном контексте", "Name": "Синтаксическая ошибка. Недопустимая лексема в данном контексте", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -882,7 +794,6 @@ }, { "Code": "EDT-89", - "InternalCode": "Синтаксическая ошибка. Пропущена лексема у", "Name": "Синтаксическая ошибка. Пропущена лексема у", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -892,7 +803,6 @@ }, { "Code": "EDT-90", - "InternalCode": "Слишком много параметров", "Name": "Слишком много параметров", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -902,7 +812,6 @@ }, { "Code": "EDT-91", - "InternalCode": "Слишком много параметров для типа(ов)", "Name": "Слишком много параметров для типа(ов)", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -912,7 +821,6 @@ }, { "Code": "EDT-92", - "InternalCode": "Тип не может иметь фасет", "Name": "Тип не может иметь фасет", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -922,7 +830,6 @@ }, { "Code": "EDT-93", - "InternalCode": "Тип неопределен", "Name": "Тип неопределен", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -932,7 +839,6 @@ }, { "Code": "EDT-94", - "InternalCode": "Функция не определена", "Name": "Функция не определена", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -942,7 +848,6 @@ }, { "Code": "EDT-95", - "InternalCode": "Этот тип не может входить в состав составного типа", "Name": "Этот тип не может входить в состав составного типа", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -952,7 +857,6 @@ }, { "Code": "EDT-96", - "InternalCode": "Данный модуль не поддерживает данный тип директив компиляции", "Name": "Данный модуль не поддерживает данный тип директив компиляции", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -962,7 +866,6 @@ }, { "Code": "EDT-97", - "InternalCode": "com.e1c.v8codestyle.right:right-view-event-log", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -972,7 +875,6 @@ }, { "Code": "EDT-98", - "InternalCode": "com.e1c.v8codestyle.right:right-interactive-open-external-data-processors", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -982,7 +884,6 @@ }, { "Code": "EDT-99", - "InternalCode": "com.e1c.v8codestyle.right:right-interactive-open-external-reports", "Name": "Право роли установлено для", "Description": "Отсутствует", "Type": "VULNERABILITY", @@ -992,7 +893,6 @@ }, { "Code": "EDT-100", - "InternalCode": "com.e1c.v8codestyle.md:common-module-name-client-server", "Name": "Клиент-серверный общий модуль должен оканчиваться на суффикс", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1002,7 +902,6 @@ }, { "Code": "EDT-101", - "InternalCode": "Duplicate column name", "Name": "Duplicate column name", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1012,7 +911,6 @@ }, { "Code": "EDT-102", - "InternalCode": "Duplicate content", "Name": "Duplicate content", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1022,7 +920,6 @@ }, { "Code": "EDT-103", - "InternalCode": "Illegal ShortCut", "Name": "Illegal ShortCut", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1032,7 +929,6 @@ }, { "Code": "EDT-104", - "InternalCode": "Данный модуль может содержать только процедуры и функции", "Name": "Данный модуль может содержать только процедуры и функции", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1042,7 +938,6 @@ }, { "Code": "EDT-105", - "InternalCode": "Недостаточное число параметров для типа(ов)", "Name": "Недостаточное число параметров для типа(ов)", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1052,7 +947,6 @@ }, { "Code": "EDT-106", - "InternalCode": "Неизвестный оператор", "Name": "Неизвестный оператор", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1062,7 +956,6 @@ }, { "Code": "EDT-107", - "InternalCode": "Некорректное значение свойства. Указан нумератор. Свойства документа должны совпадать с соответствующими свойствами нумератора.", "Name": "Некорректное значение свойства. Указан нумератор. Свойства документа должны совпадать с соответствующими свойствами нумератора.", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1072,7 +965,6 @@ }, { "Code": "EDT-108", - "InternalCode": "Некорректное значение свойства реквизита. Тип использования реквизита противоречит выбранному типу иерархии", "Name": "Некорректное значение свойства реквизита. Тип использования реквизита противоречит выбранному типу иерархии", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1082,7 +974,6 @@ }, { "Code": "EDT-109", - "InternalCode": "Оператор может использоваться только внутри процедур и функций", "Name": "Оператор может использоваться только внутри процедур и функций", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1092,7 +983,6 @@ }, { "Code": "EDT-110", - "InternalCode": "Процедура вызывается как функция", "Name": "Процедура вызывается как функция", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1102,7 +992,6 @@ }, { "Code": "EDT-111", - "InternalCode": "Синтаксическая ошибка. Неверная лексема - ожидается", "Name": "Синтаксическая ошибка. Неверная лексема - ожидается", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1112,7 +1001,6 @@ }, { "Code": "EDT-112", - "InternalCode": "Синтаксическая ошибка. Неверный ввод - ожидается", "Name": "Синтаксическая ошибка. Неверный ввод - ожидается", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1122,7 +1010,6 @@ }, { "Code": "EDT-113", - "InternalCode": "Указанный обработчик события не существует", "Name": "Указанный обработчик события не существует", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1132,7 +1019,6 @@ }, { "Code": "EDT-114", - "InternalCode": "Встроенная функция может быть использована только в выражении.", "Name": "Встроенная функция может быть использована только в выражении.", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1142,7 +1028,6 @@ }, { "Code": "EDT-115", - "InternalCode": "Ошибочный порядок грамматических элементов", "Name": "Ошибочный порядок грамматических элементов", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1152,7 +1037,6 @@ }, { "Code": "EDT-116", - "InternalCode": "Синтаксическая ошибка. Неверный ввод", "Name": "Синтаксическая ошибка. Неверный ввод", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1162,7 +1046,6 @@ }, { "Code": "EDT-117", - "InternalCode": "Тип не определен", "Name": "Тип не определен", "Description": "Отсутствует", "Type": "CODE_SMELL", @@ -1172,13 +1055,561 @@ }, { "Code": "EDT-118", - "InternalCode": "Синтаксическая ошибка. Неизвестная лексема", "Name": "Синтаксическая ошибка. Неизвестная лексема", "Description": "Отсутствует", "Type": "CODE_SMELL", "Severity": "MINOR", "Active": true, "EffortMinutes": 3 + }, + { + "Code": "EDT-119", + "Name": "Неизвестный тип", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-120", + "Name": "Некорректное значение свойства. Длина наименования превышает максимальную", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-121", + "Name": "Некорректное значение свойства. Неразделенный объект метаданных участвует в разделенном плане обмена. Oбъект метаданных входит в план обмена, разделяет план обмена но не разделяет объект метаданных", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-122", + "Name": "Указано одинаковое имя для ресурса и измерения", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-123", + "Name": "Функция имеет запись карты в индексе 1 с ключом, который сталкивается с ключом записи карты в индексе 0", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-124", + "Name": "Синтаксическая ошибка. Пропущена лексема", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-125", + "Name": "Указано одинаковое имя для реквизита и табличной части", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-126", + "Name": "Некорректное значение свойства. Указано неверное поле для ввода по строке", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-127", + "Name": "Не заполнено ни представление объекта, ни представление списка", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-128", + "Name": "Общий модуль должен именоваться с постфиксом ВызовСервера", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-129", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-130", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-131", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-132", + "Name": "Общий модуль для типа имеет некорректне настройки", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-133", + "Name": "Процедура не может возвращать значение", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-134", + "Name": "Синтаксическая ошибка. Пропущена лексематн_ДокументВводОстатковВнеоборотныхАктивов2_4Модификация.ФормаРедактированияСтрокиОСПриСозданииНаСервере", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-135", + "Name": "Окружение для метода не установленно", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-136", + "Name": "Возможно Поле указано в описании", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-137", + "Name": "Возможно параметр метода указан в описании", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-138", + "Name": "Возвращаемый тип не известен", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-139", + "Name": "Имя поля является некорректным", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-140", + "Name": "Метод содержит более чем 3 параметров со значением по умолчанию", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-141", + "Name": "Не задан синоним у стандартного реквизита", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-142", + "Name": "Неизвестный тип указан в документирующем комментарии", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-143", + "Name": "Область пустая", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-144", + "Name": "Общий модуль должен именоваться с постфиксом ВызовСервераПовтИсп", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-145", + "Name": "Общий модуль должен именоваться с постфиксом КлиентПовтИсп", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-146", + "Name": "Общий модуль должен именоваться с постфиксом ПовтИсп", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-147", + "Name": "Поле не имеет определения типа", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-148", + "Name": "Поле использует объявление сложного типа вместо ссылки на тип", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-149", + "Name": "Тип коллекции должен содержать тип элемента коллекции", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-150", + "Name": "Неизвестная директива компиляции", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-151", + "Name": "Некорректное значение свойства. Имя события должно быть задано", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-152", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-153", + "Name": "Unsupported button type", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-154", + "Name": "В области следует размещать только обработчики событий", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-155", + "Name": "Длина синонима раздела превышает 35 символов для языка ru", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-156", + "Name": "Избыточное обращение внутри модуля через псевдоним", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-157", + "Name": "Избыточное обращение по собственному имени", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-158", + "Name": "Избыточное обращение по собственному имени", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-159", + "Name": "Код инициализации следует расположить в области Инициализация", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-160", + "Name": "Метод не следует размещать в области", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-161", + "Name": "Не допускается использование бинарных операций с константами в запросах (Строка 103", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-162", + "Name": "Не заполнен заголовок поля динамического списка", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-163", + "Name": "Не следует хранить пароли в информационной базе", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-164", + "Name": "Объявление переменной должно быть помещено в область ОписаниеПеременных", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-165", + "Name": "Отсутствует удаление временного файла после использования.", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-166", + "Name": "Реквизит динамического списка не выведен в таблицу на форме", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-167", + "Name": "Следует использовать псевдоним вместо устаревшего", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-168", + "Name": "У реквизита динамического списка выключен признак", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-169", + "Name": "Удалите избыточную секцию параметров", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-170", + "Name": "Для типизированных объектов метаданных, хранящихся в информационной базе, не следует использовать составные типы ЛюбаяСсылка, СправочникСсылка, ДокументСсылка и аналогичные.", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-171", + "Name": "Обработчик события уже назначен для", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-172", + "Name": "Отсутствует включение безопасного режима перед вызовом метода", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-173", + "Name": "Периодичность выполнения регламентного задания меньше 60сек", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-174", + "Name": "Право роли установлено для", + "Description": "Отсутствует", + "Type": "VULNERABILITY", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-175", + "Name": "Реквизиты составного типа, используемые в условиях соединений, отборах, а также для упорядочивания, должны содержать только ссылочные типы. В состав их типов не рекомендуется включать никаких других нессылочных типов.", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-176", + "Name": "У поля таблицы динамического списка АлгоритмыСбораДанных не отключена пользовательская видимость", + "Description": "Отсутствует", + "Type": "BUG", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-177", + "Name": "Дублирование имени объекта метаданных", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-178", + "Name": "Дублирование объекта метаданных", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 + }, + { + "Code": "EDT-179", + "Name": "В поле content установлена потерянная ссылка unresolved", + "Description": "Отсутствует", + "Type": "CODE_SMELL", + "Severity": "MINOR", + "Active": true, + "EffortMinutes": 3 } ] } diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java index 66d987a9..c6ba4cb8 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionTest.java @@ -46,7 +46,7 @@ void testDefine() { assertThat(context.repositories()).hasSize(1); var repository = context.repository(reporter.getRepositoryKey()); assertThat(repository).isNotNull(); - assertThat(repository.rules()).hasSize(118); + assertThat(repository.rules()).hasSize(179); } @Test @@ -62,7 +62,7 @@ void testEmptyExternalFilePath() { assertThat(context.repositories()).hasSize(1); var repository = context.repository(reporter.getRepositoryKey()); assertThat(repository).isNotNull(); - assertThat(repository.rules()).hasSize(118); + assertThat(repository.rules()).hasSize(179); } @Test @@ -84,7 +84,7 @@ void testExternalFile() { assertThat(context.repositories()).hasSize(1); var repository = context.repository(reporter.getRepositoryKey()); assertThat(repository).isNotNull(); - assertThat(repository.rules()).hasSize(122); + assertThat(repository.rules()).hasSize(183); } } From 05c728165e854040687d7b42a7cf8e9eb9ca9110 Mon Sep 17 00:00:00 2001 From: Valery Maximov Date: Wed, 1 Mar 2023 19:52:48 +0300 Subject: [PATCH 60/82] =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java index 126a46e6..6e1a1fc6 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/AccReporter.java @@ -37,7 +37,7 @@ public class AccReporter implements Reporter { String rulesPathsKey = "sonar.bsl.acc.accRulesPaths"; String rulesDefaultPath = "acc.json"; String repositoryKey = "acc-rules"; - String source = "acc-rules"; + String source = "acc"; String repositoryName = "ACC rules"; String ruleTag = "acc"; int startIndex = 30; From 4c0d51f2d5fe1fe8b8bf602102b3f4d6ce88a6d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 02:59:08 +0000 Subject: [PATCH 61/82] Bump org.sonarsource.analyzer-commons:sonar-analyzer-commons Bumps [org.sonarsource.analyzer-commons:sonar-analyzer-commons](https://github.com/SonarSource/sonar-analyzer-commons) from 2.1.0.1111 to 2.2.0.1251. - [Release notes](https://github.com/SonarSource/sonar-analyzer-commons/releases) - [Commits](https://github.com/SonarSource/sonar-analyzer-commons/compare/2.1.0.1111...2.2.0.1251) --- updated-dependencies: - dependency-name: org.sonarsource.analyzer-commons:sonar-analyzer-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index d2391c41..ed782170 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons - implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.1.0.1111") + implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.2.0.1251") // MD to HTML converter of BSL LS rule descriptions implementation("org.commonmark", "commonmark", "0.21.0") From c59870591417b42e1030f7233a8ab980d1526770 Mon Sep 17 00:00:00 2001 From: Maximov Valery Date: Fri, 3 Mar 2023 13:55:23 +0300 Subject: [PATCH 62/82] Update README.md fix nightbuild badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c872764..1ff79432 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_sonar-bsl-plugin-community&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_sonar-bsl-plugin-community) [![Download](https://img.shields.io/github/release/1c-syntax/sonar-bsl-plugin-community.svg?label=download&style=flat)](https://github.com/1c-syntax/sonar-bsl-plugin-community/releases/latest) -[![Download night build](https://img.shields.io/github/workflow/status/1c-syntax/sonar-bsl-plugin-community/Night%20build/nigth_build?label=night%20build)](https://github.com/1c-syntax/sonar-bsl-plugin-community/releases/v999.99.99) +![Download night build](https://img.shields.io/github/downloads/1c-syntax/sonar-bsl-plugin-community/v999.99.99/total?label=night%20build) [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server) From ba6ad2c58ff4ed2c76a741af4af0a7df1c2e45d9 Mon Sep 17 00:00:00 2001 From: Maximov Valery Date: Fri, 3 Mar 2023 13:56:58 +0300 Subject: [PATCH 63/82] fix url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ff79432..cb359fd7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=1c-syntax_sonar-bsl-plugin-community&metric=coverage)](https://sonarcloud.io/dashboard?id=1c-syntax_sonar-bsl-plugin-community) [![Download](https://img.shields.io/github/release/1c-syntax/sonar-bsl-plugin-community.svg?label=download&style=flat)](https://github.com/1c-syntax/sonar-bsl-plugin-community/releases/latest) -![Download night build](https://img.shields.io/github/downloads/1c-syntax/sonar-bsl-plugin-community/v999.99.99/total?label=night%20build) +[![Download night build](https://img.shields.io/github/downloads/1c-syntax/sonar-bsl-plugin-community/v999.99.99/total?label=night%20build)](https://github.com/1c-syntax/sonar-bsl-plugin-community/releases/v999.99.99) [![telegram](https://img.shields.io/badge/telegram-chat-green.svg)](https://t.me/bsl_language_server) From f6841a6b8861289b1d8308e595fa89ade4d962e7 Mon Sep 17 00:00:00 2001 From: theshadowco Date: Thu, 2 Mar 2023 08:59:13 +0300 Subject: [PATCH 64/82] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20bsl?= =?UTF-8?q?ls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # build.gradle.kts --- build.gradle.kts | 5 ++++- .../_1c_syntax/bsl/sonar/BSLCoreSensor.java | 15 ++++----------- .../bsl/sonar/BSLHighlighterTest.java | 17 +++++++---------- src/test/resources/examples/highlight.bsl | 5 +++++ 4 files changed, 20 insertions(+), 22 deletions(-) create mode 100644 src/test/resources/examples/highlight.bsl diff --git a/build.gradle.kts b/build.gradle.kts index ed782170..f807bd6f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,10 @@ val sonarQubeVersion = "8.9.0.43852" dependencies { implementation("org.sonarsource.sonarqube", "sonar-plugin-api", sonarQubeVersion) - implementation("io.github.1c-syntax", "bsl-language-server", "0.20.0") + implementation("io.github.1c-syntax", "bsl-language-server", "1c83f52") { + exclude("com.github.1c-syntax", "utils") + } + implementation("com.github.1c-syntax", "utils", "f1694d9c") implementation("org.apache.commons:commons-lang3:3.12.0") implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java index b5df89c2..97b8ac9f 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java @@ -184,15 +184,8 @@ public void execute(SensorContext context) { private void processFile(InputFile inputFile, ServerContext bslServerContext) { URI uri = inputFile.uri(); - - String content; - try { - content = IOUtils.toString(inputFile.inputStream(), StandardCharsets.UTF_8); - } catch (IOException e) { - LOGGER.warn("Can't read content of file " + uri, e); - content = ""; - } - DocumentContext documentContext = bslServerContext.addDocument(uri, content, 1); + DocumentContext documentContext = bslServerContext.addDocument(uri); + bslServerContext.rebuildDocument(documentContext); if (langServerEnabled) { documentContext.getDiagnostics() @@ -203,10 +196,10 @@ private void processFile(InputFile inputFile, ServerContext bslServerContext) { highlighter.saveHighlighting(inputFile, documentContext); saveMeasures(inputFile, documentContext); - documentContext.clearSecondaryData(); + // clean up AST after diagnostic computing to free up RAM. + bslServerContext.tryClearDocument(documentContext); } - private void saveCpd(InputFile inputFile, DocumentContext documentContext) { var cpdTokens = context.newCpdTokens(); diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java index 764b8548..a9666067 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighterTest.java @@ -35,7 +35,6 @@ import org.sonar.api.batch.sensor.internal.SensorContextTester; import java.io.File; -import java.net.URI; import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; @@ -86,20 +85,18 @@ void testMergeHighlightingTokens() { // given context = SensorContextTester.create(Path.of(".")); highlighter = new BSLHighlighter(context); - String content = "А = \"ВЫБРАТЬ РАЗРЕШЕННЫЕ Поле.Один \n" + - "|КАК \n" + - "| Один, 2 \n" + - " | КАК Два ИЗ Справочник.Поле\n" + - "|АВТОУПОРЯДОЧИВАНИЕ;\";"; - documentContext = BSLLSBinding.getServerContext().addDocument(URI.create("file:///fake.bsl"), content, 1); - - inputFile = Tools.inputFileBSL(FILE_NAME, BASE_DIR, content); + var fileName = "highlight.bsl"; + var baseDirName = "src/test/resources/examples"; + var path = Path.of(baseDirName, fileName); + documentContext = BSLLSBinding.getServerContext().addDocument(path.toUri()); + BSLLSBinding.getServerContext().rebuildDocument(documentContext); + inputFile = Tools.inputFileBSL(fileName, Path.of(baseDirName).toFile()); // when highlighter.saveHighlighting(inputFile, documentContext); // then - var componentKey = "moduleKey:" + FILE_NAME; + var componentKey = "moduleKey:" + fileName; checkTokenTypeAtPosition(componentKey, 1, 4, TypeOfText.STRING); checkTokenTypeAtPosition(componentKey, 1, 5, TypeOfText.KEYWORD); diff --git a/src/test/resources/examples/highlight.bsl b/src/test/resources/examples/highlight.bsl new file mode 100644 index 00000000..cd48fed6 --- /dev/null +++ b/src/test/resources/examples/highlight.bsl @@ -0,0 +1,5 @@ +А = "ВЫБРАТЬ РАЗРЕШЕННЫЕ Поле.Один +|КАК +| Один, 2 + | КАК Два ИЗ Справочник.Поле +|АВТОУПОРЯДОЧИВАНИЕ;"; From 034e3995b3ebd6dbb1e32446312a6a8986dea671 Mon Sep 17 00:00:00 2001 From: theshadowco Date: Fri, 3 Mar 2023 15:43:19 +0300 Subject: [PATCH 65/82] - bump gradle - sq fixes --- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 4 +- .github/workflows/release.yml | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- .../_1c_syntax/bsl/sonar/BSLCoreSensor.java | 86 ++++++++---------- .../_1c_syntax/bsl/sonar/BSLHighlighter.java | 33 +++---- .../_1c_syntax/bsl/sonar/IssuesLoader.java | 59 +++++++----- ...LanguageServerDiagnosticsLoaderSensor.java | 25 ++--- .../ext_issues/RuleDefinitionsContainer.java | 1 - .../bsl/sonar/ext_issues/RulesFileReader.java | 2 +- .../BSLLanguageServerRuleDefinition.java | 25 +++-- .../bsl/sonar/BSLCoreSensorTest.java | 12 +-- 13 files changed, 119 insertions(+), 134 deletions(-) diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index d486a254..bdef962e 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -19,7 +19,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3.10.0 with: - java-version: 11 + java-version: 17 distribution: 'adopt' - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 4dfb0b51..235cc0c8 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -16,10 +16,10 @@ jobs: fetch-depth: '' - run: | git fetch --prune --unshallow - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.10.0 with: - java-version: 11 + java-version: 17 distribution: 'adopt' - name: SonarCloud Scan run: ./gradlew check sonar diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1492d4e..f62aee9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3.10.0 with: - java-version: 11 + java-version: 17 distribution: 'adopt' - name: Build with Gradle run: ./gradlew build diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 8958 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb879..608bd943 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java index 97b8ac9f..fd2f8f6c 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensor.java @@ -26,47 +26,34 @@ import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration; import com.github._1c_syntax.bsl.languageserver.configuration.diagnostics.SkipSupport; import com.github._1c_syntax.bsl.languageserver.context.DocumentContext; -import com.github._1c_syntax.bsl.languageserver.context.MetricStorage; import com.github._1c_syntax.bsl.languageserver.context.ServerContext; import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo; -import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticParameterInfo; import com.github._1c_syntax.bsl.parser.BSLLexer; import com.github._1c_syntax.bsl.sonar.language.BSLLanguage; import com.github._1c_syntax.bsl.sonar.language.BSLLanguageServerRuleDefinition; import com.github._1c_syntax.utils.Absolute; -import me.tongfei.progressbar.ProgressBar; import me.tongfei.progressbar.ProgressBarBuilder; import me.tongfei.progressbar.ProgressBarStyle; import org.antlr.v4.runtime.Token; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.lsp4j.jsonrpc.messages.Either; -import org.sonar.api.batch.fs.FilePredicates; -import org.sonar.api.batch.fs.FileSystem; import org.sonar.api.batch.fs.InputFile; -import org.sonar.api.batch.rule.ActiveRule; -import org.sonar.api.batch.rule.ActiveRules; import org.sonar.api.batch.sensor.Sensor; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.batch.sensor.SensorDescriptor; import org.sonar.api.measures.CoreMetrics; -import org.sonar.api.measures.FileLinesContext; import org.sonar.api.measures.FileLinesContextFactory; import org.sonar.api.rule.RuleKey; import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; @@ -95,7 +82,7 @@ public BSLCoreSensor(SensorContext context, FileLinesContextFactory fileLinesCon Arrays.stream(StringUtils.split(sources, ",")) .map(String::strip) .collect(Collectors.toList())) - .orElse(Collections.singletonList("."))); + .orElse(Collections.singletonList("."))); sourcesList.addAll(context.config().get("sonar.tests") .map(sources -> @@ -118,12 +105,12 @@ public void describe(SensorDescriptor descriptor) { public void execute(SensorContext context) { LOGGER.info("Parsing files..."); - FileSystem fileSystem = context.fileSystem(); - File baseDir = fileSystem.baseDir(); + var fileSystem = context.fileSystem(); + var baseDir = fileSystem.baseDir(); var absoluteSourceDirs = sourcesList.stream() .map((String sourceDir) -> { - Path sourcePath = Path.of(sourceDir.trim()); + var sourcePath = Path.of(sourceDir.trim()); if (sourcePath.isAbsolute()) { return sourcePath; } else { @@ -133,12 +120,12 @@ public void execute(SensorContext context) { .map(Absolute::path) .collect(Collectors.toList()); - FilePredicates predicates = fileSystem.predicates(); - Iterable inputFiles = fileSystem.inputFiles( + var predicates = fileSystem.predicates(); + var inputFiles = fileSystem.inputFiles( predicates.hasLanguage(BSLLanguage.KEY) ); - Map> inputFilesByPath = StreamSupport.stream(inputFiles.spliterator(), true) + var inputFilesByPath = StreamSupport.stream(inputFiles.spliterator(), true) .collect(Collectors.groupingBy((InputFile inputFile) -> { var filePath = Absolute.path(inputFile.uri()); return absoluteSourceDirs.stream() @@ -147,12 +134,12 @@ public void execute(SensorContext context) { .orElse(baseDir.toPath()); })); - LanguageServerConfiguration languageServerConfiguration = getLanguageServerConfiguration(); + var languageServerConfiguration = getLanguageServerConfiguration(); inputFilesByPath.forEach((Path sourceDir, List inputFilesList) -> { LOGGER.info("Source dir: {}", sourceDir); - Path configurationRoot = LanguageServerConfiguration.getCustomConfigurationRoot( + var configurationRoot = LanguageServerConfiguration.getCustomConfigurationRoot( languageServerConfiguration, sourceDir ); @@ -161,13 +148,13 @@ public void execute(SensorContext context) { bslServerContext.setConfigurationRoot(configurationRoot); bslServerContext.populateContext(); - try (ProgressBar pb = new ProgressBarBuilder() + try (var pb = new ProgressBarBuilder() .setTaskName("") .setInitialMax(inputFilesList.size()) .setStyle(ProgressBarStyle.ASCII) .build()) { inputFilesList.parallelStream().forEach((InputFile inputFile) -> { - URI uri = inputFile.uri(); + var uri = inputFile.uri(); LOGGER.debug(uri.toString()); pb.step(); @@ -183,8 +170,8 @@ public void execute(SensorContext context) { private void processFile(InputFile inputFile, ServerContext bslServerContext) { - URI uri = inputFile.uri(); - DocumentContext documentContext = bslServerContext.addDocument(uri); + var uri = inputFile.uri(); + var documentContext = bslServerContext.addDocument(uri); bslServerContext.rebuildDocument(documentContext); if (langServerEnabled) { @@ -215,13 +202,13 @@ private void saveCpd(InputFile inputFile, DocumentContext documentContext) { if (!skipCpd) { int line = token.getLine(); int charPositionInLine = token.getCharPositionInLine(); - String tokenText = token.getText(); + var tokenText = token.getText(); cpdTokens.addToken( - line, - charPositionInLine, - line, - charPositionInLine + tokenText.length(), - tokenText + line, + charPositionInLine, + line, + charPositionInLine + tokenText.length(), + tokenText ); } @@ -237,7 +224,7 @@ private void saveCpd(InputFile inputFile, DocumentContext documentContext) { private void saveMeasures(InputFile inputFile, DocumentContext documentContext) { - MetricStorage metrics = documentContext.getMetrics(); + var metrics = documentContext.getMetrics(); context.newMeasure().on(inputFile) .forMetric(CoreMetrics.NCLOC) @@ -273,8 +260,8 @@ private void saveMeasures(InputFile inputFile, DocumentContext documentContext) .withValue(metrics.getComments()) .save(); - FileLinesContext fileLinesContext = fileLinesContextFactory.createFor(inputFile); - for (int line : metrics.getNclocData()) { + var fileLinesContext = fileLinesContextFactory.createFor(inputFile); + for (var line : metrics.getNclocData()) { fileLinesContext.setIntValue(CoreMetrics.NCLOC_DATA_KEY, line, 1); } fileLinesContext.save(); @@ -294,7 +281,7 @@ private LanguageServerConfiguration getLanguageServerConfiguration() { .get(BSLCommunityProperties.LANG_SERVER_CONFIGURATION_PATH_KEY) .orElse(BSLCommunityProperties.LANG_SERVER_CONFIGURATION_PATH_DEFAULT_VALUE); - File configurationFile = new File(configurationPath); + var configurationFile = new File(configurationPath); if (configurationFile.exists()) { LOGGER.info("BSL LS configuration file exists. Overriding SonarQube rules' settings..."); configuration.update(configurationFile); @@ -304,7 +291,7 @@ private LanguageServerConfiguration getLanguageServerConfiguration() { } } - String diagnosticLanguageCode = context.config() + var diagnosticLanguageCode = context.config() .get(BSLCommunityProperties.LANG_SERVER_DIAGNOSTIC_LANGUAGE_KEY) .orElse(BSLCommunityProperties.LANG_SERVER_DIAGNOSTIC_LANGUAGE_DEFAULT_VALUE); @@ -312,7 +299,7 @@ private LanguageServerConfiguration getLanguageServerConfiguration() { Language.valueOf(diagnosticLanguageCode.toUpperCase(Locale.ENGLISH)) ); - SkipSupport skipSupport = context.config() + var skipSupport = context.config() .get(BSLCommunityProperties.LANG_SERVER_COMPUTE_DIAGNOSTICS_SKIP_SUPPORT_KEY) .map(value -> value.toUpperCase(Locale.ENGLISH).replace(" ", "_")) .map(SkipSupport::valueOf) @@ -322,14 +309,14 @@ private LanguageServerConfiguration getLanguageServerConfiguration() { configuration.getDiagnosticsOptions().setSkipSupport(skipSupport); - ActiveRules activeRules = context.activeRules(); + var activeRules = context.activeRules(); Map>> diagnostics = new HashMap<>(); - Collection diagnosticInfos = BSLLSBinding.getDiagnosticInfos(); + var diagnosticInfos = BSLLSBinding.getDiagnosticInfos(); for (DiagnosticInfo diagnosticInfo : diagnosticInfos) { - String diagnosticCode = diagnosticInfo.getCode().getStringValue(); - ActiveRule activeRule = activeRules.find( + var diagnosticCode = diagnosticInfo.getCode().getStringValue(); + var activeRule = activeRules.find( RuleKey.of( BSLLanguageServerRuleDefinition.REPOSITORY_KEY, diagnosticCode @@ -338,9 +325,9 @@ private LanguageServerConfiguration getLanguageServerConfiguration() { if (activeRule == null) { diagnostics.put(diagnosticCode, Either.forLeft(false)); } else { - Map params = activeRule.params(); + var params = activeRule.params(); - List diagnosticParameters = diagnosticInfo.getParameters(); + var diagnosticParameters = diagnosticInfo.getParameters(); Map diagnosticConfiguration = new HashMap<>(diagnosticParameters.size()); params.forEach((String key, String value) -> @@ -381,18 +368,17 @@ private static Object castDiagnosticParameterValue(String valueToCast, Class } private static boolean checkSkipCpd(Token token, boolean skipCpd) { - int tokenType = token.getType(); + var tokenType = token.getType(); if (tokenType == BSLLexer.ANNOTATION_CHANGEANDVALIDATE_SYMBOL - || tokenType == BSLLexer.PREPROC_ENDINSERT) { + || tokenType == BSLLexer.PREPROC_ENDINSERT) { skipCpd = true; } if (tokenType == BSLLexer.ENDPROCEDURE_KEYWORD - || tokenType == BSLLexer.ENDFUNCTION_KEYWORD - || tokenType == BSLLexer.PREPROC_INSERT) { + || tokenType == BSLLexer.ENDFUNCTION_KEYWORD + || tokenType == BSLLexer.PREPROC_INSERT) { skipCpd = false; } return skipCpd; } - } diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java index c546f189..0c512e6c 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java @@ -30,11 +30,9 @@ import lombok.EqualsAndHashCode; import lombok.RequiredArgsConstructor; import org.antlr.v4.runtime.Token; -import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.SensorContext; -import org.sonar.api.batch.sensor.highlighting.NewHighlighting; import org.sonar.api.batch.sensor.highlighting.TypeOfText; import javax.annotation.Nullable; @@ -42,7 +40,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -80,7 +77,7 @@ public void saveHighlighting(InputFile inputFile, DocumentContext documentContex ); // compute and populate sdbl highlight data - Map> queryTokens = documentContext.getQueries().stream() + var queryTokens = documentContext.getQueries().stream() .map(Tokenizer::getTokens) .flatMap(Collection::stream) .collect(Collectors.groupingBy(Token::getLine)); @@ -95,7 +92,7 @@ public void saveHighlighting(InputFile inputFile, DocumentContext documentContex ); // find bsl strings to check overlap with sdbl tokens - Set strings = highlightingData.stream() + var strings = highlightingData.stream() .filter(data -> data.getType() == TypeOfText.STRING) .collect(Collectors.toSet()); @@ -103,12 +100,12 @@ public void saveHighlighting(InputFile inputFile, DocumentContext documentContex Range stringRange = string.getRange(); // find overlapping tokens - Set dataOfCurrentLine = highlightingDataSDBL.get(stringRange.getStart().getLine()); + var dataOfCurrentLine = highlightingDataSDBL.get(stringRange.getStart().getLine()); if (Objects.isNull(dataOfCurrentLine)) { return; } - List currentTokens = dataOfCurrentLine.stream() + var currentTokens = dataOfCurrentLine.stream() .filter(sdblData -> Ranges.containsRange(stringRange, sdblData.getRange())) .sorted(Comparator.comparing(data -> data.getRange().getStart().getCharacter())) .collect(Collectors.toList()); @@ -121,14 +118,14 @@ public void saveHighlighting(InputFile inputFile, DocumentContext documentContex string.setActive(false); // split current bsl token to parts excluding sdbl tokens - Position start = stringRange.getStart(); - int line = start.getLine(); + var start = stringRange.getStart(); + var line = start.getLine(); int startChar; - int endChar = start.getCharacter(); - for (HighlightingData currentToken : currentTokens) { + var endChar = start.getCharacter(); + for (var currentToken : currentTokens) { startChar = endChar; endChar = currentToken.getRange().getStart().getCharacter(); - TypeOfText typeOfText = string.getType(); + var typeOfText = string.getType(); if (startChar < endChar) { // add string part @@ -146,7 +143,7 @@ public void saveHighlighting(InputFile inputFile, DocumentContext documentContex // add final string part startChar = endChar; endChar = string.getRange().getEnd().getCharacter(); - TypeOfText typeOfText = string.getType(); + var typeOfText = string.getType(); if (startChar < endChar) { highlightingData.add(new HighlightingData( @@ -169,7 +166,7 @@ public void saveHighlighting(InputFile inputFile, DocumentContext documentContex } // save only active tokens - NewHighlighting highlighting = context.newHighlighting().onFile(inputFile); + var highlighting = context.newHighlighting().onFile(inputFile); highlightingData.stream() .filter(HighlightingData::isActive) @@ -195,18 +192,18 @@ public void highlightToken( return; } - int line = token.getLine(); - int charPositionInLine = token.getCharPositionInLine(); + var line = token.getLine(); + var charPositionInLine = token.getCharPositionInLine(); String tokenText = token.getText(); - Range range = Ranges.create( + var range = Ranges.create( line, charPositionInLine, line, charPositionInLine + tokenText.length() ); - HighlightingData data = new HighlightingData( + var data = new HighlightingData( range, typeOfText ); diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java index e75d7b6e..124909e5 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/IssuesLoader.java @@ -31,7 +31,6 @@ import org.eclipse.lsp4j.Diagnostic; import org.eclipse.lsp4j.DiagnosticRelatedInformation; import org.eclipse.lsp4j.DiagnosticSeverity; -import org.eclipse.lsp4j.Position; import org.eclipse.lsp4j.Range; import org.jetbrains.annotations.NotNull; import org.sonar.api.batch.fs.FilePredicates; @@ -51,7 +50,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.EnumMap; -import java.util.List; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; @@ -82,17 +80,21 @@ public IssuesLoader(SensorContext context) { } private static TextRange getTextRange(InputFile inputFile, Range range, String ruleKey) { - Position start = range.getStart(); - Position end = range.getEnd(); - int startLine = start.getLine() + 1; + var start = range.getStart(); + var end = range.getEnd(); + var startLine = start.getLine() + 1; TextRange textRange; try { textRange = inputFile.newRange(startLine, start.getCharacter(), end.getLine() + 1, end.getCharacter()); } catch (IllegalArgumentException e) { - var formattedRange = String.format("start(%d, %d), end(%d, %d)", range.getStart().getLine(), range.getStart().getCharacter(), range.getEnd().getLine(), range.getEnd().getCharacter()); - LOGGER.error("Can't compute TextRange for given Range: {} of rule: {} in file: {}.", formattedRange, ruleKey, inputFile.uri(), e); + var formattedRange = String.format("start(%d, %d), end(%d, %d)", + range.getStart().getLine(), range.getStart().getCharacter(), + range.getEnd().getLine(), range.getEnd().getCharacter() + ); + LOGGER.error("Can't compute TextRange for given Range: {} of rule: {} in file: {}.", + formattedRange, ruleKey, inputFile.uri(), e); textRange = selectThisOrPreviousLine(inputFile, startLine); } @@ -102,7 +104,7 @@ private static TextRange getTextRange(InputFile inputFile, Range range, String r } private static TextRange selectThisOrPreviousLine(InputFile inputFile, int line) { - int lines = inputFile.lines(); + var lines = inputFile.lines(); if (line == 0) { return inputFile.newRange(1, 0, lines, 0); @@ -113,11 +115,10 @@ private static TextRange selectThisOrPreviousLine(InputFile inputFile, int line) return inputFile.selectLine(line); } catch (IllegalArgumentException e) { LOGGER.error("Can't compute TextRange for given line {}", line, e); - return selectThisOrPreviousLine(inputFile, line - 1); + lines = line - 1; } - } else { - return selectThisOrPreviousLine(inputFile, lines); } + return selectThisOrPreviousLine(inputFile, lines); } private static Map createDiagnosticSeverityMap() { @@ -172,16 +173,22 @@ public void createIssue(InputFile inputFile, Diagnostic diagnostic) { var issue = context.newIssue(); issue.forRule(ruleKey); - Supplier newIssueLocationSupplier = issue::newLocation; - Consumer newIssueAddLocationConsumer = issue::addLocation; - Consumer newIssueAtConsumer = issue::at; - - processDiagnostic(inputFile, diagnostic, ruleId, newIssueLocationSupplier, newIssueAddLocationConsumer, newIssueAtConsumer); + processDiagnostic(inputFile, + diagnostic, + ruleId, + issue::newLocation, + issue::addLocation, + issue::at); issue.save(); } - private void processDiagnostic(InputFile inputFile, Diagnostic diagnostic, String ruleId, Supplier newIssueLocationSupplier, Consumer newIssueAddLocationConsumer, Consumer newIssueAtConsumer) { + private void processDiagnostic(InputFile inputFile, + Diagnostic diagnostic, + String ruleId, + Supplier newIssueLocationSupplier, + Consumer newIssueAddLocationConsumer, + Consumer newIssueAtConsumer) { var textRange = getTextRange(inputFile, diagnostic.getRange(), ruleId); @@ -192,7 +199,7 @@ private void processDiagnostic(InputFile inputFile, Diagnostic diagnostic, Strin newIssueAtConsumer.accept(location); - List relatedInformation = diagnostic.getRelatedInformation(); + var relatedInformation = diagnostic.getRelatedInformation(); if (relatedInformation != null) { relatedInformation.forEach((DiagnosticRelatedInformation relatedInformationEntry) -> { var path = Paths.get(URI.create(relatedInformationEntry.getLocation().getUri())).toAbsolutePath(); @@ -225,18 +232,22 @@ private void createExternalIssue(LoaderSettings settings, InputFile inputFile, D issue.type(ruleTypeMap.get(diagnostic.getSeverity())); issue.severity(severityMap.get(diagnostic.getSeverity())); - Supplier newIssueLocationSupplier = issue::newLocation; - Consumer newIssueAddLocationConsumer = issue::addLocation; - Consumer newIssueAtConsumer = issue::at; - - processDiagnostic(inputFile, diagnostic, ruleId, newIssueLocationSupplier, newIssueAddLocationConsumer, newIssueAtConsumer); + processDiagnostic(inputFile, + diagnostic, + ruleId, + issue::newLocation, + issue::addLocation, + issue::at); issue.save(); } @CheckForNull private InputFile getInputFile(Path path) { - return fileSystem.inputFile(predicates.and(predicates.hasLanguage(BSLLanguage.KEY), predicates.hasAbsolutePath(path.toAbsolutePath().toString()))); + return fileSystem.inputFile( + predicates.and(predicates.hasLanguage(BSLLanguage.KEY), + predicates.hasAbsolutePath(path.toAbsolutePath().toString())) + ); } @Value diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java index 70ab4a8a..549eab2d 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/LanguageServerDiagnosticsLoaderSensor.java @@ -21,7 +21,6 @@ */ package com.github._1c_syntax.bsl.sonar; -import com.fasterxml.jackson.databind.ObjectMapper; import com.github._1c_syntax.bsl.languageserver.reporters.data.AnalysisInfo; import com.github._1c_syntax.bsl.languageserver.reporters.data.FileInfo; import com.github._1c_syntax.bsl.languageserver.reporters.databind.AnalysisInfoObjectMapper; @@ -44,23 +43,21 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import java.util.List; import static com.github._1c_syntax.bsl.sonar.BSLCommunityProperties.LANG_SERVER_REPORT_PATH_KEY; public class LanguageServerDiagnosticsLoaderSensor implements Sensor { + private static final Logger LOGGER = Loggers.get(LanguageServerDiagnosticsLoaderSensor.class); + private final SensorContext context; private final IssuesLoader issueLoader; private FileSystem fileSystem; private FilePredicates predicates; - private static final Logger LOGGER = Loggers.get(LanguageServerDiagnosticsLoaderSensor.class); - public LanguageServerDiagnosticsLoaderSensor(final SensorContext context) { this.context = context; this.issueLoader = new IssuesLoader(context); - } @Override @@ -71,7 +68,7 @@ public void describe(SensorDescriptor descriptor) { @Override public void execute(SensorContext context) { - List reportFiles = ExternalReportProvider.getReportFiles(context, LANG_SERVER_REPORT_PATH_KEY); + var reportFiles = ExternalReportProvider.getReportFiles(context, LANG_SERVER_REPORT_PATH_KEY); reportFiles.forEach(this::parseAndSaveResults); } @@ -79,29 +76,29 @@ private void parseAndSaveResults(File analysisResultsFile) { LOGGER.info("Parsing 'BSL Language Server' analysis results:"); LOGGER.info(analysisResultsFile.getAbsolutePath()); - AnalysisInfo analysisInfo = getAnalysisInfo(analysisResultsFile); + var analysisInfo = getAnalysisInfo(analysisResultsFile); if (analysisInfo == null) { return; } - List fileinfos = analysisInfo.getFileinfos(); - for (FileInfo fileInfo : fileinfos) { + var fileinfos = analysisInfo.getFileinfos(); + for (var fileInfo : fileinfos) { processFileInfo(fileInfo); } } private void processFileInfo(FileInfo fileInfo) { fileSystem = context.fileSystem(); - Path path = fileInfo.getPath(); + var path = fileInfo.getPath(); predicates = fileSystem.predicates(); - InputFile inputFile = getInputFile(path); + var inputFile = getInputFile(path); if (inputFile == null) { LOGGER.warn("Can't find inputFile for absolute path {}", path); return; } - List diagnostics = fileInfo.getDiagnostics(); + var diagnostics = fileInfo.getDiagnostics(); diagnostics.forEach((Diagnostic diagnostic) -> processDiagnostic(inputFile, diagnostic)); } @@ -130,7 +127,7 @@ private static AnalysisInfo getAnalysisInfo(File analysisResultsFile) { return null; } - ObjectMapper objectMapper = new AnalysisInfoObjectMapper(); + var objectMapper = new AnalysisInfoObjectMapper(); try { return objectMapper.readValue(json, AnalysisInfo.class); @@ -139,6 +136,4 @@ private static AnalysisInfo getAnalysisInfo(File analysisResultsFile) { return null; } } - - } diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java index 5cfb6a2c..9384196b 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RuleDefinitionsContainer.java @@ -98,5 +98,4 @@ private void createRule(RulesFile.Rule rule) { ); } } - } diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java index 66daff81..943da1f5 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/ext_issues/RulesFileReader.java @@ -74,7 +74,7 @@ private static Optional getRulesFromResource(String resourceName) { try { json = IOUtils.toString( Objects.requireNonNull(RulesFileReader.class.getClassLoader().getResourceAsStream(resourceName)), - StandardCharsets.UTF_8.name() + StandardCharsets.UTF_8 ); } catch (IOException e) { LOGGER.error("Can't read json file rules", e); diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java index 08a0765e..4534f4fd 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/language/BSLLanguageServerRuleDefinition.java @@ -29,7 +29,6 @@ import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity; import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType; import com.github._1c_syntax.bsl.sonar.BSLCommunityProperties; -import org.commonmark.Extension; import org.commonmark.ext.autolink.AutolinkExtension; import org.commonmark.ext.gfm.tables.TablesExtension; import org.commonmark.ext.heading.anchor.HeadingAnchorExtension; @@ -71,7 +70,7 @@ public BSLLanguageServerRuleDefinition(Configuration config) { var configuration = BSLLSBinding.getLanguageServerConfiguration(); configuration.setLanguage(createDiagnosticLanguage()); - List extensions = Arrays.asList( + var extensions = Arrays.asList( TablesExtension.create(), AutolinkExtension.create(), HeadingAnchorExtension.create() @@ -88,18 +87,18 @@ public BSLLanguageServerRuleDefinition(Configuration config) { @Override public void define(Context context) { - NewRepository repository = context + var repository = context .createRepository(REPOSITORY_KEY, BSLLanguage.KEY) .setName(REPOSITORY_NAME); var diagnosticInfos = BSLLSBinding.getDiagnosticInfos(); diagnosticInfos.forEach((DiagnosticInfo currentDiagnosticInfo) -> { - diagnosticInfo = currentDiagnosticInfo; - NewRule newRule = repository.createRule(diagnosticInfo.getCode().getStringValue()); - setUpNewRule(newRule); - setUpRuleParams(newRule); - }); + diagnosticInfo = currentDiagnosticInfo; + var newRule = repository.createRule(diagnosticInfo.getCode().getStringValue()); + setUpNewRule(newRule); + setUpRuleParams(newRule); + }); repository.done(); @@ -125,7 +124,7 @@ private void setUpNewRule(NewRule newRule) { .setActivatedByDefault(diagnosticInfo.isActivatedByDefault()) ; - String[] tagsName = diagnosticInfo.getTags() + var tagsName = diagnosticInfo.getTags() .stream() .map(Enum::name) .map(String::toLowerCase) @@ -153,7 +152,7 @@ private String getHtmlDescription(String markdownDescription) { private void setUpRuleParams(NewRule newRule) { diagnosticInfo.getParameters() .forEach((DiagnosticParameterInfo diagnosticParameter) -> { - RuleParamType ruleParamType = getRuleParamType(diagnosticParameter.getType()); + var ruleParamType = getRuleParamType(diagnosticParameter.getType()); if (ruleParamType == null) { LOGGER.error( String.format( @@ -165,7 +164,7 @@ private void setUpRuleParams(NewRule newRule) { return; } - NewParam newParam = newRule.createParam(diagnosticParameter.getName()); + var newParam = newRule.createParam(diagnosticParameter.getName()); newParam.setType(ruleParamType); newParam.setDescription(diagnosticParameter.getDescription()); newParam.setDefaultValue(diagnosticParameter.getDefaultValue().toString()); @@ -174,7 +173,7 @@ private void setUpRuleParams(NewRule newRule) { private Language createDiagnosticLanguage() { - String diagnosticLanguageCode = config + var diagnosticLanguageCode = config .get(BSLCommunityProperties.LANG_SERVER_DIAGNOSTIC_LANGUAGE_KEY) .orElse(BSLCommunityProperties.LANG_SERVER_DIAGNOSTIC_LANGUAGE_DEFAULT_VALUE); @@ -221,6 +220,4 @@ private static Map createRuleTypeMap() { return map; } - } - diff --git a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java index ffc42640..24fe7c09 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/sonar/BSLCoreSensorTest.java @@ -227,14 +227,14 @@ void testCPD() { var componentKey = "moduleKey:" + FILE_NAME; assertThat(context.cpdTokens(componentKey)) - .isNotNull() - .hasSize(13); + .isNotNull() + .hasSize(13); assertThat(context.cpdTokens(componentKey)) - .filteredOn( tok -> tok.getValue().startsWith("ОставшийсяТокен")) - .hasSize(1); + .filteredOn(tok -> tok.getValue().startsWith("ОставшийсяТокен")) + .hasSize(1); assertThat(context.cpdTokens(componentKey)) - .filteredOn( tok -> tok.getValue().startsWith("ПропущенныйТокен")) - .isEmpty(); + .filteredOn(tok -> tok.getValue().startsWith("ПропущенныйТокен")) + .isEmpty(); } From 8575806190abb432ed908ddfe66e88cb7540af0b Mon Sep 17 00:00:00 2001 From: theshadowco Date: Fri, 3 Mar 2023 16:07:42 +0300 Subject: [PATCH 66/82] bump bslls --- build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f807bd6f..e44b50a4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,7 +32,8 @@ val sonarQubeVersion = "8.9.0.43852" dependencies { implementation("org.sonarsource.sonarqube", "sonar-plugin-api", sonarQubeVersion) - implementation("io.github.1c-syntax", "bsl-language-server", "1c83f52") { + // в jitpack лежат в группе com.github.1c-syntax, в централе - io.github.1c-syntax + implementation("com.github.1c-syntax", "bsl-language-server", "v0.21.0-ra.5") { exclude("com.github.1c-syntax", "utils") } implementation("com.github.1c-syntax", "utils", "f1694d9c") From 47334f137483977fc39e2a35ea271d7d5ce9280a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 02:58:44 +0000 Subject: [PATCH 67/82] Bump org.mockito:mockito-core from 5.1.1 to 5.2.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e44b50a4..c448e7c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:5.1.1") + testImplementation("org.mockito:mockito-core:5.2.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 6284a171c0db7a265619d64379937bc4596a4d0f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Mar 2023 02:58:41 +0000 Subject: [PATCH 68/82] Bump actions/setup-java from 3.10.0 to 3.11.0 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.10.0...v3.11.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle.yml | 2 +- .github/workflows/night_build.yml | 2 +- .github/workflows/qa.yml | 2 +- .github/workflows/release.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index fc3102a7..3afb509c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java_version }} - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: java-version: ${{ matrix.java_version }} distribution: 'adopt' diff --git a/.github/workflows/night_build.yml b/.github/workflows/night_build.yml index bdef962e..09a2a39f 100644 --- a/.github/workflows/night_build.yml +++ b/.github/workflows/night_build.yml @@ -17,7 +17,7 @@ jobs: with: ref: nigth_build - name: Set up JDK - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: java-version: 17 distribution: 'adopt' diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 235cc0c8..1776b9d9 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,7 +17,7 @@ jobs: - run: | git fetch --prune --unshallow - name: Set up JDK 17 - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: java-version: 17 distribution: 'adopt' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f62aee9b..bbaa1b22 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - name: Set up JDK - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: java-version: 17 distribution: 'adopt' From c0873e2f16ae3b477a58bf484d6e11bd69e31773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 02:58:57 +0000 Subject: [PATCH 69/82] Bump org.mockito:mockito-core from 5.2.0 to 5.3.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.2.0 to 5.3.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.2.0...v5.3.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c448e7c0..e3c81822 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:5.2.0") + testImplementation("org.mockito:mockito-core:5.3.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 3e2836e2782f6a0af9497bbcd81e7a722e5b4fb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 02:59:30 +0000 Subject: [PATCH 70/82] Bump org.mockito:mockito-core from 5.3.0 to 5.3.1 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.3.0...v5.3.1) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e3c81822..ecf4e0c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:5.3.0") + testImplementation("org.mockito:mockito-core:5.3.1") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 0444e93f1ed3d46b463b519243990c60afc73048 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 02:59:12 +0000 Subject: [PATCH 71/82] Bump org.sonarsource.analyzer-commons:sonar-analyzer-commons Bumps [org.sonarsource.analyzer-commons:sonar-analyzer-commons](https://github.com/SonarSource/sonar-analyzer-commons) from 2.2.0.1251 to 2.5.0.1358. - [Release notes](https://github.com/SonarSource/sonar-analyzer-commons/releases) - [Commits](https://github.com/SonarSource/sonar-analyzer-commons/compare/2.2.0.1251...2.5.0.1358) --- updated-dependencies: - dependency-name: org.sonarsource.analyzer-commons:sonar-analyzer-commons dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ecf4e0c6..602341d3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons - implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.2.0.1251") + implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.5.0.1358") // MD to HTML converter of BSL LS rule descriptions implementation("org.commonmark", "commonmark", "0.21.0") From 1125d43cb202b34985f32c758bbd7316eaf25264 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 May 2023 02:58:21 +0000 Subject: [PATCH 72/82] Bump com.fasterxml.jackson.core:jackson-databind from 2.14.2 to 2.15.1 Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.14.2 to 2.15.1. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ecf4e0c6..89581f00 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("com.github.1c-syntax", "utils", "f1694d9c") implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2") + implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.2.0.1251") From edfd72c0267e0e3a74f2b3448ac79efd84f7ff86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 02:58:23 +0000 Subject: [PATCH 73/82] Bump org.sonarqube from 4.0.0.2929 to 4.1.0.3113 Bumps org.sonarqube from 4.0.0.2929 to 4.1.0.3113. --- updated-dependencies: - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ecf4e0c6..187cddd7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { jacoco java `maven-publish` - id("org.sonarqube") version "4.0.0.2929" + id("org.sonarqube") version "4.1.0.3113" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.46.0" From af216dbe8f8d48c6f7617909773919125afe52c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 May 2023 03:07:32 +0000 Subject: [PATCH 74/82] Bump io.freefair.lombok from 6.6.3 to 8.0.1 Bumps [io.freefair.lombok](https://github.com/freefair/gradle-plugins) from 6.6.3 to 8.0.1. - [Release notes](https://github.com/freefair/gradle-plugins/releases) - [Commits](https://github.com/freefair/gradle-plugins/compare/6.6.3...8.0.1) --- updated-dependencies: - dependency-name: io.freefair.lombok dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4a21b649..3df0ba7d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.46.0" id("com.github.gradle-git-version-calculator") version "1.1.0" - id("io.freefair.lombok") version "6.6.3" + id("io.freefair.lombok") version "8.0.1" } group = "io.github.1c-syntax" From b4f6d3f800daeeec8c7c2a22c9a28726981769c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 02:58:05 +0000 Subject: [PATCH 75/82] Bump com.fasterxml.jackson.core:jackson-databind from 2.15.1 to 2.15.2 Bumps [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) from 2.15.1 to 2.15.2. - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4a21b649..8aea9dee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { implementation("com.github.1c-syntax", "utils", "f1694d9c") implementation("org.apache.commons:commons-lang3:3.12.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1") + implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2") // https://mvnrepository.com/artifact/org.sonarsource.analyzer-commons/sonar-analyzer-commons implementation("org.sonarsource.analyzer-commons:sonar-analyzer-commons:2.5.0.1358") From 36037d76b662afbeafb44f3f0c645e71bbc7e346 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Jun 2023 02:59:00 +0000 Subject: [PATCH 76/82] Bump org.sonarqube from 4.1.0.3113 to 4.2.0.3129 Bumps org.sonarqube from 4.1.0.3113 to 4.2.0.3129. --- updated-dependencies: - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a47172b3..fa384a81 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { jacoco java `maven-publish` - id("org.sonarqube") version "4.1.0.3113" + id("org.sonarqube") version "4.2.0.3129" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.46.0" From 41fcb620e81240385f7512f305d619d3c987b5d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 02:58:56 +0000 Subject: [PATCH 77/82] Bump com.github.ben-manes.versions from 0.46.0 to 0.47.0 Bumps com.github.ben-manes.versions from 0.46.0 to 0.47.0. --- updated-dependencies: - dependency-name: com.github.ben-manes.versions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index fa384a81..b1a9089a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("org.sonarqube") version "4.2.0.3129" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") - id("com.github.ben-manes.versions") version "0.46.0" + id("com.github.ben-manes.versions") version "0.47.0" id("com.github.gradle-git-version-calculator") version "1.1.0" id("io.freefair.lombok") version "8.0.1" } From de7c70a2965e0e9ce2f4a61c47c4826675e1f41b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Jun 2023 02:58:09 +0000 Subject: [PATCH 78/82] Bump org.sonarqube from 4.2.0.3129 to 4.2.1.3168 Bumps org.sonarqube from 4.2.0.3129 to 4.2.1.3168. --- updated-dependencies: - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b1a9089a..6e0a7af8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { jacoco java `maven-publish` - id("org.sonarqube") version "4.2.0.3129" + id("org.sonarqube") version "4.2.1.3168" id("org.cadixdev.licenser") version "0.6.1" id("com.github.johnrengelman.shadow") version("7.0.0") id("com.github.ben-manes.versions") version "0.47.0" From a892706acb759174241fc173f608ba599b889edf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 02:58:55 +0000 Subject: [PATCH 79/82] Bump org.mockito:mockito-core from 5.3.1 to 5.4.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.3.1 to 5.4.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.3.1...v5.4.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6e0a7af8..e41df030 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,7 +58,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.8.0") testImplementation("org.assertj:assertj-core:3.24.2") - testImplementation("org.mockito:mockito-core:5.3.1") + testImplementation("org.mockito:mockito-core:5.4.0") testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) From 9ac973eb30bb30d3af7c7a5bd3b1541bab0a9faa Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Wed, 21 Jun 2023 08:22:23 +0200 Subject: [PATCH 80/82] BSL LS 0.21.0 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e41df030..746d6483 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,10 +33,10 @@ dependencies { implementation("org.sonarsource.sonarqube", "sonar-plugin-api", sonarQubeVersion) // в jitpack лежат в группе com.github.1c-syntax, в централе - io.github.1c-syntax - implementation("com.github.1c-syntax", "bsl-language-server", "v0.21.0-ra.5") { + implementation("io.github.1c-syntax", "bsl-language-server", "0.21.0") { exclude("com.github.1c-syntax", "utils") } - implementation("com.github.1c-syntax", "utils", "f1694d9c") + implementation("com.github.1c-syntax", "utils", "0.5.1") implementation("org.apache.commons:commons-lang3:3.12.0") implementation("com.fasterxml.jackson.core:jackson-databind:2.15.2") From 35b1f3f468fa86280aa9b2fa357d2dbaae3a0a37 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Wed, 21 Jun 2023 21:54:18 +0200 Subject: [PATCH 81/82] Update build.gradle.kts --- build.gradle.kts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 746d6483..a99ed7ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -63,6 +63,19 @@ dependencies { testImplementation("org.sonarsource.sonarqube", "sonar-testing-harness", sonarQubeVersion) testImplementation("org.sonarsource.sonarqube", "sonar-core", sonarQubeVersion) testImplementation("org.reflections", "reflections", "0.9.12") + + // CONSTRAINTS + + implementation("org.slf4j:slf4j-api") { + version { + strictly("1.7.30") + } + } + implementation("com.google.guava:guava") { + version { + strictly("30.1-jre") + } + } } java { From 3e8a2c276e38b5a8d080b14bbc09999660bbecc7 Mon Sep 17 00:00:00 2001 From: Nikita Fedkin Date: Wed, 21 Jun 2023 21:55:23 +0200 Subject: [PATCH 82/82] BSL LS 0.21 --- .../java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java index 0c512e6c..722c1ad5 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java +++ b/src/main/java/com/github/_1c_syntax/bsl/sonar/BSLHighlighter.java @@ -325,7 +325,8 @@ private static Set createBslPreprocessor() { BSLLexer.PREPROC_WINDOWS, BSLLexer.PREPROC_MACOS, BSLLexer.PREPROC_ANY, - BSLLexer.PREPROC_MOBILE_STANDALONE_SERVER + BSLLexer.PREPROC_MOBILE_STANDALONE_SERVER, + BSLLexer.PREPROC_NATIVE ); }