Fix getStyledText breaking when half-inside tooltips

Change-Id: Ib62376c5e493d06da8ffaccfb81b3e424a79a81b
Reviewed-on: http://gerrit.dmdirc.com/1486
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/ui/messages/Styliser.java

@@ -251,6 +251,8 @@ public class Styliser implements ConfigChangeListener {
      * to be as far left as they possibly can be. This means that the start of
      * the string will include any control codes immediately preceeding the
      * desired text, and the end will not include any trailing codes.
+     * <p>
+     * This method will NOT include "internal" control codes in the output.
      *
      * @param styled The styled String to be operated on
      * @param from The starting index in the unstyled string
@@ -262,19 +264,20 @@ public class Styliser implements ConfigChangeListener {
         final String unstyled = stipControlCodes(styled);
         final String startBit = unstyled.substring(0, from);
         final String middleBit = unstyled.substring(from, to);
+        final String sanitised = stipInternalControlCodes(styled);
         int start = from;
 
-        while (!stipControlCodes(styled.substring(0, start)).equals(startBit)) {
+        while (!stipControlCodes(sanitised.substring(0, start)).equals(startBit)) {
             start++;
         }
 
         int end = to + start - from;
 
-        while (!stipControlCodes(styled.substring(start, end)).equals(middleBit)) {
+        while (!stipControlCodes(sanitised.substring(start, end)).equals(middleBit)) {
             end++;
         }
 
-        return styled.substring(start, end);
+        return sanitised.substring(start, end);
     }
 
     /**
@@ -352,6 +355,20 @@ public class Styliser implements ConfigChangeListener {
                 + CODE_TOOLTIP, "$1");
     }
 
+    /**
+     * St(r)ips all recognised internal control codes from the input string.
+     *
+     * @param input the String to be stripped
+     * @return a copy of the input with control codes removed
+     * @since 0.6.5
+     */
+    public static String stipInternalControlCodes(final String input) {
+        return input.replaceAll("[" + CODE_CHANNEL + CODE_HYPERLINK + CODE_NICKNAME
+                + CODE_SMILIE + CODE_STOP + CODE_UNDERLINE + "]", "")
+                .replaceAll(CODE_TOOLTIP + ".*?" + CODE_TOOLTIP + "(.*?)"
+                + CODE_TOOLTIP, "$1");
+    }
+
     /**
      * Returns a substring of the input string such that no control codes are present
      * in the output. If the returned value isn't the same as the input, then the

test/com/dmdirc/ui/messages/StyliserIndicesTest.java

@@ -64,6 +64,9 @@ public class StyliserIndicesTest {
                      4, 7, Styliser.CODE_COLOUR + "4,0RED"},
             {"Blah" + Styliser.CODE_COLOUR + "4,0RED blah blah",
                      5, 7, "ED"},
+            {Styliser.CODE_TOOLTIP + "Annoying internal tooltip text"
+                     + Styliser.CODE_TOOLTIP + "Blah" + Styliser.CODE_TOOLTIP + "Blah",
+                     2, 6, "ahBl"},
         };
 
         return Arrays.asList(tests);