tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include separator to the end

Browse Source
This commit is contained in:
kvii 2022-11-05 11:21:21 +08:00
parent 095e3e9d4c
commit ed55c735e5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/utils.go
View File

@ -23,11 +23,11 @@ func sourceDir(file string) string {
dir := filepath.Dir(file)
dir = filepath.Dir(dir)
parent := filepath.Dir(dir)
if filepath.Base(parent) == "gorm.io" {
return parent
s := filepath.Dir(dir)
if filepath.Base(s) != "gorm.io" {
s = dir
}
return dir
return s + string(filepath.Separator)
}
// FileWithLineNum return the file name and line number of the current file

12
utils/utils_unix_test.go
View File

@ -8,20 +8,20 @@ func TestSourceDir(t *testing.T) {
want string
}{
{
file: "/Users/name/go/pkg/mod/gorm.io/gorm@v1.24.1/utils/utils.go",
want: "/Users/name/go/pkg/mod/gorm.io",
file: "/Users/name/go/pkg/mod/gorm.io/gorm@v1.2.3/utils/utils.go",
want: "/Users/name/go/pkg/mod/gorm.io/",
},
{
file: "/go/work/proj/gorm/utils/utils.go",
want: "/go/work/proj/gorm",
want: "/go/work/proj/gorm/",
},
{
file: "/go/work/proj/gorm_alias/utils/utils.go",
want: "/go/work/proj/gorm_alias",
want: "/go/work/proj/gorm_alias/",
},
{
file: "/go/work/proj/my.gorm.io/gorm@v1.24.1/utils/utils.go",
want: "/go/work/proj/my.gorm.io/gorm@v1.24.1",
file: "/go/work/proj/my.gorm.io/gorm@v1.2.3/utils/utils.go",
want: "/go/work/proj/my.gorm.io/gorm@v1.2.3/",
},
}
for _, c := range cases {