Added text based item scope #709

AndreasArvidsson · 2022-05-31T13:56:46Z

Fixes #357
Fixes #566
Fixes #441
Fixes #294

If we replace the language based implementation with the text based one like we did for string we can close a lot of language specific issues with item

Checklist

I have added tests

pokey

As discussed, let's aim to

Support lists with a single item (ie no comma appears inside the parens)
Reuse the existing collectionItem modifier

Ideally we'd reuse existing code from generateUnmatchedDelimiters as well, but prob not a showstopper given this file is well contained, not too long, and will probably be reworked after #484

pokey · 2022-06-07T18:54:52Z

Performed git surgery. Original branch at https://github.com/cursorless-dev/cursorless/tree/bak/textTheBasedItemScope; feel free to delete if this branch looks ok

pokey

Looks like updated code causes type checker to be upset; I'll hold off reviewing till you get a chance to take a look

AndreasArvidsson · 2022-06-13T10:27:13Z

@pokey The tests are now clearing locally

…scode into textTheBasedItemScope

pokey · 2022-06-28T13:51:10Z

plan:

Remove "item" scope type from tree-sitter defs for languages that have comma-separated items
Leave "arg" as is in those languages
Duplicate "arg" tests for those languages with plaintext as lang and "item" as scope
Leave languages alone that don't have comma-separated lists

AndreasArvidsson · 2022-06-29T17:13:36Z

@pokey All languages that can are now relying on the text based implementation and I have added a bunch of new tests

AndreasArvidsson · 2022-07-01T07:35:52Z

I have now added python specific implementation for item in import list

pokey

Ok this looks pretty good! I made some tweaks in #823, and see inline comments. Note that tests are failing in #823 because I added a couple test cases to capture desired behaviour.
I'm obviously not in love with the code duplication with surrounding pairs, but we can revisit that when we refactor surrounding pairs as part of #484

src/processTargets/modifiers/surroundingPair/index.ts

src/processTargets/modifiers/ItemStage/getIterationScope.ts

src/test/suite/fixtures/recorded/itemTextual/chuckItem.yml

src/test/suite/fixtures/recorded/languages/python/clearEveryItem.yml

src/test/suite/fixtures/recorded/languages/typescript/clearItemBrace.yml

src/processTargets/modifiers/ItemStage/tokenizeRange.ts

src/processTargets/modifiers/ItemStage/ItemStage.ts

…sorless into textTheBasedItemScope

* Tweaks to text-based item PR * More tweaks and tests * More doc string Co-authored-by: Andreas Arvidsson <[email protected]>

This reverts commit 95acb52.

…sorless into textTheBasedItemScope

pokey

Looks good! Down to the last few minor comments and then let's ship it

src/languages/python.ts

src/processTargets/modifiers/ItemStage/tokenizeRange.ts

Co-authored-by: Pokey Rule <[email protected]>

AndreasArvidsson · 2022-07-05T12:25:37Z

@pokey Your latest change requests are now implemented

pokey

Ok I made a couple of final tweaks in 0791c3e. If they look good to you merge away!

pokey reviewed May 31, 2022

View reviewed changes

AndreasArvidsson marked this pull request as ready for review June 1, 2022 06:37

Base automatically changed from pokey/issue69-Support-fully-compositional-modifiers to main June 7, 2022 12:58

Added text based item scope

2be775a

pokey force-pushed the textTheBasedItemScope branch from 1c75319 to 2be775a Compare June 7, 2022 18:44

Merge branch 'main' into textTheBasedItemScope

f1e61fe

pokey reviewed Jun 7, 2022

View reviewed changes

AndreasArvidsson added 2 commits June 13, 2022 11:30

Merge branch 'main' into textTheBasedItemScope

256e92c

Cleaned up imports

94048ec

AndreasArvidsson added 6 commits June 15, 2022 09:17

Merge branch 'main' into textTheBasedItemScope

25b8248

Use text based item as a fallback

ee74800

Updated tests

3f0a79a

Merge branch 'main' into textTheBasedItemScope

f9ab73e

Don't look for items inside strings

0f0241d

Merge branch 'textTheBasedItemScope' of github.com:pokey/cursorless-v…

dd837b3

…scode into textTheBasedItemScope

Andreas Arvidsson and others added 10 commits June 28, 2022 22:26

More work on item stage

05c253b

updated test

4c51ff5

Replaced take test with clear test

3f9afa5

Merge branch 'main' into textTheBasedItemScope

742c603

updated item stage

3499f53

Typescript now uses text based item

2c13872

Use text based item for more languages

974aeea

Use text based item for more languages

1e3941c

Cleanup

768eef2

Added more tests

9ab4388

AndreasArvidsson requested a review from pokey June 29, 2022 17:12

AndreasArvidsson and others added 2 commits June 30, 2022 17:19

Merge branch 'main' into textTheBasedItemScope

bc03305

Added item support to python argument list

8b441ad

Andreas Arvidsson added 3 commits July 4, 2022 14:13

Merged with main

dc4ad3e

Use new requireStrongContainment

2ab20f6

Cleanup

022efb1

pokey requested changes Jul 4, 2022

View reviewed changes

Andreas Arvidsson and others added 12 commits July 4, 2022 17:45

Cleanup

9db3da3

Merge branch 'main' into textTheBasedItemScope

cae791e

Added complex surrounding pair scope type

95acb52

Merge branch 'textTheBasedItemScope' of github.com:cursorless-dev/cur…

8ca0f91

…sorless into textTheBasedItemScope

Tweaks to #709 (#823)

6136843

* Tweaks to text-based item PR * More tweaks and tests * More doc string Co-authored-by: Andreas Arvidsson <[email protected]>

Revert "Added complex surrounding pair scope type"

c1d2bfb

This reverts commit 95acb52.

Merge branch 'textTheBasedItemScope' of github.com:cursorless-dev/cur…

c3d3495

…sorless into textTheBasedItemScope

Cleanup

7c7f3aa

Create single union of items

7969637

Excluded separator from domain

6d074a6

Cleanup

7b14de4

Updated tests

30d9c11

pokey reviewed Jul 5, 2022

View reviewed changes

AndreasArvidsson and others added 4 commits July 5, 2022 13:27

Update src/processTargets/modifiers/ItemStage/tokenizeRange.ts

9f70175

Co-authored-by: Pokey Rule <[email protected]>

Update src/processTargets/modifiers/ItemStage/tokenizeRange.ts

9a65fcf

Co-authored-by: Pokey Rule <[email protected]>

Update src/languages/python.ts

456c905

Co-authored-by: Pokey Rule <[email protected]>

Cleanup

1d4ff8d

pokey added 2 commits July 5, 2022 16:04

Merge branch 'main' into textTheBasedItemScope

27e966b

Tweaks

0791c3e

pokey approved these changes Jul 5, 2022

View reviewed changes

AndreasArvidsson merged commit d9fa044 into main Jul 5, 2022

AndreasArvidsson deleted the textTheBasedItemScope branch July 5, 2022 16:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added text based item scope #709

Added text based item scope #709

AndreasArvidsson commented May 31, 2022 •

edited by pokey

Loading

pokey left a comment •

edited by AndreasArvidsson

Loading

pokey commented Jun 7, 2022

pokey left a comment •

edited

Loading

AndreasArvidsson commented Jun 13, 2022

pokey commented Jun 28, 2022 •

edited by AndreasArvidsson

Loading

AndreasArvidsson commented Jun 29, 2022

AndreasArvidsson commented Jul 1, 2022

pokey left a comment

pokey left a comment

AndreasArvidsson commented Jul 5, 2022

pokey left a comment

Added text based item scope #709

Added text based item scope #709

Conversation

AndreasArvidsson commented May 31, 2022 • edited by pokey Loading

Checklist

pokey left a comment • edited by AndreasArvidsson Loading

Choose a reason for hiding this comment

pokey commented Jun 7, 2022

pokey left a comment • edited Loading

Choose a reason for hiding this comment

AndreasArvidsson commented Jun 13, 2022

pokey commented Jun 28, 2022 • edited by AndreasArvidsson Loading

AndreasArvidsson commented Jun 29, 2022

AndreasArvidsson commented Jul 1, 2022

pokey left a comment

Choose a reason for hiding this comment

pokey left a comment

Choose a reason for hiding this comment

AndreasArvidsson commented Jul 5, 2022

pokey left a comment

Choose a reason for hiding this comment

AndreasArvidsson commented May 31, 2022 •

edited by pokey

Loading

pokey left a comment •

edited by AndreasArvidsson

Loading

pokey left a comment •

edited

Loading

pokey commented Jun 28, 2022 •

edited by AndreasArvidsson

Loading