Skip to content

format: remove preceding whitespace from directive comments #328

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

Closed
scop wants to merge 1 commit into from
Closed

format: remove preceding whitespace from directive comments #328

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions format/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,11 +436,16 @@ func (f *fumpter) applyPre(c *astutil.Cursor) {
}
}
// If none of the comment group's lines look like a
// directive or code, add spaces, if needed.
// directive or code, add or remove spaces, as appropriate.
for _, comment := range group.List {
body := strings.TrimPrefix(comment.Text, "//")
r, _ := utf8.DecodeRuneInString(body)
if !unicode.IsSpace(r) {
if unicode.IsSpace(r) {
body = strings.TrimLeftFunc(body, unicode.IsSpace)
if rxCommentDirective.MatchString(body) {
comment.Text = "//" + body
}
} else {
comment.Text = "// " + body
}
}
Expand Down
4 changes: 4 additions & 0 deletions testdata/script/comment-spaced.txtar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ package p

//noinspection foo,bar

// directive:withleadingspace

//not actually: a directive

//https://just.one/url
Expand Down Expand Up @@ -99,6 +101,8 @@ package p

//noinspection foo,bar

//directive:withleadingspace

// not actually: a directive

// https://just.one/url
Expand Down
Loading