diff --git a/build.gradle.kts b/build.gradle.kts index 2f08e91940..02f2625bbb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,13 +12,13 @@ plugins { id("org.cadixdev.licenser") version "0.6.1" id("org.sonarqube") version "5.1.0.4882" id("io.freefair.lombok") version "8.10.2" - id("io.freefair.javadoc-links") version "8.10.2" + //id("io.freefair.javadoc-links") version "8.10.2" id("io.freefair.javadoc-utf-8") version "8.10.2" id("io.freefair.aspectj.post-compile-weaving") version "8.10.2" id("io.freefair.maven-central.validate-poms") version "8.10.2" id("me.qoomon.git-versioning") version "6.4.4" id("com.github.ben-manes.versions") version "0.51.0" - id("org.springframework.boot") version "3.2.5" + id("org.springframework.boot") version "3.3.5" id("io.spring.dependency-management") version "1.1.6" id("io.github.1c-syntax.bslls-dev-tools") version "0.8.1" id("ru.vyarus.pom") version "3.0.0" @@ -59,7 +59,7 @@ gitProperties { val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG -val languageToolVersion = "6.4" +val languageToolVersion = "6.5" dependencyManagement { imports { @@ -107,8 +107,8 @@ dependencies { implementation("org.aspectj", "aspectjrt", "1.9.22.1") // commons utils - implementation("commons-io", "commons-io", "2.16.1") - implementation("org.apache.commons", "commons-lang3", "3.14.0") + implementation("commons-io", "commons-io", "2.17.0") + implementation("org.apache.commons", "commons-lang3", "3.17.0") implementation("commons-beanutils", "commons-beanutils", "1.9.4"){ exclude("commons-logging", "commons-logging") } @@ -135,7 +135,7 @@ dependencies { // CONSTRAINTS implementation("com.google.guava:guava") { version { - strictly("33.2.1-jre") + strictly("33.3.1-jre") } } @@ -151,7 +151,7 @@ dependencies { // test utils testImplementation("org.jmockit", "jmockit", "1.49") - testImplementation("org.awaitility", "awaitility", "4.2.1") + testImplementation("org.awaitility", "awaitility", "4.2.2") } lombok { @@ -218,7 +218,7 @@ tasks.check { tasks.jacocoTestReport { reports { xml.required.set(true) - xml.outputLocation.set(File("$buildDir/reports/jacoco/test/jacoco.xml")) + xml.outputLocation.set(File("${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")) } } @@ -238,12 +238,12 @@ tasks.generateDiagnosticDocs { doLast { val resourcePath = tasks["processResources"].outputs.files.singleFile copy { - from("$buildDir/docs/diagnostics") + from("${layout.buildDirectory.get()}/docs/diagnostics") into("$resourcePath/com/github/_1c_syntax/bsl/languageserver/diagnostics/ru") } copy { - from("$buildDir/docs/en/diagnostics") + from("${layout.buildDirectory.get()}/docs/en/diagnostics") into("$resourcePath/com/github/_1c_syntax/bsl/languageserver/diagnostics/en") } } @@ -285,7 +285,7 @@ sonarqube { property("sonar.projectKey", "1c-syntax_bsl-language-server") property("sonar.projectName", "BSL Language Server") property("sonar.exclusions", "**/gen/**/*.*") - property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacoco.xml") + property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml") } } diff --git a/docs/diagnostics/ReservedParameterNames.md b/docs/diagnostics/ReservedParameterNames.md index 7a5ce85f5f..51960a86f0 100644 --- a/docs/diagnostics/ReservedParameterNames.md +++ b/docs/diagnostics/ReservedParameterNames.md @@ -1,4 +1,4 @@ -# Зарезервированные имена параметра (ReservedParameterNames) +# Зарезервированные имена параметров (ReservedParameterNames) ## Описание диагностики diff --git a/docs/en/diagnostics/DoubleNegatives.md b/docs/en/diagnostics/DoubleNegatives.md index 65eea5b15f..8cf35e0683 100644 --- a/docs/en/diagnostics/DoubleNegatives.md +++ b/docs/en/diagnostics/DoubleNegatives.md @@ -2,4 +2,6 @@ -* Description +## Description + +Описание диагностики diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json index a6ca9ad371..b6fd3f3fae 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json @@ -1672,7 +1672,7 @@ }, "ReservedParameterNames": { "description": "Reserved parameter names", - "default": false, + "default": true, "type": [ "boolean", "object" diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json index e515c9e742..f117154cae 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json @@ -954,4 +954,4 @@ "default": "ask" } } -} +} \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticInfosTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticInfosTest.java index 403bec0c3e..6640b79aee 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticInfosTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/DiagnosticInfosTest.java @@ -75,9 +75,9 @@ void testAllDiagnosticsHaveDiagnosticMessage() { @Test void testAllDiagnosticsHaveDescriptionResource() { - assertThatCode(() -> diagnosticInfos.values().forEach(diagnosticInfo - -> assertThat(diagnosticInfo.getDescription()).isNotEmpty())) - .doesNotThrowAnyException(); + assertThat(diagnosticInfos).allSatisfy((key, diagnosticInfo) -> { + assertThat(diagnosticInfo.getDescription()).isNotEmpty(); + }); } @Test diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ReservedParameterNamesTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ReservedParameterNamesDiagnosticTest.java similarity index 94% rename from src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ReservedParameterNamesTest.java rename to src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ReservedParameterNamesDiagnosticTest.java index 415cd8c32d..5a90717ca3 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ReservedParameterNamesTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/ReservedParameterNamesDiagnosticTest.java @@ -54,7 +54,7 @@ void testPositive() { assertThat(diagnostics).hasSize(1); assertThat(diagnostics, true) - .hasMessageOnRange("Переименуйте параметр \"ВидГруппыФормы\" чтобы он не совпадал с зарезервированным словом.", + .hasMessageOnRange("Переименуйте параметр \"ВидГруппыФормы\" так, чтобы он не совпадал с зарезервированным словом.", 2, 16, 30); }