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 #895] allow numbers within variable names #896

Merged
merged 4 commits into from
Jul 30, 2019
Merged

[Fix #895] allow numbers within variable names #896

merged 4 commits into from
Jul 30, 2019

Conversation

fmichonneau
Copy link
Contributor

Attempt to address #895
This is my first contribution to a Ruby project. Please provide feedback if anything else is needed.
@klmr given that you improved the R lexer, could you please double check that this looks reasonable?

Copy link
Contributor

@klmr klmr left a comment

Choose a reason for hiding this comment

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

Great catch! See below for a slight improvement.

lib/rouge/lexers/r.rb Outdated Show resolved Hide resolved
@pyrmont pyrmont added the needs-review The PR needs to be reviewed label Jul 17, 2019
@pyrmont
Copy link
Contributor

pyrmont commented Jul 30, 2019

@fmichonneau I'm sorry it's taken so long to get to this. I also apologise for force pushing to your branch. It's been so long since your submission that Rouge's test suite has evolved quite a bit and I needed to rebase against master to bring that all up to date.

I think the regex I've added (described here) now does the trick but please let me know if there's an edge case that's not being properly considered.

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

@klmr klmr left a comment

Choose a reason for hiding this comment

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

LGTM!

@pyrmont pyrmont merged commit 0975003 into rouge-ruby:master Jul 30, 2019
@pyrmont
Copy link
Contributor

pyrmont commented Jul 30, 2019

Thanks for your help, @klmr! Rouge is a on a two-week cadence for releases as we work our way through the backlog. This fix will come out in v3.8.0 next Tuesday :)

@pyrmont pyrmont removed the author-action The PR has been reviewed but action by the author is needed label Jul 30, 2019
@fmichonneau
Copy link
Contributor Author

thank you for taking care of this!

@fmichonneau fmichonneau deleted the fix-r-underscores branch August 23, 2019 14:20
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.

None yet

3 participants