Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1022 by supporting diffs other than unified. #1068

Merged
merged 2 commits into from
May 28, 2019

Conversation

vidarh
Copy link
Contributor

@vidarh vidarh commented Jan 18, 2019

Close #846 as it conflicts and this commit differentiates further.

In addition to handling diffs done without the "-u" flag, this also more closely matches "git diff" output for unified diffs by treating @@ [reference ] @@ as punctuation and the rest of the line as text, making "---" punctuation, and making the diff/index lines at the top headings.

Close rouge-ruby#846 as it conflicts and this commit differentiates further.
@pyrmont
Copy link
Contributor

pyrmont commented May 17, 2019

For what it's worth, looks good to me!

@pyrmont
Copy link
Contributor

pyrmont commented May 28, 2019

@vidarh Similarly to #1069, would it be possible to add some examples to the visual sample to demonstrate the fixes here?

@pyrmont pyrmont added the author-action The PR has been reviewed but action by the author is needed label May 28, 2019
@vidarh
Copy link
Contributor Author

vidarh commented May 28, 2019

The "@@" references are already covered by the current diff. Example of non-unified diff incoming.

@pyrmont pyrmont added needs-review The PR needs to be reviewed and removed author-action The PR has been reviewed but action by the author is needed labels May 28, 2019
@pyrmont
Copy link
Contributor

pyrmont commented May 28, 2019

Thanks!

@pyrmont pyrmont merged commit c1c5d0b into rouge-ruby:master May 28, 2019
@pyrmont pyrmont removed the needs-review The PR needs to be reviewed label May 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants