Index: data_nodist/restriction.osm
===================================================================
--- data_nodist/restriction.osm (revision 14963)
+++ data_nodist/restriction.osm (working copy)
@@ -1,927 +1,1283 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java
===================================================================
--- test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java (nonexistent)
+++ test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java (working copy)
@@ -0,0 +1,35 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.tests;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * JUnit Test of turn restriction validation test.
+ */
+public class TurnRestrictionTestTest {
+
+ private static final TurnrestrictionTest TURNRESTRICTION_TEST = new TurnrestrictionTest();
+ private static final RelationChecker RELATION_TEST = new RelationChecker();
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().projection().mapStyles().presets().main();
+
+ /**
+ * Test all error cases manually created in restriction.osm.
+ * @throws Exception in case of error
+ */
+ @Test
+ public void testTurnrestrictionFile() throws Exception {
+ ValidatorTestUtils.testSampleFile("data_nodist/restriction.osm",
+ ds -> ds.getRelations(),
+ name -> name.startsWith("E"), TURNRESTRICTION_TEST, RELATION_TEST);
+ }
+}
Index: test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java
===================================================================
--- test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java (revision 14963)
+++ test/unit/org/openstreetmap/josm/data/validation/tests/ValidatorTestUtils.java (working copy)
@@ -37,16 +37,16 @@
try (InputStream is = new FileInputStream(sampleFile)) {
for (T t: provider.apply(OsmReader.parseDataSet(is, null))) {
String name = DefaultNameFormatter.getInstance().format(t);
+ List errors = new ArrayList<>();
+ for (Test test : tests) {
+ test.initialize();
+ test.startTest(null);
+ test.visit(Collections.singleton(t));
+ test.endTest();
+ errors.addAll(test.getErrors());
+ }
String codes = t.get("josm_error_codes");
if (codes != null) {
- List errors = new ArrayList<>();
- for (Test test : tests) {
- test.initialize();
- test.startTest(null);
- test.visit(Collections.singleton(t));
- test.endTest();
- errors.addAll(test.getErrors());
- }
Set expectedCodes = new TreeSet<>();
if (!"none".equals(codes)) {
for (String code : codes.split(",")) {
@@ -64,6 +64,8 @@
expectedCodes.size(), actualCodes.size());
} else if (t.hasKey("name") && namePredicate != null && namePredicate.test(t.getName())) {
fail(name + " lacks josm_error_codes tag");
+ } else if (t.hasKey("name") && name.startsWith("OK") && !errors.isEmpty()) {
+ fail(name + "has unexpected error(s) ");
}
}
}
Index: src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (revision 14963)
+++ src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (working copy)
@@ -63,6 +63,7 @@
*/
public static final String ROLE_VERIF_PROBLEM_MSG = tr("Role verification problem");
private boolean ignoreMultiPolygons;
+ private boolean ignoreTurnRestrictions;
/**
* Constructor
@@ -108,8 +109,10 @@
for (Test t : OsmValidator.getEnabledTests(false)) {
if (t instanceof MultipolygonTest) {
ignoreMultiPolygons = true;
- break;
}
+ if (t instanceof TurnrestrictionTest) {
+ ignoreTurnRestrictions = true;
+ }
}
}
@@ -126,6 +129,10 @@
// see #17010: don't report same problem twice
return;
}
+ if (ignoreTurnRestrictions && n.hasTag("type","restriction")) {
+ // see #17561: don't report same problem twice
+ return;
+ }
Map allroles = buildAllRoles(n);
if (allroles.isEmpty() && n.hasTag("type", "route")
&& n.hasTag("route", "train", "subway", "monorail", "tram", "bus", "trolleybus", "aerialway", "ferry")) {
@@ -307,6 +314,9 @@
}
// verify unwanted members
for (String key : map.keySet()) {
+ // see #17567
+ if ("location_hint".equals(key) && "restriction".equals(n.get("type")))
+ continue;
boolean found = false;
for (Role r: allroles.keySet()) {
if (r.isRole(key)) {
Index: src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (revision 14963)
+++ src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java (working copy)
@@ -4,6 +4,7 @@
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.openstreetmap.josm.data.osm.Node;
@@ -37,7 +38,16 @@
protected static final int UNCONNECTED_VIA = 1814;
protected static final int SUPERFLUOUS = 1815;
protected static final int FROM_EQUALS_TO = 1816;
+ protected static final int UNKNOWN_RESTRICTION = 1817;
+ protected static final int TO_CLOSED_WAY = 1818;
+ protected static final int FROM_CLOSED_WAY = 1819;
+ private static final List SUPPORTED_RESTRICTIONS = Arrays.asList(
+ "no_right_turn", "no_left_turn", "no_u_turn", "no_straight_on",
+ "only_right_turn", "only_left_turn", "only_straight_on",
+ "no_entry", "no_exit"
+ );
+
/**
* Constructs a new {@code TurnrestrictionTest}.
*/
@@ -50,6 +60,14 @@
if (!r.hasTag("type", "restriction"))
return;
+ if (!r.hasTag("restriction", SUPPORTED_RESTRICTIONS)) {
+ errors.add(TestError.builder(this, Severity.ERROR, UNKNOWN_RESTRICTION)
+ .message(tr("Unknown restriction"))
+ .primitives(r)
+ .build());
+ return;
+ }
+
Way fromWay = null;
Way toWay = null;
List via = new ArrayList<>();
@@ -97,7 +115,7 @@
break;
default:
errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_ROLE)
- .message(tr("Unknown role"))
+ .message(tr("Unknown role in restriction"))
.primitives(l)
.highlight(m.getMember())
.build());
@@ -104,7 +122,8 @@
}
} else if (m.isNode()) {
Node n = m.getNode();
- if ("via".equals(m.getRole())) {
+ switch (m.getRole()) {
+ case "via":
if (!via.isEmpty()) {
if (via.get(0) instanceof Node) {
morevia = true;
@@ -114,9 +133,12 @@
} else {
via.add(n);
}
- } else {
+ break;
+ case "location_hint":
+ break;
+ default:
errors.add(TestError.builder(this, Severity.WARNING, UNKNOWN_ROLE)
- .message(tr("Unknown role"))
+ .message(tr("Unknown role in restriction"))
.primitives(l)
.highlight(m.getMember())
.build());
@@ -134,6 +156,7 @@
.message(tr("More than one \"from\" way found"))
.primitives(r)
.build());
+ return;
}
if (moreto) {
errors.add(TestError.builder(this, Severity.ERROR, MORE_TO)
@@ -140,6 +163,7 @@
.message(tr("More than one \"to\" way found"))
.primitives(r)
.build());
+ return;
}
if (morevia) {
errors.add(TestError.builder(this, Severity.ERROR, MORE_VIA)
@@ -146,6 +170,7 @@
.message(tr("More than one \"via\" node found"))
.primitives(r)
.build());
+ return;
}
if (mixvia) {
errors.add(TestError.builder(this, Severity.ERROR, MIX_VIA)
@@ -152,6 +177,7 @@
.message(tr("Cannot mix node and way for role \"via\""))
.primitives(r)
.build());
+ return;
}
if (fromWay == null) {
@@ -160,7 +186,15 @@
.primitives(r)
.build());
return;
+ } else if (fromWay.isClosed()) {
+ errors.add(TestError.builder(this, Severity.ERROR, FROM_CLOSED_WAY)
+ .message(tr("\"from\" way is a closed way"))
+ .primitives(r)
+ .highlight(fromWay)
+ .build());
+ return;
}
+
if (toWay == null) {
errors.add(TestError.builder(this, Severity.ERROR, NO_TO)
.message(tr("No \"to\" way found"))
@@ -167,6 +201,13 @@
.primitives(r)
.build());
return;
+ } else if (toWay.isClosed()) {
+ errors.add(TestError.builder(this, Severity.ERROR, TO_CLOSED_WAY)
+ .message(tr("\"to\" way is a closed way"))
+ .primitives(r)
+ .highlight(toWay)
+ .build());
+ return;
}
if (fromWay.equals(toWay)) {
Severity severity = r.hasTag("restriction", "no_u_turn") ? Severity.OTHER : Severity.WARNING;
@@ -185,39 +226,57 @@
if (via.get(0) instanceof Node) {
final Node viaNode = (Node) via.get(0);
+ if (isFullOneway(toWay) && viaNode.equals(toWay.lastNode(true))) {
+ errors.add(TestError.builder(this, Severity.WARNING, SUPERFLUOUS)
+ .message(tr("Superfluous turnrestriction as \"to\" way is oneway"))
+ .primitives(r)
+ .highlight(toWay)
+ .build());
+ return;
+ }
+ if (isFullOneway(fromWay) && viaNode.equals(fromWay.firstNode(true))) {
+ errors.add(TestError.builder(this, Severity.WARNING, SUPERFLUOUS)
+ .message(tr("Superfluous turnrestriction as \"from\" way is oneway"))
+ .primitives(r)
+ .highlight(fromWay)
+ .build());
+ return;
+ }
final Way viaPseudoWay = new Way();
viaPseudoWay.addNode(viaNode);
- checkIfConnected(fromWay, viaPseudoWay,
+ checkIfConnected(r, fromWay, viaPseudoWay,
tr("The \"from\" way does not start or end at a \"via\" node."), FROM_VIA_NODE);
- if (toWay.isOneway() != 0 && viaNode.equals(toWay.lastNode(true))) {
+ checkIfConnected(r, viaPseudoWay, toWay,
+ tr("The \"to\" way does not start or end at a \"via\" node."), TO_VIA_NODE);
+ } else {
+ if (isFullOneway(toWay) && ((Way) via.get(via.size() - 1)).isFirstLastNode(toWay.lastNode(true))) {
errors.add(TestError.builder(this, Severity.WARNING, SUPERFLUOUS)
.message(tr("Superfluous turnrestriction as \"to\" way is oneway"))
.primitives(r)
+ .highlight(toWay)
.build());
return;
}
- checkIfConnected(viaPseudoWay, toWay,
- tr("The \"to\" way does not start or end at a \"via\" node."), TO_VIA_NODE);
- } else {
+ if (isFullOneway(fromWay) && ((Way) via.get(0)).isFirstLastNode(fromWay.firstNode(true))) {
+ errors.add(TestError.builder(this, Severity.WARNING, SUPERFLUOUS)
+ .message(tr("Superfluous turnrestriction as \"from\" way is oneway"))
+ .primitives(r)
+ .highlight(fromWay)
+ .build());
+ return;
+ }
// check if consecutive ways are connected: from/via[0], via[i-1]/via[i], via[last]/to
- checkIfConnected(fromWay, (Way) via.get(0),
+ checkIfConnected(r, fromWay, (Way) via.get(0),
tr("The \"from\" and the first \"via\" way are not connected."), FROM_VIA_WAY);
if (via.size() > 1) {
for (int i = 1; i < via.size(); i++) {
Way previous = (Way) via.get(i - 1);
Way current = (Way) via.get(i);
- checkIfConnected(previous, current,
+ checkIfConnected(r, previous, current,
tr("The \"via\" ways are not connected."), UNCONNECTED_VIA);
}
}
- if (toWay.isOneway() != 0 && ((Way) via.get(via.size() - 1)).isFirstLastNode(toWay.lastNode(true))) {
- errors.add(TestError.builder(this, Severity.WARNING, SUPERFLUOUS)
- .message(tr("Superfluous turnrestriction as \"to\" way is oneway"))
- .primitives(r)
- .build());
- return;
- }
- checkIfConnected((Way) via.get(via.size() - 1), toWay,
+ checkIfConnected(r, (Way) via.get(via.size() - 1), toWay,
tr("The last \"via\" and the \"to\" way are not connected."), TO_VIA_WAY);
}
}
@@ -226,7 +285,7 @@
return w.isOneway() != 0 && !w.hasTag("oneway:bicycle", "no");
}
- private void checkIfConnected(Way previous, Way current, String msg, int code) {
+ private void checkIfConnected(Relation r, Way previous, Way current, String msg, int code) {
boolean c;
if (isFullOneway(previous) && isFullOneway(current)) {
// both oneways: end/start node must be equal
@@ -242,9 +301,22 @@
c = current.isFirstLastNode(previous.firstNode()) || current.isFirstLastNode(previous.lastNode());
}
if (!c) {
+ List hilite = new ArrayList<>();
+ if (previous.getNodesCount() == 1 && previous.isNew())
+ hilite.add(previous.firstNode());
+ else
+ hilite.add(previous);
+ if (current.getNodesCount() == 1 && current.isNew())
+ hilite.add(current.firstNode());
+ else
+ hilite.add(current);
+ List primitives = new ArrayList<>();
+ primitives.add(r);
+ primitives.addAll(hilite);
errors.add(TestError.builder(this, Severity.ERROR, code)
.message(msg)
- .primitives(previous, current)
+ .primitives(primitives)
+ .highlight(hilite)
.build());
}
}