From 6e791feac6a9ae04dc28474e12cc8907f864a3e8 Mon Sep 17 00:00:00 2001 From: Bartosz Popiela Date: Thu, 2 May 2024 04:02:55 +0200 Subject: [PATCH 1/2] Fix the "srcs" attribute to always use "/" not to update the BUILD file when gazelle is run on a different operating system and to correctly trim the parent path (#269) --- java/gazelle/generate.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/gazelle/generate.go b/java/gazelle/generate.go index 0467c9de..934ac7d6 100644 --- a/java/gazelle/generate.go +++ b/java/gazelle/generate.go @@ -257,7 +257,7 @@ func (l javaLang) GenerateRules(args language.GenerateArgs) language.GenerateRes srcs := make([]string, 0, allTestRelatedSrcs.Len()) for _, src := range allTestRelatedSrcs.SortedSlice() { if _, ok := separateTestJavaFiles[src]; !ok { - srcs = append(srcs, strings.TrimPrefix(src.pathRelativeToBazelWorkspaceRoot, args.Rel+"/")) + srcs = append(srcs, strings.TrimPrefix(filepath.ToSlash(src.pathRelativeToBazelWorkspaceRoot), filepath.ToSlash(args.Rel+"/"))) } } if len(srcs) > 0 { @@ -459,7 +459,7 @@ func (l javaLang) generateJavaLibrary(file *rule.File, pathToPackageRelativeToBa srcs := make([]string, 0, len(srcsRelativeToBazelWorkspace)) for _, src := range srcsRelativeToBazelWorkspace { - srcs = append(srcs, strings.TrimPrefix(src, pathToPackageRelativeToBazelWorkspace+"/")) + srcs = append(srcs, strings.TrimPrefix(filepath.ToSlash(src), filepath.ToSlash(pathToPackageRelativeToBazelWorkspace+"/"))) } sort.Strings(srcs) @@ -547,7 +547,7 @@ func (l javaLang) generateJavaTest(file *rule.File, pathToPackageRelativeToBazel r.AddArg(&bzl.Ident{Name: javaRuleKind}) } - path := strings.TrimPrefix(f.pathRelativeToBazelWorkspaceRoot, pathToPackageRelativeToBazelWorkspace+"/") + path := strings.TrimPrefix(filepath.ToSlash(f.pathRelativeToBazelWorkspaceRoot), filepath.ToSlash(pathToPackageRelativeToBazelWorkspace+"/")) r.SetAttr("srcs", []string{path}) r.SetAttr("test_class", fullyQualifiedTestClass) r.SetPrivateAttr(packagesKey, []types.ResolvableJavaPackage{*types.NewResolvableJavaPackage(f.pkg, true, false)}) From 9e02620652baa13d916e921ce6b63f3b70807788 Mon Sep 17 00:00:00 2001 From: Bartosz Popiela Date: Tue, 7 May 2024 12:00:45 +0200 Subject: [PATCH 2/2] Update java/gazelle/generate.go Co-authored-by: Daniel Wagner-Hall --- java/gazelle/generate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/gazelle/generate.go b/java/gazelle/generate.go index 934ac7d6..7819fc2b 100644 --- a/java/gazelle/generate.go +++ b/java/gazelle/generate.go @@ -257,7 +257,7 @@ func (l javaLang) GenerateRules(args language.GenerateArgs) language.GenerateRes srcs := make([]string, 0, allTestRelatedSrcs.Len()) for _, src := range allTestRelatedSrcs.SortedSlice() { if _, ok := separateTestJavaFiles[src]; !ok { - srcs = append(srcs, strings.TrimPrefix(filepath.ToSlash(src.pathRelativeToBazelWorkspaceRoot), filepath.ToSlash(args.Rel+"/"))) + srcs = append(srcs, strings.TrimPrefix(filepath.ToSlash(src.pathRelativeToBazelWorkspaceRoot), args.Rel+"/")) } } if len(srcs) > 0 {