Support multiple targets per scope #1509
Merged
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
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
84f562b
to
d88ec85
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
84aeab2
to
04cf9b8
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
d88ec85
to
809c4ed
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
04cf9b8
to
65a080a
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
809c4ed
to
de7311a
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
65a080a
to
538f8b7
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
de7311a
to
db10418
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
538f8b7
to
980ad18
Compare
pokey
commented
May 28, 2023
Comment on lines
+28
to
+30
| if (targets1.length !== 1 || targets2.length !== 1) { | ||
| throw Error("Scope range targets must be single-target"); | ||
| } |
There was a problem hiding this comment.
wasn't sure what to do in this case. seems like a corner case that will never happen. But basically it's if user says "take tags air past bat", which doesn't really make any sense
pokey
commented
May 28, 2023
There was a problem hiding this comment.
This is the punchline. We merge tree-sitter scopes with the same domain. See #1507 for a change that requires developer to specifically tag these captures with #allow-multiple!
pokey
commented
May 28, 2023
| @@ -89,7 +89,7 @@ function processSurroundingPairCore( | |||
| return findSurroundingPairTextBased( | |||
| editor, | |||
| range, | |||
| containingScope.contentRange, | |||
| containingScope[0].contentRange, | |||
There was a problem hiding this comment.
wasn't sure what to do here, but I don't think it matters too much: it's for legacy surrounding pair modifier, and would be the situation where there are is a text fragment capture that has multiple targets, which I can't really see being a case we'll need to support. In #1507 we actually throw an error if they try to use #allow-multiple! for a text fragment
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
2 times, most recently
from
23fcbff
to
7f02822
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
db10418
to
62d4370
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
7f02822
to
da0805c
Compare
3 tasks
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
da0805c
to
df5c834
Compare
AndreasArvidsson
approved these changes
May 30, 2023
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
df5c834
to
c6e6679
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
2 times, most recently
from
1843991
to
efaf773
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
c6e6679
to
1f71bf0
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
efaf773
to
98daf2c
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
3 times, most recently
from
fbc0e27
to
8734be6
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
a2159f7
to
3b1cfff
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
8734be6
to
726f7c2
Compare
pokey
force-pushed
the
pokey/support-child-range-predicate
branch
from
3b1cfff
to
0edf161
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
726f7c2
to
ba21794
Compare
pokey
force-pushed
the
pokey/support-multiple-targets-per-scope
branch
from
ba21794
to
c64f7b4
Compare
pokey
added a commit
that referenced
this pull request
Jun 6, 2023
#1507) - Depends on #1509 - Fixes #1481 ## Checklist - [ ] I have added [tests](https://www.cursorless.org/docs/contributing/test-case-recorder/) - [ ] I have updated the [docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and [cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet) - [ ] I have not broken the cheatsheet
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.
#child-range!predicate #1506Checklist