Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

buildozer: make ellipsis work with BUILD.bazel and BUCK files #116

Merged
merged 1 commit into from
Jun 23, 2017
Merged

buildozer: make ellipsis work with BUILD.bazel and BUCK files #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 18 additions & 4 deletions edit/buildozer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,16 @@ func getGlobalVariables(exprs []build.Expr) (vars map[string]*build.BinaryExpr)
return vars
}

var buildFileSuffixes = [...]string{"BUILD.bazel", "BUILD", "BUCK"}
// When checking the filesystem, we need to look for any of the
// possible buildFileNames. For historical reasons, the
// parts of the tool that generate paths that we may want to examine
// continue to assume that build files are all named "BUILD".
var buildFileNames = [...]string{"BUILD.bazel", "BUILD", "BUCK"}
var buildFileNamesSet = map[string]bool{
"BUILD.bazel": true,
"BUILD": true,
"BUCK": true,
}

// rewrite parses the BUILD file for the given file, transforms the AST,
// and write the changes back in the file (or on stdout). g4 edit is run
Expand All @@ -692,8 +701,13 @@ func rewrite(commandsForFile commandsForFile) *rewriteResult {
}
} else {
origName := name
name = strings.TrimSuffix(name, "BUILD")
for _, suffix := range buildFileSuffixes {
for _, suffix := range buildFileNames {
if strings.HasSuffix(name, "/" + suffix) {
name = strings.TrimSuffix(name, suffix)
break
}
}
for _, suffix := range buildFileNames {
name = name + suffix
data, fi, err = file.ReadFile(name)
if err == nil {
Expand Down Expand Up @@ -853,7 +867,7 @@ func targetExpressionToBuildFiles(target string) []string {
for _, dirFile := range dirFiles {
if dirFile.IsDir() {
searchDirs = append(searchDirs, path.Join(dir, dirFile.Name()))
} else if dirFile.Name() == "BUILD" {
} else if _, ok := buildFileNamesSet[dirFile.Name()]; ok {
buildFiles = append(buildFiles, path.Join(dir, dirFile.Name()))
}
}
Expand Down