From d210107caaf221c17f19d56fc0ec76bf157eb044 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 16 Apr 2023 08:56:08 +0200 Subject: [PATCH] Bump github.com/fsmiamoto/git-todo-parser to latest version --- go.mod | 2 +- go.sum | 4 ++-- .../github.com/fsmiamoto/git-todo-parser/todo/parse.go | 10 ++++++++-- vendor/modules.txt | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index f86062a69..098d19c67 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/cli/safeexec v1.0.0 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/creack/pty v1.1.11 - github.com/fsmiamoto/git-todo-parser v0.0.4-0.20230403011024-617a5a7ce980 + github.com/fsmiamoto/git-todo-parser v0.0.4 github.com/fsnotify/fsnotify v1.4.7 github.com/gdamore/tcell/v2 v2.6.0 github.com/go-errors/errors v1.4.2 diff --git a/go.sum b/go.sum index e6a83d627..dd4a8b81e 100644 --- a/go.sum +++ b/go.sum @@ -30,8 +30,8 @@ github.com/fatih/color v1.7.1-0.20180516100307-2d684516a886/go.mod h1:Zm6kSWBoL9 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/fsmiamoto/git-todo-parser v0.0.4-0.20230403011024-617a5a7ce980 h1:ay9aM+Ay9I4LJttUVF4EFVmeNUkS9/snYVFK6lwieVQ= -github.com/fsmiamoto/git-todo-parser v0.0.4-0.20230403011024-617a5a7ce980/go.mod h1:B+AgTbNE2BARvJqzXygThzqxLIaEWvwr2sxKYYb0Fas= +github.com/fsmiamoto/git-todo-parser v0.0.4 h1:fzcGaoAFDHWzJRKw//CSZFrXucsLKplIvOSab3FtWWM= +github.com/fsmiamoto/git-todo-parser v0.0.4/go.mod h1:B+AgTbNE2BARvJqzXygThzqxLIaEWvwr2sxKYYb0Fas= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= diff --git a/vendor/github.com/fsmiamoto/git-todo-parser/todo/parse.go b/vendor/github.com/fsmiamoto/git-todo-parser/todo/parse.go index 97c60db9d..ab3dd9ea9 100644 --- a/vendor/github.com/fsmiamoto/git-todo-parser/todo/parse.go +++ b/vendor/github.com/fsmiamoto/git-todo-parser/todo/parse.go @@ -56,9 +56,11 @@ func parseLine(line string) (Todo, error) { fields := strings.Fields(line) + var commandLen int for i := Pick; i < Comment; i++ { if isCommand(i, fields[0]) { todo.Command = i + commandLen = len(fields[0]) fields = fields[1:] break } @@ -74,10 +76,14 @@ func parseLine(line string) (Todo, error) { } if todo.Command == Label || todo.Command == Reset { - if len(fields) == 0 { + restOfLine := strings.TrimSpace(line[commandLen:]) + if todo.Command == Reset && restOfLine == "[new root]" { + todo.Label = restOfLine + } else if len(fields) == 0 { return todo, ErrMissingLabel + } else { + todo.Label = fields[0] } - todo.Label = fields[0] return todo, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 12028e79c..fd06a3ec6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -30,7 +30,7 @@ github.com/emirpasic/gods/utils # github.com/fatih/color v1.9.0 ## explicit; go 1.13 github.com/fatih/color -# github.com/fsmiamoto/git-todo-parser v0.0.4-0.20230403011024-617a5a7ce980 +# github.com/fsmiamoto/git-todo-parser v0.0.4 ## explicit; go 1.13 github.com/fsmiamoto/git-todo-parser/todo # github.com/fsnotify/fsnotify v1.4.7