From 8f6c9e8c7be55e29ab03a1f01c7712cbbb1f4753 Mon Sep 17 00:00:00 2001 From: EightM Date: Sat, 15 Oct 2022 12:17:56 +0300 Subject: [PATCH 1/2] feat: spring dependency up --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 17799a9ed95..d31a9caa521 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,7 +16,7 @@ plugins { id("io.freefair.maven-central.validate-poms") version "6.5.1" id("me.qoomon.git-versioning") version "6.3.2" id("com.github.ben-manes.versions") version "0.42.0" - id("org.springframework.boot") version "2.6.7" + id("org.springframework.boot") version "2.7.4" id("io.spring.dependency-management") version "1.0.14.RELEASE" id("io.github.1c-syntax.bslls-dev-tools") version "0.7.0" id("ru.vyarus.pom") version "2.2.1" From b232090cf6f459522525f329ad5d7032c8c6fd3b Mon Sep 17 00:00:00 2001 From: EightM Date: Sat, 15 Oct 2022 14:36:19 +0300 Subject: [PATCH 2/2] feat: default values for config values --- .../configuration/LanguageServerConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java index 810fb3334d4..dbd72981910 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java @@ -89,7 +89,7 @@ public class LanguageServerConfiguration { @JsonProperty("documentLink") @Setter(value = AccessLevel.NONE) private DocumentLinkOptions documentLinkOptions = new DocumentLinkOptions(); - + @JsonProperty("formatting") @Setter(value = AccessLevel.NONE) private FormattingOptions formattingOptions = new FormattingOptions(); @@ -109,11 +109,11 @@ public class LanguageServerConfiguration { @Setter(value = AccessLevel.NONE) private File configurationFile; - @Value("${app.configuration.path}") + @Value("${app.configuration.path}:.bsl-language-server.json") @JsonIgnore private String configurationFilePath; - @Value(("${app.globalConfiguration.path}")) + @Value(("${app.globalConfiguration.path}:${user.home}/.bsl-language-server.json")) @JsonIgnore private String globalConfigPath;