Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code format fixes

Browse Source
This commit is contained in:
Martin Lippert
2023-08-04 15:13:28 +02:00
parent 5aaf39b4ee
commit 073b53ae7b
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java
View File

@@ -41,14 +41,14 @@ public class Settings {
public <T> T getAs(Class<T> type, String... names) {
JsonElement json = getRawProperty(names);
if (json!=null) {
if (json != null) {
return gson().fromJson(json, type);
}
return null;
}
private Gson gson() {
if (gson==null) {
if (gson == null) {
gson = new Gson();
}
return gson;
@@ -123,7 +123,7 @@ public class Settings {
return settings;
} else if (settings instanceof JsonObject) {
JsonElement sub = ((JsonObject)settings).get(names[i]);
return getRawProperty(sub, names, i+1);
return getRawProperty(sub, names, i + 1);
} else {
return null;
}
@@ -131,12 +131,12 @@ public class Settings {
@Override
public String toString() {
return ""+settings;
return "" + settings;
}
public Settings navigate(String... names) {
if (this.settings!=null && !this.settings.isJsonNull()) {
if (names.length==0) {
if (this.settings != null && !this.settings.isJsonNull()) {
if (names.length == 0) {
return this;
} else if (this.settings.isJsonObject()) {
JsonObject obj = (JsonObject) this.settings;
@@ -150,15 +150,15 @@ public class Settings {
}
private String[] cdr(String[] names) {
String[] rest = new String[names.length-1];
String[] rest = new String[names.length - 1];
for (int i = 0; i < rest.length; i++) {
rest[i] = names[i+1];
rest[i] = names[i + 1];
}
return rest;
}
public Iterable<String> keys() {
if (settings!=null && settings.isJsonObject()) {
if (settings != null && settings.isJsonObject()) {
JsonObject obj = (JsonObject) settings;
return obj.keySet();
}

5
headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootDiagnosticSeverityProvider.java
View File

@@ -28,13 +28,16 @@ public class BootDiagnosticSeverityProvider implements DiagnosticSeverityProvide
@Override
public synchronized DiagnosticSeverity getDiagnosticSeverity(ProblemType problem) {
String severityOverride = config.getRawSettings().getString("spring-boot", "ls", "problem", problem.getCategory().getId(), problem.getCode());
ProblemSeverity severity = null;
if (severityOverride != null && !severityOverride.isBlank()) {
severity = ProblemSeverity.valueOf(severityOverride);
}
if (severity==null) {
if (severity == null) {
severity = problem.getDefaultSeverity();
}
return DiagnosticSeverityProvider.diagnosticSeverity(severity);
}
}