fixes #1327 #1331
Merged
fixes #1327 #1331
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
johnfn
requested changes
Feb 26, 2017
src/matching/matcher.ts
Outdated
| @@ -17,11 +17,6 @@ export class PairMatcher { | |||
| // useful for text objects. | |||
| "<" : { match: ">", nextMatchIsForward: true }, | |||
| ">" : { match: "<", nextMatchIsForward: false }, | |||
| // These are useful for deleting closing and opening quotes, but don't seem to negatively | |||
| // affect how text objects such as `ci"` work, which was my worry. | |||
| '"' : { match: '"', nextMatchIsForward: false }, | |||
There was a problem hiding this comment.
Can you leave these inside PairMatcher? Because we use PairMatcher's pairings in other places, like surround.
Can you just give them an attribute like directionless: true? which you check for down below instead?
There was a problem hiding this comment.
sure, but you shouldn't be using quotes in the pairmatcher for surround...there is no open or close, so how is doing a surround with " different than a surround with any other normal character?
There was a problem hiding this comment.
Actually you're right, I just duplicated that code in surround.vim. Yeahhhhhh.
I still would like it to be here for completeness though. :)
|
Perfect, thanks! |
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.
@rufusroflpunch this isn't the cleanest way to fix the problem but I think it is fine, what do you think?
The problem is we use nextPairedCharacter in the matcher in a few other places, and if it is not in the pairings, then it returns instantly. However, when we added quotes, this meant nextPairedCharacter would now iterate the document looking for a forward or backward matching char, this could probably be made to work correctly since in these cases quotes are typically pairs, but this solution seemed easier to me for now...