copyright: do not add extra blank line #2502
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cocreature
reviewed
Aug 13, 2019
| @@ -209,7 +209,7 @@ def process_file(filename, check_only): | |||
| # copyright header existed, but was out of date, replace it. | |||
| fp.write("".join(before_header)) | |||
| fp.write(header) | |||
| fp.write("".join(after_header)) | |||
| fp.write("".join(after_header[:-1])) | |||
There was a problem hiding this comment.
What happens if there is no trailing newline in the file? Will we discard the last line in this case?
There was a problem hiding this comment.
Thanks for the explanation!
garyverhaegen-da
force-pushed
the
copyright-remove-added-blank-line
branch
from
ce672ea to
dedd277
Compare
cocreature
approved these changes
Aug 13, 2019
| @@ -209,7 +209,7 @@ def process_file(filename, check_only): | |||
| # copyright header existed, but was out of date, replace it. | |||
| fp.write("".join(before_header)) | |||
| fp.write(header) | |||
| fp.write("".join(after_header)) | |||
| fp.write("".join(after_header[:-1])) | |||
There was a problem hiding this comment.
Thanks for the explanation!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current copyright script adds an extra blank line at the end of every single file it modifies. This confuses our various code linters, including getting to cases where running
./fmt.shafter the copyright update is not enough to make things work again (apparently typescript doesn't like files ending with more than one blank line).This is a tiny fix that results in the copyright script strictly changing the lines it should change. It is not done as part of #2499 because we squash, but it is very much part of the same update.