diff --git a/strutil/string.go b/strutil/string.go index f3bdd8a..d6dcf61 100644 --- a/strutil/string.go +++ b/strutil/string.go @@ -483,7 +483,10 @@ func IndexOffset(str string, substr string, idxFrom int) int { return -1 } - return strings.Index(str[idxFrom:], substr) + idxFrom + if index := strings.Index(str[idxFrom:], substr); index >= 0 { + return index + idxFrom + } + return -1 } // ReplaceWithMap returns a copy of `str`, diff --git a/strutil/string_test.go b/strutil/string_test.go index b421063..75592c1 100644 --- a/strutil/string_test.go +++ b/strutil/string_test.go @@ -660,6 +660,8 @@ func TestIndexOffset(t *testing.T) { {str, "d", len(str) - 1, len(str) - 1}, {str, "d", len(str), -1}, {str, "f", -1, -1}, + {str, "missing", 5, -1}, + {str, "foo", 5, -1}, } for _, tt := range tests {