Support complex relative grammar #987

AndreasArvidsson · 2022-10-02T09:56:35Z

Partial #13
Fixes #979

Checklist

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

AndreasArvidsson · 2022-10-02T10:03:42Z

The grammar is now updated to support every thing from the image in issue #13.

…into ordinal_grammar

pokey

Cool!! 😍

cursorless-talon/src/modifiers/relative_scope.py

cursorless-talon/src/modifiers/ordinal_scope.py

cursorless-talon/src/modifiers/scopes.py

cursorless-talon/src/vendor/inflection.py

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

…into ordinal_grammar

src/processTargets/modifiers/RelativeScopeStage.ts

pokey

One thing that's missing in this PR from the diagram is "second last" (equivalent to "second to last" in English)

cursorless-talon/src/modifiers/relative_scope.py

pokey

Oh yeah we should also do a quick DFA test before merge just in case

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

…into ordinal_grammar

AndreasArvidsson · 2022-10-03T10:39:22Z

@pokey I have updated the legend extension side, but I'm not sure how to actually test it. That cheat sheet doesn't work in development host for me.

Since I know that you are going to rewrite all of the documentation any how do you mind just doing it originally the way you want it?

AndreasArvidsson · 2022-10-06T14:12:12Z

Yeah but that's only the first time isn't it? Switching back and forth will use the cache?

pokey · 2022-10-06T14:12:53Z

Yes, but it's still not too hard to get a cache miss when I was testing. Idk maybe let's drive this PR for a day to see how painful it is

AndreasArvidsson · 2022-10-06T14:13:46Z

Sounds good. I was really hoping that we wouldn't have to bother with dfa performance anymore :/

btw for this pr switching to ts: 2022-10-06 16:15:23 IO [audio]=1200.000ms [compile]=1701.832ms [emit]=33.019ms [decode]=5.512ms [total]=1740.363ms

AndreasArvidsson · 2022-10-06T21:33:07Z

@pokey I found an optimization for number_small. Basically instead of using an advance capture with multiple terms I just turned it into a single list. I made a few different performance measurements and it's very clear that a list is definitely the fastest.

@ctx.capture("number_small", rule=f"({alt_digits} | {alt_teens} | {alt_tens} [{alt_digits}])") # 1710ms
@ctx.capture("number_small", rule=f"one") # 710ms
@ctx.capture("number_small", rule="{user.number_small}") # 667ms
@ctx.capture("number_small", rule=f"{'|'.join(number_small)}") # 1794ms
def number_small(m): 
    return int(parse_number(list(m)))

The commit for my repository. If you can't find any flaw we should probably upstream this to Knausj and dfa will be good enough.
AndreasArvidsson/andreas-talon@452aad5

If we want to optimize further there is probably multiple captures in Cursorless that we could turn into lists if we wanted to.

pokey · 2022-10-07T11:06:48Z

oh yeah good call. yeah like you suggest we could probably inline a bunch of compound captures into big lists. certainly for things that don't include customisable spoken forms. for lists that are customisable we could just regenerate the lists if part of it changes. but yeah I'll try out the number_small optimisation and see if that gets us to a good enough spot

pokey · 2022-10-07T12:22:23Z

Wow just tested locally. Absolute game changer. Filed PR on knausj to save you the trouble talonhub/community#993. I'll finish reviewing this PR and I think we can get this one in and just tell people they need to update their knausj once that PR is merged

pokey · 2022-10-07T12:35:54Z

Just tried it on my personal fork, and it's <600ms, so that's good. Still slower than I'm used to, but good enough for now.

AndreasArvidsson · 2022-10-07T13:39:14Z

Nice. I saved over a second in compile time on this pr. That is quite massive for such a small change :)
Now I think it's good enough to merge, but I think we should probably try to figure out some more optimizations.

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

pokey

Ok I'm happy with it, but I made a bunch of changes, so have a look. I changed all the capture formatting in cheatsheet; see screenshot in description

pokey · 2022-10-07T16:15:39Z

Actually one more thing let me drop diagram into docs

pokey · 2022-10-07T16:25:44Z

Ok good to go; have a look to make sure it all seems good to you and then feel free to merge if so

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

* Added support for plural lists * Updated relative scope modifier grammar * Added ordinals to relative modifier * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added plural list for regex scopes * Update cursorless-talon/src/modifiers/relative_scope.py Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com> * Update cursorless-talon/src/modifiers/relative_scope.py Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com> * Added link to inflection license * Use plural scope type in ordinal scope * Added support for <ordinal> last scope grammar * Clean up * Added words to csv * Updated modifier grammar * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Updated legend * Added docs * Update defaults.json * Start tweaking modifier cheatsheet * More cheatsheet updates * More tweaks * Cleanup cheatsheet representation * Some talon cleanup * Change formatting for cheatsheet captures * Fix captures in cheatsheet * More capture cleanup * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Revert ts config * Revert old cheatsheet changes * Fixes * Tweak docs * More doc tweaks * Add diagram * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>

AndreasArvidsson added 3 commits October 2, 2022 10:50

Added support for plural lists

2653b18

Updated relative scope modifier grammar

07fda26

Added ordinals to relative modifier

a506447

AndreasArvidsson requested a review from pokey as a code owner October 2, 2022 09:56

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

66f17cd

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

AndreasArvidsson linked an issue Oct 2, 2022 that may be closed by this pull request

Add ordinal scope types #13

Open

16 tasks

AndreasArvidsson added 2 commits October 2, 2022 12:06

Added plural list for regex scopes

52844c5

Merge branch 'ordinal_grammar' of github.com:pokey/cursorless-vscode …

b0f2916

…into ordinal_grammar

pokey reviewed Oct 2, 2022

View reviewed changes

AndreasArvidsson and others added 5 commits October 2, 2022 12:32

Update cursorless-talon/src/modifiers/relative_scope.py

b0b68e2

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

Update cursorless-talon/src/modifiers/relative_scope.py

e686da1

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

Added link to inflection license

7ded4ad

Use plural scope type in ordinal scope

1ec450c

Merge branch 'ordinal_grammar' of github.com:pokey/cursorless-vscode …

9ced38f

…into ordinal_grammar

auscompgeek reviewed Oct 2, 2022

View reviewed changes

src/processTargets/modifiers/RelativeScopeStage.ts Show resolved Hide resolved

pokey reviewed Oct 2, 2022

View reviewed changes

cursorless-talon/src/modifiers/relative_scope.py Show resolved Hide resolved

pokey reviewed Oct 2, 2022

View reviewed changes

Merge branch 'main' into ordinal_grammar

752217d

pokey marked this pull request as draft October 2, 2022 16:10

pokey mentioned this pull request Oct 2, 2022

Separate concepts of position and quantity for ordinal / relative scopes #1000

Open

AndreasArvidsson and others added 7 commits October 2, 2022 21:04

Added support for <ordinal> last scope grammar

eed0168

Clean up

43b5388

Added words to csv

19e2110

Updated modifier grammar

49697c6

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

b409f30

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

Updated legend

e85ff8e

Merge branch 'ordinal_grammar' of github.com:pokey/cursorless-vscode …

e7eda52

…into ordinal_grammar

Some talon cleanup

8ea47bc

pokey and others added 9 commits October 7, 2022 16:04

Change formatting for cheatsheet captures

24eb52f

Fix captures in cheatsheet

fde8bec

More capture cleanup

6bf2a7d

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

9c8f716

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

Revert ts config

6b8eb94

Revert old cheatsheet changes

f15d028

Fixes

fb1a803

Tweak docs

ba3ebdc

More doc tweaks

f5e38ac

pokey previously approved these changes Oct 7, 2022

View reviewed changes

Add diagram

77d507e

pokey dismissed their stale review via 77d507e October 7, 2022 16:25

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

75e3058

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

pokey approved these changes Oct 7, 2022

View reviewed changes

AndreasArvidsson merged commit eef8bfc into main Oct 7, 2022

AndreasArvidsson deleted the ordinal_grammar branch October 7, 2022 18:58

pokey mentioned this pull request Oct 9, 2022

Workaround for number_small performance on old knausj version #1021

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support complex relative grammar #987

Support complex relative grammar #987

AndreasArvidsson commented Oct 2, 2022 •

edited by pokey

Loading

AndreasArvidsson commented Oct 2, 2022

pokey left a comment

pokey left a comment

pokey left a comment

AndreasArvidsson commented Oct 3, 2022

AndreasArvidsson commented Oct 6, 2022

pokey commented Oct 6, 2022

AndreasArvidsson commented Oct 6, 2022 •

edited

Loading

AndreasArvidsson commented Oct 6, 2022 •

edited

Loading

pokey commented Oct 7, 2022

pokey commented Oct 7, 2022

pokey commented Oct 7, 2022

AndreasArvidsson commented Oct 7, 2022 •

edited

Loading

pokey left a comment

pokey commented Oct 7, 2022

pokey commented Oct 7, 2022

Support complex relative grammar #987

Support complex relative grammar #987

Conversation

AndreasArvidsson commented Oct 2, 2022 • edited by pokey Loading

Checklist

AndreasArvidsson commented Oct 2, 2022

pokey left a comment

Choose a reason for hiding this comment

pokey left a comment

Choose a reason for hiding this comment

pokey left a comment

Choose a reason for hiding this comment

AndreasArvidsson commented Oct 3, 2022

AndreasArvidsson commented Oct 6, 2022

pokey commented Oct 6, 2022

AndreasArvidsson commented Oct 6, 2022 • edited Loading

AndreasArvidsson commented Oct 6, 2022 • edited Loading

pokey commented Oct 7, 2022

pokey commented Oct 7, 2022

pokey commented Oct 7, 2022

AndreasArvidsson commented Oct 7, 2022 • edited Loading

pokey left a comment

Choose a reason for hiding this comment

pokey commented Oct 7, 2022

pokey commented Oct 7, 2022

AndreasArvidsson commented Oct 2, 2022 •

edited by pokey

Loading

AndreasArvidsson commented Oct 6, 2022 •

edited

Loading

AndreasArvidsson commented Oct 6, 2022 •

edited

Loading

AndreasArvidsson commented Oct 7, 2022 •

edited

Loading