Resolve comments

Author: Agent-Hellboy

modfile/read.go

@@ -877,14 +877,12 @@ func (in *input) parseLineBlock(start Position, token []string, lparen token) *L
 			in.Error(fmt.Sprintf("syntax error (unterminated block started at %s:%d:%d)", in.filename, x.Start.Line, x.Start.LineRune))
 		case ')':
 			rparen := in.lex()
-			// Filter out comments with Start.Line == 0
-			var filteredComments []Comment
-			for _, c := range comments {
-				if c.Start.Line > 0 {
-					filteredComments = append(filteredComments, c)
-				}
+			// Don't preserve blank lines (denoted by a single empty comment, added above)
+			// at the end of the block.
+			if len(comments) == 1 && comments[0] == (Comment{}) {
+				comments = nil
 			}
-			x.RParen.Before = filteredComments
+			x.RParen.Before = comments
 			x.RParen.Pos = rparen.pos
 			if !in.peek().isEOL() {
 				in.Error("syntax error (expected newline after closing paren)")

modfile/read_test.go

@@ -734,55 +734,3 @@ func TestCleanupMaintainsRefs(t *testing.T) {
 		t.Errorf("got:\n%v\nwant:\n%v", syntax.Stmt[0], lineB)
 	}
 }
-
-func TestCleanupRemoveRequireBlockBlankLines(t *testing.T) {
-	syntax := &FileSyntax{
-		Stmt: []Expr{
-			&Line{
-				Token: []string{"module", "a"},
-			},
-			&LineBlock{
-				Token: []string{"require"},
-				Line: []*Line{
-					{
-						Token:   []string{"golang.org/x/time", "v0.8.0"},
-						InBlock: true,
-					},
-					{
-						Token:   nil, // Blank line
-						InBlock: true,
-					},
-					{
-						Token:   []string{"golang.org/x/other", "v0.1.0"},
-						InBlock: true,
-					},
-				},
-			},
-		},
-	}
-	syntax.Cleanup()
-
-	buf := &bytes.Buffer{}
-	for _, stmt := range syntax.Stmt {
-		switch stmt := stmt.(type) {
-		case *Line:
-			fmt.Fprintf(buf, "line: %v\n", strings.Join(stmt.Token, " "))
-		case *LineBlock:
-			fmt.Fprintf(buf, "block: %v\n", strings.Join(stmt.Token, " "))
-			for _, line := range stmt.Line {
-				fmt.Fprintf(buf, "blockline: %v\n", strings.Join(line.Token, " "))
-			}
-		}
-	}
-
-	got := strings.TrimSpace(buf.String())
-	want := strings.TrimSpace(`
-line: module a
-block: require
-blockline: golang.org/x/time v0.8.0
-blockline: golang.org/x/other v0.1.0
-`)
-	if got != want {
-		t.Errorf("got:\n%s\nwant:\n%s", got, want)
-	}
-}

modfile/testdata/issue70632.golden

@@ -0,0 +1,5 @@
+module tidy
+
+go 1.23.0
+
+require golang.org/x/time v0.8.0

modfile/testdata/issue70632.in

@@ -0,0 +1,12 @@
+module tidy
+
+go 1.23.0
+
+require (
+
+    "golang.org/x/time" v0.8.0
+
+
+
+
+)