Merge pull request #19 from augmentable-dev/better-todo-cleaning

handle TODO and TODO: format

Author: patrickdevivo

pkg/todos/report.go

@@ -8,7 +8,7 @@ import (
 // DefaultTemplate is the default report template
 const DefaultTemplate = `
 {{- range $index, $todo := . }}
-{{ print "\u001b[33m" }}TODO{{ print "\u001b[0m" }}{{ .String }}
+{{ print "\u001b[33m" }}TODO{{ print "\u001b[0m" }}: {{ .String }}
   => {{ with .Comment }}{{ .FilePath }}:{{ .StartLocation.Line }}:{{ .StartLocation.Pos }}{{ end }}
 {{ else }}
 no todos 🎉

pkg/todos/todos.go

@@ -1,6 +1,7 @@
 package todos
 
 import (
+	"regexp"
 	"strings"
 
 	"github.com/augmentable-dev/tickgit/pkg/comments"
@@ -26,7 +27,8 @@ func NewToDo(comment comments.Comment) *ToDo {
 	if !strings.Contains(s, "TODO") {
 		return nil
 	}
-	s = strings.Replace(comment.String(), "TODO", "", 1)
+	re := regexp.MustCompile(`TODO:?`)
+	s = re.ReplaceAllLiteralString(comment.String(), "")
 	s = strings.Trim(s, " ")
 
 	todo := ToDo{Comment: comment, String: s}