Skip to content

Commit

Permalink
feat: optimize 'match adjacent single-line' logic
Browse files Browse the repository at this point in the history
Signed-off-by: Abirdcfly <fp544037857@gmail.com>
  • Loading branch information
Abirdcfly committed Aug 29, 2022
1 parent 66cf86d commit 9fe9bd2
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions dupword.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,21 @@ func (a *analyzer) fixDuplicateWordInComment(pass *analysis.Pass, f *ast.File) {
}}})
}
if preLine != nil {
before, after, _ := strings.Cut(c.Text, CommentPrefix)
update, find := a.Check(preLine.Text + "\n" + after)
fields := strings.Fields(preLine.Text)
if len(fields) < 1 {
continue
}
preLineContent := fields[len(fields)-1] + "\n"
thisLineContent := c.Text
if find {
thisLineContent = update
}
before, after, _ := strings.Cut(thisLineContent, CommentPrefix)
update, find := a.Check(preLineContent + after)
if find {
var suggestedFixes []analysis.SuggestedFix
if strings.Contains(update, preLine.Text+"\n") {
update = before + CommentPrefix + strings.TrimPrefix(update, preLine.Text+"\n")
if strings.Contains(update, preLineContent) {
update = before + CommentPrefix + strings.TrimPrefix(update, preLineContent)
suggestedFixes = []analysis.SuggestedFix{{
Message: "Update",
TextEdits: []analysis.TextEdit{{
Expand Down

0 comments on commit 9fe9bd2

Please sign in to comment.