fix cropFilename bug

tlog-dev · Nov 12, 2023 · 484188d · 484188d
1 parent da59c9b
commit 484188d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/location.go b/location.go
@@ -83,10 +83,10 @@ func CallersFill(skip int, tr PCs) PCs {
 func cropFilename(fn, tp string) string {
 	p := strings.LastIndexByte(tp, '/')
 	pp := strings.IndexByte(tp[p+1:], '.')
-	tp = tp[:p+pp]
+	tp = tp[:p+pp] // cut type and func name
 
 	for {
-		if p = strings.Index(fn, tp); p != -1 {
+		if p = strings.LastIndex(fn, tp); p != -1 {
 			return fn[p:]
 		}
 

diff --git a/location_test.go b/location_test.go
@@ -76,6 +76,8 @@ func TestLocationCropFileName(t *testing.T) {
 	assert.Equal(t, "root.go", cropFilename("/path/to/src/root.go", "tlog.method"))
 	assert.Equal(t, "subpkg/file.go", cropFilename("/path/to/src/subpkg/file.go", "subpkg.method"))
 	assert.Equal(t, "subpkg/file.go", cropFilename("/path/to/src/subpkg/file.go", "github.com/nikandfor/tlog/subpkg.(*type).method"))
+	assert.Equal(t, "errors/fmt_test.go",
+		cropFilename("/home/runner/work/errors/errors/fmt_test.go", "tlog.app/go/error.TestErrorFormatCaller"))
 }
 
 func TestCaller(t *testing.T) {