Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make hat forcing more aggressive #2602

Merged
merged 3 commits into from
Jul 30, 2024
Merged

Make hat forcing more aggressive #2602

merged 3 commits into from
Jul 30, 2024

Conversation

pokey
Copy link
Member

@pokey pokey commented Jul 29, 2024 •
edited
Loading

Checklist

  • [-] I have added tests
  • [-] I have updated the docs and cheatsheet
  • [-] I have not broken the cheatsheet

@pokey pokey marked this pull request as ready for review July 29, 2024 18:19
@pokey pokey requested a review from a team as a code owner July 29, 2024 18:19
@pokey pokey force-pushed the pokey/make-hat-forcing-more-aggressive branch from 19b7af3 to 2b04011 Compare July 30, 2024 10:55
@pokey pokey marked this pull request as draft July 30, 2024 10:55
@pokey pokey force-pushed the pokey/make-hat-forcing-more-aggressive branch 3 times, most recently from 9e2c74f to 44c1084 Compare July 30, 2024 10:58
pokey
pokey commented Jul 30, 2024
View reviewed changes
packages/cursorless-engine/src/util/allocateHats/getRankedTokens.ts
Comment on lines +55 to +58
return moveForcedHatsToFront(forcedHatMap, tokens).map((token, index) => ({
token,
rank: -index,
}));
Copy link
Member Author

Choose a reason for hiding this comment

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

notice that we generate the ranks at the end now. It seems we had a bug where we were treating hats as having the same rank if they were in other editors

@pokey pokey force-pushed the pokey/make-hat-forcing-more-aggressive branch from 44c1084 to 7debe87 Compare July 30, 2024 11:04
@pokey pokey marked this pull request as ready for review July 30, 2024 11:09
@pokey pokey enabled auto-merge July 30, 2024 11:09
@pokey pokey added this pull request to the merge queue Jul 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 30, 2024
@pokey pokey added this pull request to the merge queue Jul 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 30, 2024
@pokey pokey added this pull request to the merge queue Jul 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 30, 2024
@pokey pokey added this pull request to the merge queue Jul 30, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jul 30, 2024
@pokey
Make hat forcing more aggressive (#2602)
e3d3662 
## Checklist

- [-] I have added
[tests](https://www.cursorless.org/docs/contributing/test-case-recorder/)
- [-] I have updated the
[docs](https://github.com/cursorless-dev/cursorless/tree/main/docs) and
[cheatsheet](https://github.com/cursorless-dev/cursorless/tree/main/cursorless-talon/src/cheatsheet)
- [-] I have not broken the cheatsheet
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 30, 2024
@pokey pokey added this pull request to the merge queue Jul 30, 2024
Merged via the queue into main with commit 30fec0f Jul 30, 2024
15 checks passed
@pokey pokey deleted the pokey/make-hat-forcing-more-aggressive branch July 30, 2024 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndreasArvidsson AndreasArvidsson AndreasArvidsson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pokey @AndreasArvidsson