Skip to content

Disable expand to containing token on fallback #2798

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

Merged
merged 6 commits into from
Jan 30, 2025
Merged

Disable expand to containing token on fallback #2798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96ec688
Disable expand to containing token on fallback
AndreasArvidsson Jan 30, 2025
92b305d
Update test
AndreasArvidsson Jan 30, 2025
e955f26
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Jan 30, 2025
f0e4d35
Merge branch 'main' into fallback
phillco Jan 30, 2025
bac36d9
Added link to issue
AndreasArvidsson Jan 30, 2025
bac427f
Merge branch 'fallback' of github.com:cursorless-dev/cursorless into …
AndreasArvidsson Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions data/fixtures/recorded/fallback/takeThis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,4 @@ finalState:
active: {line: 0, character: 0}
fallback:
action: setSelection
modifiers:
- {type: containingTokenIfEmpty}
modifiers: []
8 changes: 5 additions & 3 deletions packages/cursorless-engine/src/core/getCommandFallback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,11 @@ function getModifiersFromTarget(
return target.modifiers;
}

if (target.mark?.type === "cursor") {
return [{ type: "containingTokenIfEmpty" }];
}
// FIXME: Trying to select a word in the file explorer will create weird behavior.
// https://github.com/cursorless-dev/cursorless/issues/2800
// if (target.mark?.type === "cursor") {
// return [{ type: "containingTokenIfEmpty" }];
// }
}
return [];
}
Expand Down
Loading