modfile: fix trailing empty lines in require blocks #22

Agent-Hellboy · 2024-12-10T15:13:54Z

This change ensures that trailing empty lines in require blocks
are ignored during parsing itself. Specifically:

Modified the parseLineBlock function to detect and discard blank lines
(represented by a single empty comment) at the end of a block.
Blank lines within a block are preserved as expected, but trailing
blank lines immediately before the closing parenthesis are now skipped.

google-cla · 2024-12-10T15:13:59Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

gopherbot · 2024-12-10T15:40:11Z

This PR (HEAD: 5046e90) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/mod/+/634875.

Important tips:

Don't comment on this PR. All discussion takes place in Gerrit.
You need a Gmail or other Google account to log in to Gerrit.
To change your code in response to feedback:
- Push a new commit to the branch used by your GitHub PR.
- A new "patch set" will then appear in Gerrit.
- Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
- Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
- Multiple commits in the PR will be squashed by GerritBot.
The title and description of the GitHub PR are used to construct the final commit message.
- Edit these as needed via the GitHub web interface (not via Gerrit or git).
- You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

gopherbot · 2024-12-10T15:49:06Z

Message from Gopher Robot:

Patch Set 1:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2024-12-10T15:49:07Z

Message from Gopher Robot:

Patch Set 1:

Congratulations on opening your first change. Thank you for your contribution!

Next steps:
A maintainer will review your change and provide feedback. See
https://go.dev/doc/contribute#review for more info and tips to get your
patch through code review.

Most changes in the Go project go through a few rounds of revision. This can be
surprising to people new to the project. The careful, iterative review process
is our way of helping mentor contributors and ensuring that their contributions
have a lasting impact.

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2024-12-17T16:27:25Z

Message from Michael Matloob:

Patch Set 3:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-08T07:05:05Z

Message from Prince Roshan:

Patch Set 3:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-08T10:33:02Z

Message from Prince Roshan:

Patch Set 3:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-13T16:50:41Z

Message from Michael Matloob:

Patch Set 3:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-14T08:25:47Z

This PR (HEAD: 51c4aaa) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/mod/+/634875.

Important tips:

Don't comment on this PR. All discussion takes place in Gerrit.
You need a Gmail or other Google account to log in to Gerrit.
To change your code in response to feedback:
- Push a new commit to the branch used by your GitHub PR.
- A new "patch set" will then appear in Gerrit.
- Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
- Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
- Multiple commits in the PR will be squashed by GerritBot.
The title and description of the GitHub PR are used to construct the final commit message.
- Edit these as needed via the GitHub web interface (not via Gerrit or git).
- You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

gopherbot · 2025-01-14T08:35:39Z

This PR (HEAD: 3bf98a4) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/mod/+/634875.

Important tips:

Don't comment on this PR. All discussion takes place in Gerrit.
You need a Gmail or other Google account to log in to Gerrit.
To change your code in response to feedback:
- Push a new commit to the branch used by your GitHub PR.
- A new "patch set" will then appear in Gerrit.
- Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
- Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
- Multiple commits in the PR will be squashed by GerritBot.
The title and description of the GitHub PR are used to construct the final commit message.
- Edit these as needed via the GitHub web interface (not via Gerrit or git).
- You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

gopherbot · 2025-01-14T09:20:57Z

Message from Prince Roshan:

Patch Set 5:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-14T09:39:43Z

This PR (HEAD: 6a8257d) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/mod/+/634875.

Important tips:

Don't comment on this PR. All discussion takes place in Gerrit.
You need a Gmail or other Google account to log in to Gerrit.
To change your code in response to feedback:
- Push a new commit to the branch used by your GitHub PR.
- A new "patch set" will then appear in Gerrit.
- Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
- Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
- Multiple commits in the PR will be squashed by GerritBot.
The title and description of the GitHub PR are used to construct the final commit message.
- Edit these as needed via the GitHub web interface (not via Gerrit or git).
- You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

gopherbot · 2025-01-14T16:40:04Z

Message from Michael Matloob:

Patch Set 6:

(2 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-14T18:38:20Z

Message from Prince Roshan:

Patch Set 6:

(2 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-14T18:56:07Z

This PR (HEAD: 9cdc3b8) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/mod/+/634875.

Important tips:

Don't comment on this PR. All discussion takes place in Gerrit.
You need a Gmail or other Google account to log in to Gerrit.
To change your code in response to feedback:
- Push a new commit to the branch used by your GitHub PR.
- A new "patch set" will then appear in Gerrit.
- Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
- Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
- Multiple commits in the PR will be squashed by GerritBot.
The title and description of the GitHub PR are used to construct the final commit message.
- Edit these as needed via the GitHub web interface (not via Gerrit or git).
- You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

gopherbot · 2025-01-14T21:13:03Z

Message from Michael Matloob:

Patch Set 7:

(3 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T05:49:47Z

This PR (HEAD: eb3647b) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/mod/+/634875.

Important tips:

Don't comment on this PR. All discussion takes place in Gerrit.
You need a Gmail or other Google account to log in to Gerrit.
To change your code in response to feedback:
- Push a new commit to the branch used by your GitHub PR.
- A new "patch set" will then appear in Gerrit.
- Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
- Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
- Multiple commits in the PR will be squashed by GerritBot.
The title and description of the GitHub PR are used to construct the final commit message.
- Edit these as needed via the GitHub web interface (not via Gerrit or git).
- You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

gopherbot · 2025-01-15T05:57:34Z

Message from Prince Roshan:

Patch Set 7:

(2 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T18:20:09Z

Message from Michael Matloob:

Patch Set 8: Commit-Queue+1

(4 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T18:28:29Z

Message from Go LUCI:

Patch Set 8:

Dry run: CV is trying the patch.

Bot data: {"action":"start","triggered_at":"2025-01-15T18:14:14Z","revision":"4e037adef5970f4f67ead0a5f4d79395f1fdc169"}

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T18:28:29Z

Message from Michael Matloob:

Patch Set 8: -Commit-Queue

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T18:28:30Z

Message from Go LUCI:

Patch Set 8:

This CL has failed the run. Reason:

Tryjob golang/try/x_mod-gotip-linux-arm64 has failed with summary (view all results):

go on master (commit 368a9ec)
mod on master (change 634875)

Build or test failure, click here for results.

To reproduce, try gomote repro 8725654050885606913.

Additional links for debugging:

Output for test golang.org/x/mod module

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T18:28:30Z

Message from Go LUCI:

Patch Set 8: LUCI-TryBot-Result-1

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T19:52:07Z

Message from Prince Roshan:

Patch Set 8:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-15T19:52:11Z

This PR (HEAD: 1477d7c) has been imported to Gerrit for code review.

Please visit Gerrit at https://go-review.googlesource.com/c/mod/+/634875.

Important tips:

Don't comment on this PR. All discussion takes place in Gerrit.
You need a Gmail or other Google account to log in to Gerrit.
To change your code in response to feedback:
- Push a new commit to the branch used by your GitHub PR.
- A new "patch set" will then appear in Gerrit.
- Respond to each comment by marking as Done in Gerrit if implemented as suggested. You can alternatively write a reply.
- Critical: you must click the blue Reply button near the top to publish your Gerrit responses.
- Multiple commits in the PR will be squashed by GerritBot.
The title and description of the GitHub PR are used to construct the final commit message.
- Edit these as needed via the GitHub web interface (not via Gerrit or git).
- You should word wrap the PR description at ~76 characters unless you need longer lines (e.g., for tables or URLs).
See the Sending a change via GitHub and Reviews sections of the Contribution Guide as well as the FAQ for details.

gopherbot · 2025-01-16T17:00:14Z

Message from Prince Roshan:

Patch Set 9:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T19:10:59Z

Message from Michael Matloob:

Patch Set 9: Commit-Queue+1

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T19:20:14Z

Message from Go LUCI:

Patch Set 9:

Dry run: CV is trying the patch.

Bot data: {"action":"start","triggered_at":"2025-01-16T19:04:30Z","revision":"82fb48764693964d043350743820522fafad4c5e"}

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T19:28:45Z

Message from Michael Matloob:

Patch Set 9: -Commit-Queue

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T19:28:46Z

Message from Go LUCI:

Patch Set 9:

This CL has passed the run

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T19:28:46Z

Message from Go LUCI:

Patch Set 9: LUCI-TryBot-Result+1

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T19:28:47Z

Message from Michael Matloob:

Patch Set 9:

(4 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:23:21Z

Message from Prince Roshan:

Patch Set 9:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:40:59Z

Message from Prince Roshan:

Patch Set 9:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:40:59Z

Message from Michael Matloob:

Patch Set 9:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:41:00Z

Message from Prince Roshan:

Patch Set 10:

(1 comment)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:49:36Z

Message from Michael Matloob:

Patch Set 10: Commit-Queue+1

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:49:37Z

Message from Go LUCI:

Patch Set 10:

Dry run: CV is trying the patch.

Bot data: {"action":"start","triggered_at":"2025-01-16T20:37:40Z","revision":"14732225a4d34e86c38e0e8e65274b0cdadeb7c6"}

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:49:37Z

Message from Michael Matloob:

Patch Set 10: Code-Review+2

(5 comments)

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:49:38Z

Message from Michael Matloob:

Patch Set 10: -Commit-Queue

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:49:38Z

Message from Go LUCI:

Patch Set 10:

This CL has passed the run

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-01-16T20:49:39Z

Message from Go LUCI:

Patch Set 10: LUCI-TryBot-Result+1

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

gopherbot · 2025-02-03T19:02:43Z

Message from Cherry Mui:

Patch Set 11: Code-Review+1

Please don’t reply on this GitHub thread. Visit golang.org/cl/634875.
After addressing review feedback, remember to publish your drafts!

This change ensures that trailing empty lines in `require` blocks are ignored during parsing itself. Specifically: - Modified the `parseLineBlock` function to detect and discard blank lines (represented by a single empty comment) at the end of a block. - Blank lines within a block are preserved as expected, but trailing blank lines immediately before the closing parenthesis are now skipped. For golang/go#70632 Change-Id: Ica76b3edb3bf7fdc327c7cdc9e401dcf19c523b0 GitHub-Last-Rev: 1477d7c GitHub-Pull-Request: #22 Reviewed-on: https://go-review.googlesource.com/c/mod/+/634875 Reviewed-by: Michael Matloob <matloob@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Cherry Mui <cherryyz@google.com>

gopherbot · 2025-02-03T20:09:32Z

This PR is being closed because golang.org/cl/634875 has been merged.

modfile: Fix trailing empty lines in require blocks

5046e90

Agent-Hellboy mentioned this pull request Dec 10, 2024

cmd/go: go mod tidy leaves trailing empty lines in require blocks golang/go#70632

Closed

Agent-Hellboy changed the title ~~modfile: Fix trailing empty lines in require blocks~~ modfile: fix trailing empty lines in require blocks Dec 10, 2024

remove trailing whitespace from lineblock

51c4aaa

Avoid unnecessary comment removal

3bf98a4

Remove trailing whitespace only

6a8257d

Resolve comments

9cdc3b8

Resolve comments

eb3647b

Update issue70632.golden

1477d7c

gopherbot closed this Feb 3, 2025

modfile: fix trailing empty lines in require blocks #22

modfile: fix trailing empty lines in require blocks #22

Conversation

Agent-Hellboy commented Dec 10, 2024 • edited Loading

google-cla bot commented Dec 10, 2024

gopherbot commented Dec 10, 2024

gopherbot commented Dec 10, 2024

gopherbot commented Dec 10, 2024

gopherbot commented Dec 17, 2024

gopherbot commented Jan 8, 2025

gopherbot commented Jan 8, 2025

gopherbot commented Jan 13, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 14, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 15, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Jan 16, 2025

gopherbot commented Feb 3, 2025

gopherbot commented Feb 3, 2025

Agent-Hellboy commented Dec 10, 2024 •

edited

Loading