Add Matchit support for the C family of languages #488
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
findClosingPair() always moves forward and findOpeningPair() always moves backwards. That fact lets us simplify both implementations. Using a stack of Pairs to track the match starts and ends is unnecessary since we know ahead of time whether the jump needs to go to the start or end of the target pair. findOpeningPair() can be further simplified since it doesn't need to check the isInOpPending flag -- the distinction between operator pending mode and regular jumps only matters when moving forward in the buffer.
The ending offset of the initial match isn't enough information for some language features. For example, if the cursor is on "i" in the "else if" of a Makefile, the previous implementation would jump to the "else" on a reverse jump instead of treating "else if" as a single structure. parsePatternAtOffset() needs to return both the match start and end for us to correctly handle such a distinction.
The new LanguagePatterns class lets us easily configure the patterns for a language in a similar way to the original plugin. Most language features can be configured by passing strings to the alternate constructor. And the overloaded + operator makes combining patterns easy. findMatchingPair() was refactored to work with the new class. In addition, the concept of prefixes was removed. The cursor should jump if it's anywhere inside or before an extended pair (excluding the default pairs). Instead of appending a prefix to each regex, we simply check in findMatchingPair() what the closest pair to the cursor is. The original plugin behaves the same way. We prefer matches containing the cursor over matches after the cursor. If the cursor in inside multiple patterns, we pick the smaller one. And a default pair after the cursor is preferred over any extended pairs after the cursor.
myzeiri
force-pushed
the
matchit-enhancements
branch
from
47933e5
to
0f4fb83
Compare
|
Hi, this is a great work. Thank you for the new languages support! |
|
Thanks, Alex! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following up on #343, this PR adds Matchit support for the C family of languages. The plugin now supports jumps on C-style preprocessor directives (found in C, C++, C#, ObjC), Makefiles, and CMake files.
I also refactored the code to be simpler and to make language configuration easier. Sorry for the large diff though! The changes are split into distinct commits with more detailed notes in the commit messages.
To sum up, I:
findClosingPair()andfindOpeningPair()parsePatternAtOffset()to return both the pattern start and end offsetselse ifconditional in MakefilesLanguagePatternsclass to make language configuration easyThank you in advance for your time.