[pull] main from zed-industries:main #35
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Refining writing in the status bar menu docs aside. Release Notes: - N/A --------- Co-authored-by: Nathan Sobo <[email protected]>
- **fix ignoring ignored files when matching icons** - **remove poorly named and confusing method `PathExt.icon_stem_or_suffix` and refactor `PathExt.extension_or_hidden_file_name` to actually do what it says it does** Closes #24314 Release Notes: - Fixed an issue where hidden files would have the default icon instead of the correct one - Fixed an issue where files with specific icons (such as `eslint.config.js`) would not have the their specific icon without a leading `.` (`.eslint.config.js`)
- Implements scaling for `ui::Keybinding` and it's component parts - Adds the `ui::KeybindingHint` component for creating keybinding hints easily:  Release Notes: - N/A
This PR fixes the errors when running `cargo test` in the `image_viewer` crate. Release Notes: - N/A
Follow-up to #24391 The current approach has two issues: - For the described case of `eslint.config.js`, for which a mapping exists in `suffixes`, this would get mapped from `eslint.config.js` to `eslint`. However, for `eslint`, there is no mapping within `suffixes`, thus currently `get_icon_from_suffix` would return `None` and a wrong item would be returned at a later step. - Paths passed to this method are relative to the worktree root, thus e.g. `eslint.config.js` files in subdirectories would still be assigned the wrong icon. --- Behaviour on `main`: <img width="281" alt="main" src="https://github.com/user-attachments/assets/19b5e5f8-e413-4ac9-a0a1-2c72f810aa86" /> Behaviour with this change: <img width="299" alt="pr" src="https://github.com/user-attachments/assets/eec70cbd-df39-49b4-8b07-d22afa949781" /> CC @probably-neb Release Notes: - N/A
This is a refactoring PR that does three things: - First, it introduces a new `diff` crate that holds the previous contents of the `git::diff` module, plus the `BufferChangeSet` type formerly of `project::buffer_store`. The new crate is necessary since simply moving `BufferChangeSet` into `git::diff` results in a dependency cycle due to the use of `language::Buffer` to represent the diff base in `BufferChangeSet`. - Second, it renames the two main types in the new diff crate: `BufferDiff` becomes `BufferDiffSnapshot`, and `BufferChangeSet` becomes `BufferDiff`. This reflects that the relationship between these two types (immutable cheaply-cloneable "value" type + stateful "resource type" with subscriptions) mirrors existing pairs like `Buffer`/`BufferSnapshot`. References to "change sets" throughout the codebase are updated to refer to "diffs" instead. - Finally, it moves the base_text field of the new BufferDiff type to BufferDiffSnapshot. Release Notes: - N/A --------- Co-authored-by: maxbrunsfeld <[email protected]>
Closes #24270 Release Notes: - Fixed an issue where doing line-wise operations in vim mode on the last line of a file with no trailing newline would not work properly
- Fixed a regex for finding tags. - Templatize the instructions with `$LANGNAME` to prevent manual errors from failing to edit commands (this bit me) - Ran formatting through Prettier
…tion hunks (#24413) Release Notes: - Fixed deletion diff hunks not being syntax highlighted in some cases Co-authored-by: Max <[email protected]>
Release Notes: - N/A Co-authored-by: maxbrunsfeld <[email protected]>
Appears this test was failing, and someone edited the expected test output instead of fixing it. Well no longer! Release Notes: - N/A Co-authored-by: Conrad <[email protected]>
Closes #21281 @jansol, kindly take a look when you're free.  Release Notes: - Added dimensions and file size information for images. --------- Co-authored-by: tims <[email protected]> Co-authored-by: Marshall Bowers <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )