taigrr/gopher-os
1
0
Fork 0
mirror of https://github.com/taigrr/gopher-os synced 2025-01-18 04:43:13 -08:00
Code Issues Projects Releases Wiki Activity

Redirects tool should only consider comments attached to functions

Browse Source
This commit is contained in:
Achilleas Anagnostopoulos 2017-06-30 06:54:51 +01:00
parent 336cbb415d
commit ce34763e23
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/redirects/redirects.go
View File

@ -76,14 +76,13 @@ func findRedirects(goFiles []string) ([]*redirect, error) {
cmap := ast.NewCommentMap(fset, f, f.Comments) cmap := ast.NewCommentMap(fset, f, f.Comments)
cmap.Filter(f) cmap.Filter(f)
for astNode, commentGroups := range cmap { for astNode := range cmap {
fnDecl, ok := astNode.(*ast.FuncDecl) fnDecl, ok := astNode.(*ast.FuncDecl)
if !ok { if !ok || fnDecl.Doc == nil {
continue continue
} }
for _, commentGroup := range commentGroups { for _, comment := range fnDecl.Doc.List {
for _, comment := range commentGroup.List {
if !strings.Contains(comment.Text, "go:redirect-from") { if !strings.Contains(comment.Text, "go:redirect-from") {
continue continue
} }
@ -97,7 +96,7 @@ func findRedirects(goFiles []string) ([]*redirect, error) {
fields := strings.Fields(comment.Text) fields := strings.Fields(comment.Text)
if len(fields) != 2 || fields[0] != "//go:redirect-from" { if len(fields) != 2 || fields[0] != "//go:redirect-from" {
return nil, fmt.Errorf("malformed go:redirect-from syntax for %q", fqName) return nil, fmt.Errorf("malformed go:redirect-from syntax for %q\n-> %q", fqName, comment.Text)
} }
redirects = append(redirects, &redirect{ redirects = append(redirects, &redirect{
@ -107,7 +106,6 @@ func findRedirects(goFiles []string) ([]*redirect, error) {
} }
} }
} }
}
return redirects, nil return redirects, nil
} }