Changeset 13994 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

fix #16447 - Improve detection of changeset hashtags

File:

• trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java (modified) (2 diffs)

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());
     }
 }