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

[pull] main from zed-industries:main #24

Merged
merged 14 commits into from
Feb 4, 2025
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Feb 4, 2025

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 : )

osiewicz and others added 14 commits February 4, 2025 01:34
Closes #ISSUE

Release Notes:

- N/A
…tead of all panes (#24018)

According to vim `ctrl-w ctrl-q` should close the active tab or pane
similar to :q


![Screenshot_20250131_163139](https://github.com/user-attachments/assets/c6a0d3a0-8dcf-4152-b2bf-835472d4f870)

Release Notes:

- vim: fix `ctrl-w ctrl-q` to close active pane instead of all panes
Closes #22562

Release Notes:

- vim: Load vim keymap after a user-configured keymap
Closes #ISSUE

Release Notes:

- vim: Add `ctrl-w a` to close all items in the current pane
… matches to improve bash auto-indent behavior (#24160)

- Fixes auto-indent issues around `elif` caused by auto-indent being prevented due to syntax errors generated before `elif` clause completed

Release Notes:

- Fixed an issue where inserting an elif before an else in bash would
not properly auto-indent

---------

Co-authored-by: Conrad Irwin <[email protected]>
… the end of the line (#24163)

Co-authored-by: Conrad Irwin <[email protected]>

Closes #24124

Release Notes:

- Fixed an issue in vim mode where changing the case of an object at the
end of the line would not change the case of the last character in the
object

Co-authored-by: Conrad Irwin <[email protected]>
Release Notes:

- N/A
We think this could fix issues around view invalidation during focus
handling.

I want to run CI on this and see.

cc @mikayla-maki @maxbrunsfeld 

Release Notes:

- N/A
Release Notes:

- Fix display, revert and undo of deleted hunks when the file is empty.
…24170)

+ add docs and simplify logic around popover order

Release Notes:

- N/A
We now treat new files that have no content as not-dirty. This fixes the
git diff view when deleted files are present.

It also fixes a long-standing bug where `zed RAEDME` and then closing
the tab would prompt for "unsaved changes" when there were none.

Release Notes:

- Fixed a bug where closing an empty, named, file would warn about
unsaved content.
Regressions in #24024:

* `+` was no longer included between modifiers and key
* Multi-character keys like "control" were displayed all lowercase,
whereas before they were all uppercase like "CONTROL". Now they are
capitalized, so "Control".
* Brings back icon for tab key.

Release Notes:

- N/A
Release Notes:

- N/A

---------

Co-authored-by: Danilo <[email protected]>
Co-authored-by: Danilo Leal <[email protected]>
Co-authored-by: João Marcos <[email protected]>
@pull pull bot added the ⤵️ pull label Feb 4, 2025
@pull pull bot merged commit 93f8cca into Zezo-Ai:main Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants