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

Use non-deprecated snakeyaml FlowStyle API

Browse Source
This commit is contained in:
aboyko
2023-07-11 23:54:00 -04:00
parent 6496537e61
commit 0be66eb6ae
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse-language-servers/org.springframework.ide.eclipse.editor.support/src/org/springframework/ide/eclipse/editor/support/yaml/reconcile/YamlSchemaProblems.java
View File

@@ -108,7 +108,7 @@ public class YamlSchemaProblems {
}
else if (flowStyle instanceof DumperOptions.FlowStyle) {
DumperOptions.FlowStyle style = (DumperOptions.FlowStyle) flowStyle;
flow = style.getStyleBoolean();
flow = style == DumperOptions.FlowStyle.FLOW;
}
if (!flow) {

5
headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/YamlSchemaProblems.java
View File

@@ -32,6 +32,7 @@ import org.springframework.ide.vscode.commons.yaml.path.YamlPathSegment;
import org.springframework.ide.vscode.commons.yaml.schema.DynamicSchemaContext;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypedProperty;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.error.Mark;
import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.nodes.Node;
@@ -113,8 +114,8 @@ public class YamlSchemaProblems {
}
}
} else if (parent instanceof SequenceNode) {
Boolean flowStyle = ((SequenceNode) parent).getFlowStyle().getStyleBoolean();
if (flowStyle!=null && !flowStyle) {
boolean flowStyle = ((SequenceNode) parent).getFlowStyle() == DumperOptions.FlowStyle.FLOW;
if (!flowStyle) {
Mark nodeStart = map.getStartMark();
underline = new DocumentRegion(doc, 0, nodeStart.getIndex());
underline = underline.trimEnd();