Skip to content

Commit 85ef8cc

Browse files
use filepath.Rel() when formatting filenames in stderr output, for consistency (#2186)
1 parent 513e0fe commit 85ef8cc

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

internal/cmd/generate.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"path/filepath"
1111
"runtime"
1212
"runtime/trace"
13-
"strings"
1413
"sync"
1514

1615
"golang.org/x/sync/errgroup"
@@ -45,7 +44,10 @@ The supported version can only be "1" or "2".
4544
const errMessageNoPackages = `No packages are configured`
4645

4746
func printFileErr(stderr io.Writer, dir string, fileErr *multierr.FileError) {
48-
filename := strings.TrimPrefix(fileErr.Filename, dir+"/")
47+
filename, err := filepath.Rel(dir, fileErr.Filename)
48+
if err != nil {
49+
filename = fileErr.Filename
50+
}
4951
fmt.Fprintf(stderr, "%s:%d:%d: %s\n", filename, fileErr.Line, fileErr.Column, fileErr.Err)
5052
}
5153

0 commit comments

Comments
 (0)