97159bd
Associate logs from log_err with the calling crate (#13617)
Click to expand commit body
Now, when you selectively enable logs from particular crates with
`RUST_LOG=call,worktree`, logs created via `log_err` calls in those
crates get correctly enabled. Previously, they were all attributed to
the `util` crate, because they used the normal logging macros, which
implicitly insert the current crate name.
This relies on the regularity of our directory naming. Rust's
`track_caller` feature allows you to obtain the file system path of the
caller, but not its rust module path, so I'm inferring the crate name
from the file system path (which I believe is always valid, in our
codebase).
Release Notes:
- N/A
This PR extracts a singular title bar (`title_bar::TitleBar`) from
`ui::TitleBar` and
`collab_ui::collab_titlebar_item::CollabTitlebarItem`.
This is a first step towards organizing title bar things into one place,
and standardizing platform titlebar/window control implementations.
Release Notes:
- N/A
Fixes a typo in the README which (I believe) was accidentally committed
in #13604
Release Notes:
- N/A
Bennet Bo Fenner
created
228202a
Store starts open state of outline panel (#13601)
Click to expand commit body
- Fixed issue where outline panel remains open despite being closed
before window close.
Before the release of Outline Panel feature, everything works fine. But
after that, the outline panel keeps open. It's very annoy that I only
want to edit a simple file. Event I close it before I close the window.
The active state of this panel didn't stored.
### Description:
Before the introduction of the Outline Panel feature, the application
behaved as expected. However, with the addition of the Outline Panel, an
issue arose where the panel would persistently remain open. This
behavior was observed even when manually closing the panel before
closing the application window. The problem stemmed from the inactive
state of the panel not being stored properly. This fix addresses the
issue by ensuring that the panel's active state is correctly stored and
retrieved, thereby improving user experience and preventing unnecessary
persistence of the panel's visibility.
### Screen Records
#### Before Release of Outline Panel
https://github.com/zed-industries/zed/assets/704762/2a222c70-c6d7-4472-9f27-7868d1786a5f
#### After Release of Outline Panel
https://github.com/zed-industries/zed/assets/704762/69c16a5d-beed-4d4a-8341-83c53f6a6713
#### After Fixing This Issue
https://github.com/zed-industries/zed/assets/704762/f51c5df7-54e3-4a62-ac54-b5d12cfe69d1
### Release Notes:
- Persist outline panel open state to avoid opening it on Zed startup
Release Notes:
- Changed the default fonts to IBM Plex Sans and IBM Plex Mono. If you'd
like to go back to using Zed Sans/Zed mono you need to
[download](https://github.com/zed-industries/zed-fonts/releases/tag/1.2.0)
them and install them.
a695322
Fix incorrect point types in scroll calculations (#13600)
Click to expand commit body
fixes https://github.com/zed-industries/zed/issues/13559
Release Notes:
- Fixed incorrect scroll behavior when using different
`scroll_beyond_last_line` settings
([#13559](https://github.com/zed-industries/zed/issues/13559)) (preview
only)
Mikayla Maki
created
cb2d05b
editor: Fix scroll_beyond_last_line off for short files (#13571)
Click to expand commit body
Release Notes:
- Fixed bug with `scroll_beyond_last_line: off` for short files
([#13559](https://github.com/zed-industries/zed/issues/13559)).
Evan Liu
created
45d4de7
Add jq as a dependency for Linux script for Arch Linux (#13569)
Click to expand commit body
## Error
```sh
./script/install-linux
+ [[ 0 -gt 0 ]]
+ export ZED_CHANNEL=dev
+ ZED_CHANNEL=dev
++ pwd
+ export 'ZED_UPDATE_EXPLANATION=You need to fetch and rebuild zed in /home/adityakrcodes/repos/zed'
+ ZED_UPDATE_EXPLANATION='You need to fetch and rebuild zed in /home/adityakrcodes/repos/zed'
+ script/bundle-linux
+ getopts h flag
+ export ZED_BUNDLE=true
+ ZED_BUNDLE=true
+ channel=dev
++ script/get-crate-version zed
script/get-crate-version: line 16: jq: command not found <-- ERROR
+ version=
```
The script fails to install zed on Arch Linux due to a missing
dependency, `jq`.
## My machine info
OS: Arch Linux
Kernel: 6.6.34-1-lts
WM: dwm
Terminal: kitty
CPU: Ryzen 5 5500U with Radeon Graphics
GPU: AMD ATI 04:00.0 Lucienne
Memory: 16 GB
## Error Description
The error occurs when running the script in `script/install-linux`,
which is unable to find the `jq` package, which is not installed by
default on the machine.
## Solution
To resolve this issue, you can install `jq` independently by running
`sudo pacman -S jq`. Alternatively, I have updated script `script/linux`
to include `jq` as a dependency ([link to the
commit](https://github.com/adityakrcodes/zed/commit/2349ad111f48bf8c571e3710bdb317ee151fabdb)),
ensuring it is installed automatically when running the initial script
for system libraries.
Release Notes:
- N/A
Aditya Kumar
created
20c1f82
Improve PageUp/PageDown keybinds for Linux/Mac (#13510)
Click to expand commit body
This makes pageup/pagedown move the cursor too. Fixes: #13389
Co-authored-by: llogick <16590917+llogick@users.noreply.github.com>
Resolves https://github.com/zed-industries/extensions/issues/860 and
https://github.com/zed-industries/zed/issues/10921, also
https://github.com/biomejs/biome-zed/issues/11.
### Problem:
When opening .json files, zed allows comments by default in the JSON
language, which can cause some problems.
For example, language-servers also get "json" as the language, which may
show errors for those comments.
<img width="935" alt="image"
src="https://github.com/zed-industries/zed/assets/10381895/fed3d83d-abc0-44b5-9982-eb249bb04c3b">
### Solution:
This PR adds a JSONC language.
<img width="816" alt="image"
src="https://github.com/zed-industries/zed/assets/10381895/8b40e671-d4f0-4e8d-80cb-82ee7c0ec490">
This allows for more specific configuration for language servers.
Also any json file can be set explicitly to be JSONC using the
file_types setting:
```jsonc
{
"file_types": {
// set all .json files to be seen as JSONC
"JSONC": ["*.json"]
}
}
```
Release Notes:
- N/A
- Action for release notes upload (softprops/action-gh-release) configured with incorrect key.
- Valid keys here: https://github.com/softprops/action-gh-release?tab=readme-ov-file#-customizing
Peter Tripp
created
1260c61
Simplify font feature tag validation (#13548)
Click to expand commit body
Simplifies the logic for the changes of #13542.
Release Notes:
- N/A
Gilles Peiffer
created
89951f7
Add `shift shift` to open command palette (#13556)
Click to expand commit body
I've add `shift shift` as a default keybinding to open command palette,
when using JetBrains keymap, along with the already existing
`cmd-shift-a`. This isn't quite right, as in JetBrains, `cmd-shift-a`
opens the actions modal, which would be our command palette, and `shift
shift` actually opens up a view for searching everything, commands,
actions, settings, etc - we do not have a unified modal for these
things, so I think this is the best thing we can do. Some users might
want to change this to be our file picker, but I think adding it as the
default at least puts it on their radar that they can use this type of
binding; they can change it if they want.
Release Notes:
- Added `shift shift` as a default binding to open the command palette
in the JetBrains keymap.
Release Notes:
- Fixed a panic when editing HTML near the end of a file
- Fixed a panic when editing settings.json from inside the .zed
directory
Conrad Irwin
created
3a08d7a
json: Fix package-version-server referencing the wrong path to the binary (#13555)
Click to expand commit body
We were trying to access the binary at
package-version-server-{VERSION}/package-version-server, whereas the
binary itself is placed at package-version-server-{VERSION}
Release Notes:
- Fixed package.json language server failing to start.
Co-authored-by: Peter Tripp <peter@zed.dev>
Piotr Osiewicz
and
Peter Tripp
created
49dc638
Stop relying on binary location to be in `libexec` on Linux (#13374)
Click to expand commit body
This fixes #13360 by adding fallback directories that are searched by
the CLI if the main executable cannot be found in the `libexec`
directory.
Release Notes:
- Added the fallback directories `lib/zed` and `lib/zed-editor` for the
main executable search in the CLI
([#13360](https://github.com/zed-industries/zed/issues/13360)).
---------
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This inline assistant prompt is one I designed that in my experience
works much better with Claude 3.5 Sonnet than the default prompt.
Mainly because it takes advantage of a weird property of our finetuning
which is that when you use XML tags it knows that it's doing a
machine-read tasks and stops trying to elide things for brevity. The
default prompt will often remove comments and otherwise add elisions for
brevity when doing large rewrites.
It also avoids giving the entire file content twice when the rewrite
region is large relative to the non-rewritten region.
Not necessarily meant to be merged as-is since it may mess up OAI
models. This is mainly meant for your reference. But everyone should be
using 3.5 Sonnet for coding use cases now anyhow 😛
Release Notes:
- N/A
Adds some of the UI components to allow us to visually render settings.
These are UI only and are not functional yet (@maxdeviant will be
working on these when he is back.)
You can see some examples by running `script/storybook setting`.

Release Notes:
- N/A
5d766f6
linux: Fix some panics related to xkb compose (#13529)
Click to expand commit body
Release Notes:
- N/A
Fixed #13463 Fixed crash when the locale was non UTF-8 and fixed the
fallback locale.
Fixed #13010 Fixed crash when `compose.keysym()` was `XKB_KEY_NoSymbol`
I also extracted the `xkb_compose_state` to a single place
The previous implementation that I implemented had two issues:
1. It did not throw an error when the user input some invalid values
such as "panic".
2. The feature tag for OpenType fonts should be a combination of letters
and digits. We only checked if the input was an ASCII character, which
could lead to undefined behavior.
Closes #13517
Release Notes:
- N/A
- Fix Docker Compose obsolete setting
## Remove `version`
Fix the following error:
```
WARN[0000] /docker-compose.yml: `version` is obsolete
```
see also.
https://github.com/compose-spec/compose-spec/blob/master/spec.md#version-top-level-element-obsolete
## Rename: docker-compose.yml -> compose.yml
The preferred file name is now `compose.yml`.
> The default path for a Compose file is compose.yaml (preferred)
ref.
https://docs.docker.com/compose/compose-application-model/#the-compose-file
Release Notes:
- N/A
Toshimaru
created
f00bea5
docs: Fix Decrease buffer font size key binding (#13453)
Add a single-line text input example to gpui
(I'm hoping to be able to debug keyboard issues without rebuilding the
whole
app every time)
Release Notes:
- N/A
Conrad Irwin
created
eb91468
Fix multi-cursor copy/paste on linux (#13523)
Click to expand commit body
The clipboard library we use for X11 doesn't yet support multiple
formats on the clipboard, so for now we just store this in memory for
the current zed process, as we do for Wayland.
Fixes: #11971
Release Notes:
- N/A
---------
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
922fcaf
Add the ability to customize available models for OpenAI-compatible services (#13276)
Click to expand commit body
Closes #11984, closes #11075.
Release Notes:
- Added the ability to customize available models for OpenAI-compatible
services ([#11984](https://github.com/zed-industries/zed/issues/11984))
([#11075](https://github.com/zed-industries/zed/issues/11075)).

ᴀᴍᴛᴏᴀᴇʀ
created
9f88460
Move token count in prompt editor (#13524)
Click to expand commit body
Moves the token count back up to the editor header.
Release Notes:
- N/A
41d2c52
Adjust keybindings for deletion in the project panel (#13326)
Click to expand commit body
- Improve compatibility keybindings (Atom, JetBrains, TextMate)
- Revert MacOS cmd+backspace regression. Should trash without prompting (like MacOS)
Co-authored-by: Peter Tripp <peter@zed.dev>
Mikayla Maki
and
Peter Tripp
created
d1a55d6
Change `window_min_size` from `Size<Pixels>` to `Option<Size<Pixels>>` (#13501)
Click to expand commit body
Now we can set `window_min_size` to `None` instead of `Size::default()`.
I think this makes more sense.
Release Notes:
- N/A
张小白
created
db06244
typescript: Pass `hostInfo` to `tsserver` (#12055)
Click to expand commit body
- Added `hostInfo` property to zed's typescript plugin. This can be
useful for telemetry (for e.g. identifying the usage of editors based on
typescript usage) when building typescript plugins.
- VSCode / IntelliJ based editors already set this property
([see](https://github.com/microsoft/vscode/blob/aa31bfc9fd1746626b3efe86f41b9c172d5f4d23/extensions/typescript-language-features/src/typescriptServiceClient.ts#L574))
The config option as available —
https://github.com/typescript-language-server/typescript-language-server/blob/master/docs/configuration.md#initializationoptions
Release Notes:
- N/A
Fixes a bug introduced by
https://github.com/zed-industries/zed/pull/13479 where dot files might
not be processed in the correct order.
Release Notes:
- N/A
It is sometimes desirable to allow modifers to serve as keys themselves
for the purposes of keybinds. For example, the popular keybind in
jetbrains IDEs `shift shift` which opens the file finder.
This change treats modifers in the keymaps as keys themselves if they
are not accompanied by a key they are modifying.
Further this change wires up they key dispatcher to treat modifer change
events as key presses which are considered for matching against
keybinds.
Release Notes:
- Fixes #6460
---------
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Dov Alperin
and
Conrad Irwin
created
7e694d1
Fix an issue where provider settings were lost when switching between Ollama models (#13402)
Click to expand commit body
Closes #13399.
Release Notes:
- Fixed an issue where provider settings were lost when switching
between Ollama models
([#13399](https://github.com/zed-industries/zed/issues/13399)).
TODO:
- [x] Moving the cursor out of the title editor should unselect any
selected text
Release Notes:
- N/A
---------
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Richard <richard@zed.dev>
Nate Butler
,
Antonio Scandurra
, and
Richard
created