Changeset 13994 in josm for trunk

Timestamp:

2018-07-01T16:09:11+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16447 - Improve detection of changeset hashtags

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/io/ChangesetCommentModelTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.gui.util.ChangeNotifier;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -45 +46 @@
      */
     public List<String> findHashTags() {
-        return Arrays.stream(comment.split("\\s")).filter(s -> s.length() >= 2 && s.charAt(0) == '#').collect(Collectors.toList());
+        return Arrays.stream(comment.split("\\s"))
+                .map(s -> Utils.strip(s, ",;"))
+                .filter(s -> s.matches("#[a-zA-Z][a-zA-Z_\\-0-9]+"))
+                .collect(Collectors.toList());
     }
 }

trunk/test/unit/org/openstreetmap/josm/gui/io/ChangesetCommentModelTest.java

@@ -40 +40 @@
         model.setComment(" https://example.com/#map ");
         assertEquals(Collections.emptyList(), model.findHashTags());
+        model.setComment("#59606086");
+        assertEquals(Collections.emptyList(), model.findHashTags());
         model.setComment(" #foo ");
         assertEquals(Arrays.asList("#foo"), model.findHashTags());
         model.setComment(" #foo #bar baz");
         assertEquals(Arrays.asList("#foo", "#bar"), model.findHashTags());
+        model.setComment(" #foo, #bar, baz");
+        assertEquals(Arrays.asList("#foo", "#bar"), model.findHashTags());
+        model.setComment(" #foo; #bar; baz");
+        assertEquals(Arrays.asList("#foo", "#bar"), model.findHashTags());
+        model.setComment("#hotosm-project-4773 #DRONEBIRD #OsakaQuake2018 #AOYAMAVISION");
+        assertEquals(Arrays.asList("#hotosm-project-4773", "#DRONEBIRD", "#OsakaQuake2018", "#AOYAMAVISION"), model.findHashTags());
     }
 }