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.

Sign up for GitHub

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

Jump to bottom

Recursive multiline highlighting #17

Merged
merged 19 commits into from
Sep 9, 2024
Merged

Recursive multiline highlighting #17

merged 19 commits into from
Sep 9, 2024

Conversation

sungshik
Copy link
Collaborator

@sungshik sungshik commented Sep 6, 2024 •
edited
Loading

This PR adds support for recursive multiline productions.

Before this PR, all recursive productions were simply excluded from conversion in the analysis stage. After this PR, in the analysis stage, productions are classified as either recursive or non-recursive (via a new parameter in ConversionUnit):

  • For non-recursive multi-line productions, essentially the same transformation is used as before.
  • For recursive multi-line productions, there is a new "complex case" (anticipated with an empty else { } in a previous PR) to handle them.

@sungshik
Add applyEndPatternlast parameter to beginEnd constructor
2238588
@sungshik
Add utility function to check if a symbol is recursive
3b11353
@sungshik
Add utility function to remove the conditional from a symbol
f6a2803
@sungshik
Add overloaded version of getInnerDelimiterPair for symbols
667ae4b
@sungshik
Add \conditional to destar
22ea045
@sungshik
Fix typo
217252d
@sungshik
Add recursive parameter to ConversionUnit
4d59dac
@sungshik
Add function to remove prefix conversion units from a list
bd14940
@sungshik
Widen applicability of function getInnerDelimiterPair for symbols t…
1dcd56e 
…o also support the case when the argument symbol is itself a delimiter
@sungshik
Add function to decompose lists of units into prefix/suffixes
044d10c
@sungshik
Add support for recursive productions to the converter
6ba991d
@sungshik
Update tests to support recursive productions
5e1f917
@sungshik
Merge branch 'identify-newline-separated-segments' into recursive-mul…
8d7d635 
…tiline-highlighting2
@sungshik
Add new test module (RascalTag) to test support for recursive produ…
c310743 
…ctions
@sungshik
Merge branch 'main' into recursive-multiline-highlighting2
9070cdd
@sungshik
Add a few more comments
7fa2df6
@sungshik
Add a few more comments
df909e5
@sungshik
Update generated TextMate grammar for Rascal/Pico
546bb13
sungshik
sungshik commented Sep 9, 2024
View reviewed changes
Copy link
Collaborator Author

@sungshik sungshik left a comment

Choose a reason for hiding this comment

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

Just a few additional comments

rascal-textmate-core/src/main/rascal/lang/textmate/Conversion.rsc Outdated Show resolved Hide resolved
rascal-textmate-core/src/main/rascal/lang/textmate/Conversion.rsc Show resolved Hide resolved
rascal-textmate-core/src/main/rascal/lang/textmate/Conversion.rsc Show resolved Hide resolved
rascal-textmate-core/src/main/rascal/lang/textmate/Conversion.rsc Show resolved Hide resolved
@sungshik sungshik marked this pull request as ready for review September 9, 2024 07:49
DavyLandman
DavyLandman approved these changes Sep 9, 2024
View reviewed changes
Copy link
Member

@DavyLandman DavyLandman left a comment

Choose a reason for hiding this comment

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

It's getting more and more complex, but looks good.

rascal-textmate-core/src/main/rascal/lang/textmate/ConversionUnit.rsc Outdated Show resolved Hide resolved
rascal-textmate-core/src/main/rascal/lang/textmate/Conversion.rsc Outdated Show resolved Hide resolved
sungshik
sungshik commented Sep 9, 2024
View reviewed changes
Copy link
Collaborator Author

@sungshik sungshik left a comment

Choose a reason for hiding this comment

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

Thank you, done

rascal-textmate-core/src/main/rascal/lang/textmate/Conversion.rsc Outdated Show resolved Hide resolved
rascal-textmate-core/src/main/rascal/lang/textmate/ConversionUnit.rsc Outdated Show resolved Hide resolved
@sungshik sungshik merged commit 8557e38 into main Sep 9, 2024
2 checks passed
@sungshik sungshik deleted the recursive-multiline-highlighting2 branch September 9, 2024 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DavyLandman DavyLandman DavyLandman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sungshik @DavyLandman