Skip to content

Add modifiers, more special marks to cheatsheet#885

Merged
pokey merged 19 commits into
cursorless-dev:mainfrom
brollin:cheatsheet-bounds-inside
Aug 4, 2022
Merged

Add modifiers, more special marks to cheatsheet#885
pokey merged 19 commits into
cursorless-dev:mainfrom
brollin:cheatsheet-bounds-inside

Conversation

@brollin

@brollin brollin commented Jul 19, 2022

Copy link
Copy Markdown
Contributor

Closes #873, closes #636, partially addresses #667. Will check a few boxes in #840.

@brollin
brollin requested a review from pokey as a code owner July 19, 2022 22:11

@pokey pokey left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah sorry I really gotta add contributor docs for the new cheatsheet 😅. The defaults.json is just for making local development easier. The actual user json when the user says "cursorless cheatsheet" is generated here https://github.com/cursorless-dev/cursorless/blob/main/cursorless-talon/src/cheatsheet_html/cheat_sheet.py#L33

Comment thread cursorless-nx/libs/cheatsheet/src/lib/cheatsheetLegend.tsx Outdated
Comment thread cursorless-nx/libs/cheatsheet/src/lib/data/sampleSpokenFormInfos/defaults.json Outdated
Comment thread cursorless-nx/libs/cheatsheet/src/lib/data/sampleSpokenFormInfos/defaults.json Outdated
Comment thread cursorless-nx/libs/cheatsheet/src/lib/data/sampleSpokenFormInfos/defaults.json Outdated
Comment thread cursorless-nx/libs/cheatsheet/src/lib/data/sampleSpokenFormInfos/defaults.json Outdated
Comment thread cursorless-nx/libs/cheatsheet/src/lib/data/sampleSpokenFormInfos/defaults.json Outdated
Comment thread cursorless-nx/libs/cheatsheet/src/lib/data/sampleSpokenFormInfos/defaults.json Outdated
brollin and others added 5 commits July 19, 2022 23:36
Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>
Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>
Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>
@brollin
brollin marked this pull request as draft July 20, 2022 09:14
@brollin brollin changed the title Add bounds, inside, row, up, down to cheatsheet Add modifiers, more special marks to cheatsheet Jul 20, 2022
@brollin

brollin commented Jul 20, 2022

Copy link
Copy Markdown
Contributor Author

Wasn't fully using my brain when beginning this task 🙃 but after your comment and perusing some more, I have a better grasp of things. I think! :)

Here is what I've got so far:

image

image

I'm thinking that some of the "Meaning"s should be adjusted, which I can tackle tomorrow.

@brollin
brollin marked this pull request as ready for review July 20, 2022 20:48

@pokey pokey left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me; made a bunch of tweaks though so lmk what you think

@brollin

brollin commented Aug 3, 2022

Copy link
Copy Markdown
Contributor Author

All the changes look good to me 👍

@pokey
pokey merged commit 6c54a17 into cursorless-dev:main Aug 4, 2022
cursorless-bot pushed a commit that referenced this pull request Aug 4, 2022
* add bounds,inside,row,up,down to cheatsheet

* use correct ids

* PR comment

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

* PR comment

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

* PR comment

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

* # -> number

* include line_direction special marks in cheatsheet

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

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

* add modifiers section to cheatsheet

* Better special mark descriptions

* Modifiers descriptions

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

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

* modifier description fix up

* update spoken form defaults

* Various improvements

* Revert accidental change

Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
thetomcraig-aya pushed a commit to thetomcraig/cursorless that referenced this pull request Mar 27, 2024
* add bounds,inside,row,up,down to cheatsheet

* use correct ids

* PR comment

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

* PR comment

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

* PR comment

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

* # -> number

* include line_direction special marks in cheatsheet

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

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

* add modifiers section to cheatsheet

* Better special mark descriptions

* Modifiers descriptions

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

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

* modifier description fix up

* update spoken form defaults

* Various improvements

* Revert accidental change

Co-authored-by: Pokey Rule <755842+pokey@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add "bounds" and "inside" to cheatsheet The row scope does not appear in the cheatsheet

2 participants