fixed bug with not all terms have been shown in terms occurrences

build.gradle

@@ -12,7 +12,7 @@ plugins {
     id 'org.asciidoctor.gradle.asciidoctor' version '1.5.1'
 }
 
-String currentVersion = '0.1.1'
+String currentVersion = '0.1.2'
 
 version = currentVersion
 

letter-annotator-api/src/main/java/org/modelcatalogue/letter/annotator/HtmlHighlighter.java

@@ -15,7 +15,7 @@ protected String getReplacement(String matchedString, CandidateTerm term) {
         StringBuilder builder = new StringBuilder();
 
         if (term.getUrl() != null) {
-            builder.append("<a");
+            builder.append("<a target=\"_blank\"");
             appendAttribute(builder, "href", term.getUrl().toExternalForm());
         } else {
             builder.append("<span");

letter-annotator-api/src/main/java/org/modelcatalogue/letter/annotator/ReplacementHighlighter.java

@@ -25,6 +25,7 @@ protected final TextWithOccurrences highlight(String letter, Map<String, Candida
         final StringBuilder patternBuilder = new StringBuilder();
         for (Map.Entry<String, CandidateTerm> term : normalizedMap.entrySet()) {
             if (term.getValue().getPattern() == null) {
+                patternBuilder.append("(?<=[\\W$])");
                 patternBuilder.append(Pattern.quote(term.getKey()).replaceAll("\\s+", " "));
                 patternBuilder.append("\\w*");
             } else {

letter-annotator-api/src/main/java/org/modelcatalogue/letter/annotator/TermOccurrence.java

@@ -25,7 +25,7 @@ public Collector increment(CandidateTerm term) {
         }
 
         public Set<TermOccurrence> getOccurrences() {
-            TreeSet<TermOccurrence> result = new TreeSet<TermOccurrence>(Collections.reverseOrder());
+            TreeSet<TermOccurrence> result = new TreeSet<TermOccurrence>();
             for (Builder builder : occurrences.values()) {
                 result.add(builder.build());
             }
@@ -91,7 +91,11 @@ public int compareTo(TermOccurrence o) {
         if (o == null) {
             return 1;
         }
-        return ((Integer) occurrence).compareTo(o.occurrence);
+        int occurrenceComparison = - ((Integer) occurrence).compareTo(o.occurrence);
+        if (occurrenceComparison != 0) {
+            return occurrenceComparison;
+        }
+        return term.getTerm().compareTo(o.term.getTerm());
     }
 
     @Override

letter-annotator-api/src/test/groovy/org/modelcatalogue/letter/annotator/HtmlHighlighterSpec.groovy

@@ -22,6 +22,15 @@ class HtmlHighlighterSpec extends Specification {
         """
     }
 
+    def "test match only from the beginning of the word"() {
+        expect:
+        Highlighter.HTML.highlight("""
+            Let's talk about the melancholy grail! It is so interesting!
+        """, CandidateTerm.create("Holy Grail").build()).text == """
+            Let's talk about the melancholy grail! It is so interesting!
+        """
+    }
+
     def "test ref replacement"() {
         expect:
         Highlighter.HTML.highlight("""