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.

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

fix: nested conflict detection exception when performing cross-level searches #769

Merged
merged 1 commit into from
Mar 4, 2024

Conversation

sxyazi
Copy link
Owner

@sxyazi sxyazi commented Mar 3, 2024

Fixes #768

@sxyazi sxyazi merged commit b4c9ec1 into main Mar 4, 2024
5 checks passed
@sxyazi sxyazi deleted the pr-c195b66a branch March 4, 2024 03:27
asim215 pushed a commit to asim215/yazi that referenced this pull request Mar 5, 2024
asim215 added a commit to asim215/yazi that referenced this pull request Mar 5, 2024
* ci: add cachix workflow (sxyazi#740)

* feat: add hovered as `$0` for shell and opener (sxyazi#738)

* feat: flavor (sxyazi#753)

* feat: add a new `[notify]` section to the `theme.toml` to configure the `notify` component's style (sxyazi#749)

* feat: switch to inline images protocol for VSCode, Tabby, and Hyper

* feat: add `prepend_rules` and `append_rules` for `[open]` in `yazi.toml` (sxyazi#754)

* feat: support `YAZI_FILE_ONE` environment variable for `file(1)` path (sxyazi#752)

* feat: allow both '/' and '\' in folder creation (sxyazi#751)

* perf: apply `add_many()`/`remove_many()` to the visual mode items for selection conflict detecting (sxyazi#758)

* feat: support `%0` as the hovered file for Windows (sxyazi#761)

* feat: `ya.input()` plugin API (sxyazi#762)

* fix: remove redundant check to allow operations on the `shell` command with an empty file list

* feat: add musl linux build targets (sxyazi#759)

* fix: nested conflict detection exception when performing cross-level searches (sxyazi#769)

* refactor: add new `run` property (sxyazi#773)

* feat: add `Ctrl-[` as an escape key (sxyazi#763)

* feat: add `parse` method to `Line` element

* feat: `ya.notify()` plugin API (sxyazi#780)

---------

Co-authored-by: musjj <[email protected]>
Co-authored-by: rrveex <[email protected]>
Co-authored-by: sxyazi <[email protected]>
Co-authored-by: little camel <[email protected]>
Co-authored-by: Filipe Paniguel <[email protected]>
Co-authored-by: Nguyễn Đức Toàn <[email protected]>
Co-authored-by: Konrad Baran <[email protected]>
Co-authored-by: hankertrix <[email protected]>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Crash when executing "select_all --state=false" while in search, with files selected.
1 participant