Ticket #21309: 21309.2.patch

File 21309.2.patch, 1.5 KB (added by marcello@…, 5 years ago)
  • src/org/openstreetmap/josm/gui/io/UploadDialogModel.java

     
    7474        String hashtags = String.join(";",
    7575            Arrays.stream(comment.split("\\s", -1))
    7676                .map(s -> Utils.strip(s, ",;"))
    77                 .filter(s -> s.matches("#[a-zA-Z][-_a-zA-Z0-9]+"))
     77                .filter(s -> s.matches("#[a-zA-Z0-9][-_a-zA-Z0-9]+"))
    7878                .collect(Collectors.toList()));
    7979        return hashtags.isEmpty() ? null : hashtags;
    8080    }
  • test/unit/org/openstreetmap/josm/gui/io/UploadDialogModelTest.java

     
    3737        assertNull(model.findHashTags(" #"));
    3838        assertNull(model.findHashTags(" # "));
    3939        assertNull(model.findHashTags(" https://example.com/#map "));
    40         assertNull(model.findHashTags("#59606086"));
     40        assertEquals("#59606086", model.findHashTags("#59606086"));
    4141        assertEquals("#foo", model.findHashTags(" #foo "));
    4242        assertEquals("#foo;#bar", model.findHashTags(" #foo #bar baz"));
    4343        assertEquals("#foo;#bar", model.findHashTags(" #foo, #bar, baz"));