Merge pull request #21 from BenceSzalai/fix-line-number-issue

Fix line numbers being off when file starts with linebreak(s)

repo/git.go

@@ -83,6 +83,15 @@ func (repository *gitRepository) runGitCommand(cmd *exec.Cmd) (string, error) {
 	return strings.Trim(string(out), " \n"), nil
 }
 
+func (repository *gitRepository) runGitCommandWithoutTrim(cmd *exec.Cmd) (string, error) {
+	cmd.Dir = repository.DirPath
+	out, err := cmd.Output()
+	if err != nil {
+		return "", err
+	}
+	return string(out), nil
+}
+
 func (repository *gitRepository) runGitCommandOrDie(cmd *exec.Cmd) string {
 	out, err := repository.runGitCommand(cmd)
 	if err != nil {
@@ -93,6 +102,16 @@ func (repository *gitRepository) runGitCommandOrDie(cmd *exec.Cmd) string {
 	return out
 }
 
+func (repository *gitRepository) runGitCommandWithoutTrimOrDie(cmd *exec.Cmd) string {
+	out, err := repository.runGitCommandWithoutTrim(cmd)
+	if err != nil {
+		log.Print(cmd.Args)
+		log.Print(out)
+		log.Fatal(err)
+	}
+	return out
+}
+
 func splitCommandOutputLine(line string) []string {
 	lineParts := make([]string, 0)
 	for _, part := range strings.Split(line, " ") {
@@ -314,7 +333,7 @@ func (repository *gitRepository) asyncLoadFileTodos(
 		blobTodos, ok = cachedTodos.([]Line)
 	}
 	if !ok {
-		raw := repository.runGitCommandOrDie(exec.Command("git", "show", blob))
+		raw := repository.runGitCommandWithoutTrimOrDie(exec.Command("git", "show", blob))
 		rawLines := strings.Split(raw, "\n")
 		for lineNumber, lineContents := range rawLines {
 			matched, err := regexp.MatchString(todoRegex, lineContents)