Reworked weak target by AndreasArvidsson · Pull Request #888 · cursorless-dev/cursorless

AndreasArvidsson · 2022-07-24T09:25:51Z

Fixes #883
Fixes #882

Checklist

Add checkboxes to issues that will unlock additional test cases for cells in our spreadsheet
I have added tests

AndreasArvidsson · 2022-07-24T12:08:51Z

@pokey Tests added. Some test or not currently possible. For example "inside funk", or modifiers after range. I also don't have "funk wrap and "snip funk" wired up. Could you please add those tests?

pokey

Nice! Haven't reviewed tests yet but overall looks like what we agreed on. Left a few comments

src/processTargets/modifiers/ItemStage/ItemStage.ts

src/processTargets/targetUtil/createContinuousRange.ts

src/processTargets/modifiers/ModifyIfImplicitScopeTypeStage.ts

AndreasArvidsson · 2022-07-24T12:54:46Z

okay updated

pokey

Yeah looking better. Few more minor comments then I'll have a look at the tests and we should be good to go!

src/processTargets/modifiers/ModifyIfImplicitScopeTypeStage.ts

src/typings/targetDescriptor.types.ts

src/core/commandRunner/CommandRunner.ts

pokey · 2022-07-24T16:19:11Z

@pokey Tests added. Some test or not currently possible. For example "inside funk", or modifiers after range. I also don't have "funk wrap and "snip funk" wired up. Could you please add those tests?

sure happy to record the snippet ones.

For "inside funk", we're actually looking for a scope type that doesn't have an "inside" to ensure that it doesn't expand to containing pair, right? I don't see why we can't test that today. Would just be an error test. Tbh would prob be better not to use "funk" because that will break when we support inside "funk". Maybe better to use "inside token"?

AndreasArvidsson · 2022-07-24T19:03:36Z

I think I've added all the test I can now

Our test recorded doesn't record breakpoints. But it's the same implementation(containingLineIfUntypedStage) for expansion as pour and clone.
The implementation of that mark is functionally the same as cursor.
Functions leading and trailing delimiter range is the same as token so hard to record anything useful for leading/trailing. Used line instead.
Added token tests for inside and bounds instead of function as we talked about

src/processTargets/marks/ThatStage.ts

Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>

This reverts commit 9ad7e9f.

src/processTargets/marks/CursorStage.ts

pokey · 2022-07-25T19:38:13Z

src/processTargets/modifiers/commonContainingScopeIfUntypedStages.ts

+// NB: We import `Target` below just so that @link below resolves.  Once one of
+// the following issues are fixed, we can either remove the above line or
+// switch to `{import("foo")}` syntax in the `{@link}` tag.
+// - https://github.com/microsoft/TypeScript/issues/43869
+// - https://github.com/microsoft/TypeScript/issues/43950
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import type { Target } from "../../typings/target.types";


Kind of annoying, but this was the best I could come up with cc/ @AndreasArvidsson @auscompgeek

src/test/suite/fixtures/recorded/implicitExpansion/clearBoundingThat.yml

src/test/suite/fixtures/recorded/implicitExpansion/clearFirstWordPastTrap.yml

src/test/suite/fixtures/recorded/implicitExpansion/clearLeadingPastWhale.yml

src/testUtil/TestCase.ts

src/processTargets/modifiers/scopeTypeStages/ParagraphStage.ts

AndreasArvidsson added 3 commits July 24, 2022 11:25

Renamed weak target, Renamed is weak, Added explicit range attribute

b0dc3d6

Don't remove leading or trailing delimited ranges for empty selection

2fa5144

Added clone parameters

a2bfab8

AndreasArvidsson changed the title ~~Renamed weak target, Renamed is weak, Added explicit range attribute~~ Renamed weak target Jul 24, 2022

AndreasArvidsson changed the title ~~Renamed weak target~~ Reworked weak target Jul 24, 2022

AndreasArvidsson added 5 commits July 24, 2022 11:38

Updated comment

b2c1e26

Always create continuous range

de404c0

Renamed UnTypedRangeTarget to UnTypedTarget

a9eeb96

Process targets before test recorded command hook

4195f75

Added tests

6184bc9

AndreasArvidsson marked this pull request as ready for review July 24, 2022 12:08

AndreasArvidsson requested a review from pokey as a code owner July 24, 2022 12:08

pokey reviewed Jul 24, 2022

View reviewed changes

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

src/processTargets/targetUtil/createContinuousRange.ts Outdated Show resolved Hide resolved

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

AndreasArvidsson added 2 commits July 24, 2022 14:50

Renamed to ifUntyped

a382209

Added item tests

8437c1c

pokey reviewed Jul 24, 2022

View reviewed changes

Cleanup

9016ebe

AndreasArvidsson commented Jul 25, 2022

View reviewed changes

src/processTargets/marks/ThatStage.ts Outdated Show resolved Hide resolved

AndreasArvidsson commented Jul 25, 2022

View reviewed changes

src/processTargets/marks/ThatStage.ts Outdated Show resolved Hide resolved

AndreasArvidsson and others added 7 commits July 25, 2022 14:38

Update src/typings/targetDescriptor.types.ts

93378eb

Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>

Update src/typings/targetDescriptor.types.ts

3d3b016

Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>

Cleanup

471bc4d

Cleanup

ce502b4

Added tests

1c1fc65

Cleanup

62f86b6

Added tests

7eb81f0

pokey added 5 commits July 25, 2022 14:38

Docstring

bf83803

Better error type for no inside / bounds

32c6f91

Remove code sharing from ThatStage and CursorStage

22ad63d

Doc strings

6850321

Switch test subset

5cbef5c

pokey force-pushed the reworkIsWeek branch from 8341f59 to 5cbef5c Compare July 25, 2022 13:44

pokey added 13 commits July 25, 2022 15:30

Fix docstring link

8664789

Record alternate "leading funk" test

7b87638

Record some more tests

feaffd4

Add a bunch of tests

bf25d47

Cleaned up from review

8118438

Docstring

4f4fda7

More tests

46997e0

One more test

6e18a39

Another test

46bf278

Rollback imports to avoid circular import

9ad7e9f

Improve test

8e1daa9

Revert "Rollback imports to avoid circular import"

77b4663

This reverts commit 9ad7e9f.

Fix imports

29b63c2

pokey reviewed Jul 25, 2022

View reviewed changes

Add tests; fix bug with "every block"

d1d3421

pokey reviewed Jul 27, 2022

View reviewed changes

src/processTargets/modifiers/scopeTypeStages/ParagraphStage.ts Outdated Show resolved Hide resolved

pokey added 3 commits July 27, 2022 16:32

Minor tweak

6abc639

Fix doc

142cd4b

Docstrings

d6341ed

pokey mentioned this pull request Jul 27, 2022

Fix inside ranges #895

Merged

1 task

pokey approved these changes Jul 27, 2022

View reviewed changes

Merge branch 'main' into reworkIsWeek

82e2a47

AndreasArvidsson merged commit 5694551 into main Jul 28, 2022

AndreasArvidsson deleted the reworkIsWeek branch July 28, 2022 08:21

Uh oh!

Conversation

AndreasArvidsson commented Jul 24, 2022 • edited by pokey Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Uh oh!

AndreasArvidsson commented Jul 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pokey left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AndreasArvidsson commented Jul 24, 2022

Uh oh!

pokey left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pokey commented Jul 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AndreasArvidsson commented Jul 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pokey Jul 25, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

AndreasArvidsson commented Jul 24, 2022 •

edited by pokey

Loading

AndreasArvidsson commented Jul 24, 2022 •

edited

Loading

pokey commented Jul 24, 2022 •

edited

Loading

AndreasArvidsson commented Jul 24, 2022 •

edited

Loading