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

use separate highlight rule set for chunks / Sexpr #14670

Merged
merged 7 commits into from
May 14, 2024

Conversation

kevinushey
Copy link
Contributor

@kevinushey kevinushey commented May 7, 2024

Intent

Addresses #14667.
Addresses #14646.

Approach

Rather than use the same highlight rules (and so, same highlighter state) for both R code chunks and \Sexpr{} code blocks, use separate highlighter sets. This is necessary as we need to track the { and} count within \Sexpr{} calls, but not within regular R code chunks.

Automated Tests

Included in PR.

QA Notes

Test via notes in associated issues.

Documentation

N/A

Checklist

  • If this PR adds a new feature, or fixes a bug in a previously released version, it includes an entry in NEWS.md
  • If this PR adds or changes UI, the updated UI meets accessibility standards
  • A reviewer is assigned to this PR (if unsure who to assign, check Area Owners list)
  • This PR passes all local unit tests

@kevinushey kevinushey force-pushed the bugfix/sweave-highlight-fixup branch from 2df0d8b to 8beba82 Compare May 13, 2024 23:02
@kevinushey kevinushey requested a review from gtritchie May 14, 2024 00:01
@kevinushey kevinushey marked this pull request as ready for review May 14, 2024 00:01
Copy link
Member

@gtritchie gtritchie left a comment

Choose a reason for hiding this comment

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

LGTM!

@kevinushey kevinushey merged commit da68628 into main May 14, 2024
2 checks passed
@kevinushey kevinushey deleted the bugfix/sweave-highlight-fixup branch May 14, 2024 17:01
@kevinushey kevinushey mentioned this pull request May 23, 2024
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

2 participants