diff --git a/internal/parser/clangtidy/convert.go b/internal/parser/clangtidy/convert.go index ccee81e..727a557 100644 --- a/internal/parser/clangtidy/convert.go +++ b/internal/parser/clangtidy/convert.go @@ -76,37 +76,36 @@ func isIgnored(line string) bool { return ignoreRegex.MatchString(line) } -func parseMessage(line string) ClangMessage { +func parseMessage(lineStr string) ClangMessage { messageRegex := regexp.MustCompile(`^(?P.+):(?P\d+):(?P\d+): (?P\S+): (?P.*?) \[(?P[^\]]+)\]?\n$`) - regexRes := messageRegex.FindStringSubmatch(line) + regexRes := messageRegex.FindStringSubmatch(lineStr) if len(regexRes) == 0 { return *newClangMessage("", 0, 0, UNKNOWN, "", "", nil, nil) - } else { - filepath := regexRes[1] - line, err := strconv.Atoi(regexRes[2]) - if err != nil { - line = 0 - slog.Error("parse line", "error", err) - } - column, err := strconv.Atoi(regexRes[3]) - if err != nil { - column = 0 - slog.Error("parse column", "error", err) - } - level := levelFromString(regexRes[4]) - message := regexRes[5] - diagnosticName := regexRes[6] + } + filepath := regexRes[1] + line, err := strconv.Atoi(regexRes[2]) + if err != nil { + line = 0 + slog.Error("parse line", "error", err) + } + column, err := strconv.Atoi(regexRes[3]) + if err != nil { + column = 0 + slog.Error("parse column", "error", err) + } + level := levelFromString(regexRes[4]) + message := regexRes[5] + diagnosticName := regexRes[6] - return ClangMessage{ - filepath: filepath, - line: line, - column: column, - level: level, - message: message, - diagnosticName: diagnosticName, - detailsLines: make([]string, 0), - children: make([]ClangMessage, 0), - } + return ClangMessage{ + filepath: filepath, + line: line, + column: column, + level: level, + message: message, + diagnosticName: diagnosticName, + detailsLines: make([]string, 0), + children: make([]ClangMessage, 0), } } diff --git a/internal/parser/diff/diff.go b/internal/parser/diff/diff.go index fb1b506..a16aaaf 100644 --- a/internal/parser/diff/diff.go +++ b/internal/parser/diff/diff.go @@ -55,12 +55,12 @@ func isWhitespace(b byte) bool { func myersDiff(src, dst []string, compareSpace bool) []operation { n := len(src) m := len(dst) - max := n + m + maxLength := n + m var trace []map[int]int var x, y int loop: - for d := 0; d <= max; d += 1 { + for d := 0; d <= maxLength; d += 1 { v := make(map[int]int, d+2) trace = append(trace, v) diff --git a/pkg/healthcheck/nonascii.go b/pkg/healthcheck/nonascii.go index fe47be2..fbd01b5 100644 --- a/pkg/healthcheck/nonascii.go +++ b/pkg/healthcheck/nonascii.go @@ -45,9 +45,8 @@ func getNonAscii(root string) ([]string, error) { if info.IsDir() { if info.Name() == ".git" { return filepath.SkipDir - } else { - return nil } + return nil } if gitattrExist {