revive: fix suggested fixes (#6295)

Author: ldez

pkg/golinters/revive/revive.go

@@ -155,9 +155,11 @@ func (w *wrapper) toIssue(pass *analysis.Pass, failure *lint.Failure) *goanalysi
 		if failure.Filename() == f.Name() {
 			issue.SuggestedFixes = []analysis.SuggestedFix{{
 				TextEdits: []analysis.TextEdit{{
-					Pos:     f.LineStart(failure.Position.Start.Line),
-					End:     goanalysis.EndOfLinePos(f, failure.Position.End.Line),
-					NewText: []byte(failure.ReplacementLine),
+					Pos: f.LineStart(failure.Position.Start.Line),
+					End: goanalysis.EndOfLinePos(f, failure.Position.End.Line),
+					// ReplacementLine doesn't contain the full line (missing newline), so we have to add a newline.
+					// Also `failure.Position.End.Offset` is at the end of the node but not the line.
+					NewText: []byte(failure.ReplacementLine + "\n"),
 				}},
 			}}
 		}

pkg/golinters/revive/testdata/fix/in/revive.go

@@ -12,3 +12,15 @@ import (
 func _() error {
 	return errors.New(fmt.Sprintf("foo: %d", math.MaxInt))
 }
+
+func _() (int, error) {
+	c := errors.New(fmt.Sprintf("bar: %d", math.MaxInt))
+	return 1, c
+}
+
+func _() (int, error) {
+	if c := errors.New(fmt.Sprintf("bar: %d", math.MaxInt)); c != nil {
+		return 0, c
+	}
+	return 1, nil
+}

pkg/golinters/revive/testdata/fix/out/revive.go

@@ -12,3 +12,15 @@ import (
 func _() error {
 	return fmt.Errorf("foo: %d", math.MaxInt)
 }
+
+func _() (int, error) {
+	c := fmt.Errorf("bar: %d", math.MaxInt)
+	return 1, c
+}
+
+func _() (int, error) {
+	if c := fmt.Errorf("bar: %d", math.MaxInt); c != nil {
+		return 0, c
+	}
+	return 1, nil
+}