Changeset 15994 in josm for trunk/src/org

Timestamp:

2020-03-02T00:54:04+01:00 (5 years ago)

Author:

simon04

Message:

fix #18741 - Tag checker: report codepoint of unusual Unicode character

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -23 +23 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.OptionalInt;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -451 +452 @@
 
     static boolean containsUnusualUnicodeCharacter(String key, String value) {
-        return value != null && value.chars().anyMatch(c -> isUnusualUnicodeBlock(key, c));
+        return getUnusualUnicodeCharacter(key, value).isPresent();
+    }
+
+    static OptionalInt getUnusualUnicodeCharacter(String key, String value) {
+        return value == null
+                ? OptionalInt.empty()
+                : value.chars().filter(c -> isUnusualUnicodeBlock(key, c)).findFirst();
     }
 
@@ -678 +685 @@
             withErrors.put(p, "ICV");
         }
-        if ((containsUnusualUnicodeCharacter(key, value)) && !withErrors.contains(p, "UUCV")) {
+        final OptionalInt unusualUnicodeCharacter = getUnusualUnicodeCharacter(key, value);
+        if (unusualUnicodeCharacter.isPresent() && !withErrors.contains(p, "UUCV")) {
+            final String codepoint = String.format(Locale.ROOT, "U+%04X", unusualUnicodeCharacter.getAsInt());
             errors.add(TestError.builder(this, Severity.WARNING, UNUSUAL_UNICODE_CHAR_VALUE)
-                    .message(tr("Tag value contains unusual Unicode character"), s, key)
+                    .message(tr("Tag value contains unusual Unicode character {0}", codepoint), s, key)
                     .primitives(p)
                     .build());