Some fixes regarding color sequences in todo items.

This is a revert of commit fbed527f, which resulted in too many items
after a project/context being highlighted.

Instead, don't print a NEUTRAL_COLOR code at the end of the todo, but
only when we finish applying all the color codes. This makes sure that
the regexp to match a project/context also works at the end of a line.

Also removed some logic to remove multiple sequences of NEUTRAL_COLOR at
the end of the line, this is not necessary.

topydo/lib/PrettyPrinterFilter.py

@@ -56,13 +56,13 @@ class PrettyPrinterColorFilter(PrettyPrinterFilter):
             except KeyError:
                 pass
 
-            p_todo_str = color + p_todo_str + NEUTRAL_COLOR
+            p_todo_str = color + p_todo_str
             if config().highlight_projects_contexts():
                 p_todo_str = re.sub(
-                    r'\B(\+|@)([^\033]*\w)',
+                    r'\B(\+|@)(\S*\w)',
                     lambda m: (
                         context_color if m.group(0)[0] == "@"
-                        else project_color)+m.group(0)+color,
+                        else project_color) + m.group(0) + color,
                     p_todo_str)
 
             # tags
@@ -77,11 +77,6 @@ class PrettyPrinterColorFilter(PrettyPrinterFilter):
 
         p_todo_str += NEUTRAL_COLOR
 
-        # change any group of reduntant multiple NEUTRAL_GROUP occurrence to
-        # only one
-        p_todo_str = re.sub(r'(' + re.escape(NEUTRAL_COLOR) + ')+',
-                            NEUTRAL_COLOR, p_todo_str)
-
         return p_todo_str
 
 class PrettyPrinterIndentFilter(PrettyPrinterFilter):