implement 'short paint' scope type #737

AndrewDant · 2022-06-05T16:12:37Z

Closes #587

Checklist

I have added tests

cursorless-talon/src/modifiers/containing_scope.py

src/processTargets/processSelectionType.ts

Will-Sommers · 2022-06-06T02:22:05Z

Looking good!

pokey

Nice! Would be good to add a couple tests that exercise the "paint" aspect—all your tests just focus on the "small" part. So I'd have the following tests, each time testing both "clear" and "chuck":

"hello-world"
"hello-world testing"
"some hello-world test"

pokey · 2022-06-06T06:30:18Z

Also, re excluding other delimiters, it's a good question. I prob wouldn't want to exclude square brackets, because I'd prob want to be able to grab foo[0]. Maybe let's keep it to quotes for now?

AndrewDant · 2022-06-06T12:52:45Z

Also, re excluding other delimiters, it's a good question. I prob wouldn't want to exclude square brackets, because I'd prob want to be able to grab foo[0]. Maybe let's keep it to quotes for now?

I'm content with that.

Will-Sommers · 2022-06-09T15:12:36Z

Heyo @AndrewDant — happy to walk through this merge conflict if you end up getting stuck. I had to do it for a few PRs already. Excited for this modifier to come out!

for more information, see https://pre-commit.ci

pokey · 2022-06-22T20:28:03Z

Should we switch this one to "short paint"? That will be more consistent with "long head" when we add that

for more information, see https://pre-commit.ci

cursorless-talon/src/modifiers/containing_scope.py

src/processTargets/getModifierStage.ts

src/processTargets/modifiers/SmallPaintStage.ts

pokey

Interesting direction. I still don't totally understand how "every" should work, but I left a bunch of minor comments.

Fwiw, the advantage of the original approach is that "every" becomes trivial, though I think in that case I'd still want "every" to expand to nearest containing string if input target is empty

src/processTargets/modifiers/scopeTypeStages/RegexStage.ts

cursorless-talon/src/modifiers/containing_scope.py

src/core/commandVersionUpgrades/upgradeV1ToV2/commandV1.types.ts

cursorless-talon/src/modifiers/containing_scope.py

src/processTargets/modifiers/SmallPaintStage.ts

src/test/suite/fixtures/recorded/selectionTypes/changeSmallPaint.yml

src/typings/targetDescriptor.types.ts

AndreasArvidsson · 2022-06-28T18:43:39Z

@AndrewDant To fix the bug with paint just replace range.end.isBeforeOrEqual(end) with range.start.isBeforeOrEqual(end) at RegexStage.ts:L41

pokey · 2022-06-28T19:40:48Z

Also a couple more tests to add:

"change every small paint pair paren"
"change every small paint inside paren"

for more information, see https://pre-commit.ci

pokey

LGTM with minor comment!

src/processTargets/modifiers/scopeTypeStages/RegexStage.ts

src/test/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml

AndrewDant · 2022-06-30T12:15:10Z

I've added more tests, we might be ready to go now but let me know if I missed anything.

pokey

Looks good! Ship it 🙌

* implement 'small paint' scope type * additional test with white space on each side * updates to get small paint working besides removal range * stage refactors recommended during pair programming * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * revert some refactors after merging * Updates small paint to stop on any surrounding pairs' delimiter * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * some additional small paint tests * rename small paint stage * remove unnecessary changed * update default phrase from small paint to short paint * update short paint every behavior * update short paint to call process surrounding pair directly * fix short paint stage capitalization * fix short paint modifier capitalization * update small paint every tests and scope type in tests * refactor short paint * Switch to strong containment implementation * fix bug with paint selection type * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix a reference to short paint stage name * remove outdated tests * boundedNonWhitespaceStage -> BoundedNonWhitespaceStage * Cleanup * paint and short paint tests * better change every paint pair tests Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Andreas Arvidsson <[email protected]> Co-authored-by: Pokey Rule <[email protected]>

AndrewDant added 2 commits June 5, 2022 12:07

implement 'small paint' scope type

5a9d592

additional test with white space on each side

6caf71c

Will-Sommers reviewed Jun 6, 2022

View reviewed changes

cursorless-talon/src/modifiers/containing_scope.py Outdated Show resolved Hide resolved

Will-Sommers reviewed Jun 6, 2022

View reviewed changes

src/processTargets/processSelectionType.ts Outdated Show resolved Hide resolved

pokey reviewed Jun 6, 2022

View reviewed changes

AndrewDant marked this pull request as ready for review June 6, 2022 12:52

AndrewDant and others added 8 commits June 9, 2022 20:50

Merge remote-tracking branch 'origin/main' into small-paint

b12268c

updates to get small paint working besides removal range

aa18213

stage refactors recommended during pair programming

dc864a9

Merge remote-tracking branch 'origin/main' into small-paint

d173bc9

[pre-commit.ci] auto fixes from pre-commit.com hooks

87498e2

for more information, see https://pre-commit.ci

revert some refactors after merging

cf6cc31

Merge remote-tracking branch 'AndrewDant/small-paint' into small-paint

079642a

Merge remote-tracking branch 'origin/main' into small-paint

b13f110

AndrewDant and others added 5 commits June 22, 2022 20:17

Updates small paint to stop on any surrounding pairs' delimiter

3506d29

[pre-commit.ci] auto fixes from pre-commit.com hooks

b085811

for more information, see https://pre-commit.ci

some additional small paint tests

59012b4

Merge remote-tracking branch 'AndrewDant/small-paint' into small-paint

7c87e2e

Merge branch 'main' into small-paint

e66d129

AndreasArvidsson reviewed Jun 23, 2022

View reviewed changes

cursorless-talon/src/modifiers/containing_scope.py Outdated Show resolved Hide resolved

AndreasArvidsson reviewed Jun 23, 2022

View reviewed changes

src/processTargets/getModifierStage.ts Outdated Show resolved Hide resolved

AndreasArvidsson reviewed Jun 23, 2022

View reviewed changes

src/processTargets/modifiers/SmallPaintStage.ts Outdated Show resolved Hide resolved

AndreasArvidsson reviewed Jun 23, 2022

View reviewed changes

src/processTargets/modifiers/SmallPaintStage.ts Outdated Show resolved Hide resolved

pokey reviewed Jun 23, 2022

View reviewed changes

rename small paint stage

a0b62d7

AndrewDant and others added 4 commits June 28, 2022 12:42

update small paint every tests and scope type in tests

c66e219

refactor short paint

df27e7d

Merge remote-tracking branch 'AndrewDant/small-paint' into small-paint

4111578

Switch to strong containment implementation

c8c1db9

pokey reviewed Jun 28, 2022

View reviewed changes

src/typings/targetDescriptor.types.ts Show resolved Hide resolved

Merge branch 'main' into small-paint

18c33c4

AndrewDant and others added 6 commits June 28, 2022 16:12

fix bug with paint selection type

a0feece

[pre-commit.ci] auto fixes from pre-commit.com hooks

a887b04

for more information, see https://pre-commit.ci

fix a reference to short paint stage name

9f51cce

remove outdated tests

e69e682

boundedNonWhitespaceStage -> BoundedNonWhitespaceStage

61523c3

Cleanup

03c0500

pokey mentioned this pull request Jun 29, 2022

Remove leading / trailing whitespace when next to paired delimiter #800

Closed

pokey reviewed Jun 29, 2022

View reviewed changes

src/processTargets/modifiers/scopeTypeStages/RegexStage.ts Show resolved Hide resolved

AndrewDant added 3 commits June 30, 2022 07:55

paint and short paint tests

23bc193

Merge remote-tracking branch 'AndrewDant/small-paint' into small-paint

8d19fac

better change every paint pair tests

ca690e4

AndrewDant commented Jun 30, 2022

View reviewed changes

src/test/suite/fixtures/recorded/selectionTypes/changeEveryPaintPairParen2.yml Show resolved Hide resolved

AndreasArvidsson and others added 3 commits June 30, 2022 17:33

Merge branch 'main' into small-paint

436b0df

Merge branch 'main' into small-paint

65c4181

Merge branch 'main' into small-paint

d111942

pokey approved these changes Jul 3, 2022

View reviewed changes

Merge branch 'main' into small-paint

be1a56c

pokey changed the title ~~implement 'small paint' scope type~~ implement 'short paint' scope type Jul 3, 2022

pokey merged commit 492e56f into cursorless-dev:main Jul 3, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

implement 'short paint' scope type #737

implement 'short paint' scope type #737

AndrewDant commented Jun 5, 2022 •

edited

Loading

Will-Sommers commented Jun 6, 2022

pokey left a comment

pokey commented Jun 6, 2022

AndrewDant commented Jun 6, 2022

Will-Sommers commented Jun 9, 2022

pokey commented Jun 22, 2022

pokey left a comment

AndreasArvidsson commented Jun 28, 2022 •

edited

Loading

pokey commented Jun 28, 2022

pokey left a comment

AndrewDant commented Jun 30, 2022

pokey left a comment

implement 'short paint' scope type #737

implement 'short paint' scope type #737

Conversation

AndrewDant commented Jun 5, 2022 • edited Loading

Checklist

Will-Sommers commented Jun 6, 2022

pokey left a comment

Choose a reason for hiding this comment

pokey commented Jun 6, 2022

AndrewDant commented Jun 6, 2022

Will-Sommers commented Jun 9, 2022

pokey commented Jun 22, 2022

pokey left a comment

Choose a reason for hiding this comment

AndreasArvidsson commented Jun 28, 2022 • edited Loading

pokey commented Jun 28, 2022

pokey left a comment

Choose a reason for hiding this comment

AndrewDant commented Jun 30, 2022

pokey left a comment

Choose a reason for hiding this comment

AndrewDant commented Jun 5, 2022 •

edited

Loading

AndreasArvidsson commented Jun 28, 2022 •

edited

Loading