Skip to content

Match copyright templates with differing whitespace#160

Merged
cottsay merged 1 commit intomasterfrom
whitespace
Jul 26, 2019
Merged

Match copyright templates with differing whitespace#160
cottsay merged 1 commit intomasterfrom
whitespace

Conversation

@cottsay
Copy link
Copy Markdown
Contributor

@cottsay cottsay commented Jul 24, 2019

This change makes the template matching tolerant to more whitespace differences. In particular, it makes it tolerant in the presence of tabs, consecutive spaces (such as indentation) and EOL differences.

@cottsay cottsay added enhancement New feature or request in review Waiting for review (Kanban column) labels Jul 24, 2019
@cottsay cottsay self-assigned this Jul 24, 2019
Copy link
Copy Markdown
Contributor

@dirk-thomas dirk-thomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with CI demonstrating it passes for the two intended input strings.

This change makes the template matching tolerant to more whitespace
differences. In particular, it makes it tolerant in the presence of
tabs, consecutive spaces (such as indentation) and EOL differences.

Signed-off-by: Scott K Logan <logans@cottsay.net>
@cottsay
Copy link
Copy Markdown
Contributor Author

cottsay commented Jul 25, 2019

I went ahead and added some tests to the ament_copyright package directly to show that this is working.

CI: Build Status

@cottsay cottsay changed the title Match templates which differ only by whitespace Match copyright templates which differ only by whitespace Jul 25, 2019
@cottsay cottsay changed the title Match copyright templates which differ only by whitespace Match copyright templates differing only by whitespace Jul 25, 2019
@cottsay cottsay changed the title Match copyright templates differing only by whitespace Match copyright templates with differing whitespace Jul 25, 2019
@cottsay
Copy link
Copy Markdown
Contributor Author

cottsay commented Jul 26, 2019

Build looks OK - no warnings related to ament_copyright. Thanks for the review.

@cottsay cottsay merged commit 3d1d667 into master Jul 26, 2019
@delete-merged-branch delete-merged-branch bot deleted the whitespace branch July 26, 2019 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request in review Waiting for review (Kanban column)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants