Commit Graph
25009 Commits
Author SHA1 Message Date
Antonio Scandurra 22780fd775 Fix editor tests 2024-01-12 14:50:42 +01:00
Antonio Scandurra 51a54b8d38 Merge remote-tracking branch 'origin/main' into cache
# Conflicts:
#	crates/gpui/src/window.rs
2024-01-12 14:31:13 +01:00
Kirill Bulatov a230936dca Use auto formatter settings for Zed repo (#4033)
Some users might have a language server formatter set in their settings,
which is exclusive with prettier formatting. That causes disruptions in
the way whitespaces and other things are formatted, esp. in json and
yaml files, hence enforce one formatter settings for the entire Zed
repo.

Release Notes:

- N/A
2024-01-12 12:07:41 +02:00
Kirill Bulatov 70c5e604f2 Use auto formatter settings for Zed repo.
Some users might have a language server formatter set in their settings, which is exclusive with prettier formatting.
That causes disruptions in the way whitespaces and other things are formatted, esp. in json and yaml files, hence enforce one formatter settings for the entire Zed repo.
2024-01-12 12:00:18 +02:00
Conrad Irwin bbdf778e57 One of these days... 2024-01-11 21:22:00 -07:00
Conrad Irwin 72deba5579 try again 2024-01-11 20:43:49 -07:00
Conrad Irwin 476a3f5625 Try the manual approach... 2024-01-11 20:40:34 -07:00
Conrad Irwin c9022be1c4 Try sqwauk 2024-01-11 20:23:53 -07:00
Max Brunsfeld c03fbf38f2 Don't pass zed-local flags through to zed 2024-01-11 16:51:40 -08:00
Max Brunsfeld 0ece618ee3 Fix failure to write to keychain when signing in or failing to sign in (#4031)
Release Notes:

- Fixed an error where Zed would not save credentials to the keychain
after signing in.
2024-01-11 16:31:28 -08:00
Max Brunsfeld 2e428719d4 Fix failure to write to keychain because of dropping a future 2024-01-11 16:22:34 -08:00
Max Brunsfeld a0b6013ee3 Suppress unused field warning 2024-01-11 16:21:55 -08:00
Max Brunsfeld bc36a94874 Temporarily avoid releasing livekit RemoteAudioTracks on drop (#4030)
This release call was added during the conversion to gpui2. I think it
is probably valid, but want to remove it on the off chance that it is
causing the crash that we're seeing in the `livekit.multicast` thread
when leaving a room.

Most likely, this is not going to fix anything, and is just introducing
a small memory leak, but it is a step back to how the app worked with
gpui 1.
2024-01-11 15:53:01 -08:00
Max Brunsfeld afc5019003 Temporarily avoid releasing livekit RemoteAudioTracks on drop
This release call was added during the conversion to gpui2. I think
it is probably valid, but want to remove it on the off chance that
it is causing the crash that we're seeing in the `livekit.multicast`
thread when leaving a room.
2024-01-11 15:46:21 -08:00
Piotr Osiewicz a4e64c665c settings.json: Suggest font names for buffer_font_family 2024-01-11 23:23:10 +01:00
Piotr Osiewicz 1a3c8f5280 gpui: Validate font contents at load time.
During layout of EditorElement we use 'm' character from current font to calculate sizes, panicking with fonts that do not have that character (e.g. Arabic fonts). It's not really EditorElement's fault, as it assumes that the font it's dealing with is gonna have that character available.
To prevent a crash, I added validation while loading a family that a given font contains the glyphs we're gonna use down the line.
2024-01-11 23:23:10 +01:00
Max Brunsfeld 1b0d6c771e Fix routing of leader updates from unshared projects (#4028)
Previously, leader updates in unshared projects would be sent to all
followers regardless of project, as if they were not scoped to any
project.

- Fixes a crash that could sometimes happen when following someone if
they were focused on an unshared project.
2024-01-11 14:10:54 -08:00
Max Brunsfeld cd29d1f9d4 Fix routing of leader updates from unshared projects
Previously, leader updates in unshared projects would be sent to
all followers regardless of project, as if they were not scoped
to any project.
2024-01-11 13:47:31 -08:00
Conrad Irwin 4c9ab32b16 Don't hold platform lock while calling user callbacks (#4027)
Inspired by a bug where using Edit -> Copy from the menu created a
deadlock.

Release Notes:

- Fix a deadlock when copying from Edit -> Copy
2024-01-11 14:26:34 -07:00
Conrad Irwin 99c4966448 Don't hold platform lock while calling user callbacks
Inspired by a bug where using Edit -> Copy from the menu created a
deadlock.
2024-01-11 13:52:50 -07:00
Max Brunsfeld 52108ed242 Avoid bright green separators when displaying untitled buffers in multi-buffers (#4024)
Release notes:

- Fixed unstyled excerpt separators when showing untitled buffers in
multi-buffers.
2024-01-11 12:19:55 -08:00
Mikayla cf672f9736 Add migration information to release docs and fix scripts 2024-01-11 11:24:17 -08:00
Mikayla c6fb33bd5a collab 0.36.1 2024-01-11 11:00:42 -08:00
Mikayla Maki cbffc6e05d Whoops (#4011)
Fixes a spelling mistake I made in the database schema 😬

Release Notes:

- n/a
2024-01-11 10:57:08 -08:00
Conrad Irwin 062d1ca848 Fix multi-key shortcuts (#4025)
An old fix was ported over from gpui1, and the two fixes could not exist
side-by-side. Delete this code and let the keymap handle it

Release Notes:

- (Added|Fixed|Improved) ...
([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
2024-01-11 11:36:51 -07:00
Mikayla a8b4a136a2 Switch to non-destructive migration 2024-01-11 10:33:33 -08:00
Conrad Irwin 910fcfb01c Stop following when project is unshared (#4010)
Before this change the views would continue to update in the background
of the "disconnected" dialogue, which was disconcerting.

[[PR Description]]

Release Notes:

- Fixed an edge-case where following didn't handle unshare correctly
2024-01-11 11:26:56 -07:00
Conrad Irwin be2751e88e Guard against infinite loop in focus handling (#4023)
Release Notes:

- Fix an infinite loop in focus handling
2024-01-11 11:26:37 -07:00
Conrad Irwin 7430f7f329 Fix multi-key shortcuts
An old fix was ported over from gpui1, and the two fixes could not exist
side-by-side. Delete this code and let the keymap handle it
2024-01-11 11:24:55 -07:00
Max Brunsfeld f13b061411 Avoid bright green separators when displaying untitled buffers in multi-buffers 2024-01-11 09:55:16 -08:00
fed04d04c8 gpui: Make TextSystem::line_wrapper non-fallible. (#4022)
Editors WrapMap could become desynchronised if user had an invalid font
specified in their config. Compared to Zed1, WrapMap ignored the
resolution failure instead of panicking. Now, if there's an invalid font
in the user config, we just fall back to an arbitrary default.


Release Notes:
- Fixed the editor panic in presence of invalid font name in the config
(fixes https://github.com/zed-industries/community/issues/2397)

---------

Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
2024-01-11 18:52:00 +01:00
Piotr Osiewicz 426fd176b8 Add test for new DeploySearch behaviour 2024-01-11 18:39:28 +01:00
Piotr Osiewicz 97251f0ef8 project search: Do not open a new existing item in the current pane for DeploySearch
Fixes https://github.com/zed-industries/community/issues/2395 using the first approach suggested in the original post (focus the existing search without bringing it over to a pane).
2024-01-11 18:39:28 +01:00
Conrad Irwin 049e2b23ee Guard against infinite loop in focus handling 2024-01-11 10:38:08 -07:00
Joseph T. Lyons b6f58f07e6 Return a single Option from EventCoalescer 2024-01-11 12:27:59 -05:00
Antonio Scandurra edffb1c720 Move back to sorting entries in the depth map as we insert them 2024-01-11 18:24:07 +01:00
Joseph T. Lyons e408817056 Fix bug with improperly reported environment (#4020)
When logging the edit environment, we were logging the newest
environment being sent into the EventCoalescer on the latest activity
log, when we should've been logging the environment that was associated
with the ended period within the EventCoalescer.

Release Notes:

- N/A
2024-01-11 12:07:48 -05:00
Julia 20f9fe8014 Stop following on escape key press (#4021)
Release Notes:

- Added a default keyboard shortcut to stop following by pressing the
escape key.
2024-01-11 11:39:47 -05:00
Joseph T. Lyons 9d094249c4 Only return environment when period ends 2024-01-11 11:30:22 -05:00
Julia d5c5c61a69 Stop following on escape key press 2024-01-11 11:25:35 -05:00
Joseph T. Lyons 4a26e632f6 Fix bug with improperly reported environment
When logging the edit environment, we were logging the newest environment being sent into the EventCoalescer on the latest activity log, when we should've been logging the environment that was associated with the ended period within the EventCoalescer.
2024-01-11 11:24:55 -05:00
Antonio Scandurra a0bc7b4f2a 💄 2024-01-11 16:59:33 +01:00
Kirill Bulatov c12d3cfe32 Show abs path matches in file finder (#4018)
Deals with https://github.com/zed-industries/community/issues/2158

Release Notes:

- Make File finder to show matching file for the abs path queries
2024-01-11 17:57:31 +02:00
Antonio Scandurra ec0cd0bcc2 Reuse line layouts when reusing view 2024-01-11 16:57:06 +01:00
Kirill Bulatov d084c55f85 Fix invisible symbol colors in the editor, use zed1 one (#4017)
Release Notes:

- Improved the contrast between invisibles colors and the rest of the
text in the editor
2024-01-11 17:53:23 +02:00
Kirill Bulatov 08c9f2f621 Show abs path matches in file finder 2024-01-11 17:49:46 +02:00
Kirill BulatovandMarshall Bowers 9b1583509e Fix whitespace symbol colors in the editor, use zed1 one
co-authored-by: Marshall Bowers <marshall@zed.dev>
2024-01-11 17:43:49 +02:00
Kirill Bulatov 4bb466bbe5 Restore hover action in the editor (#4016)
Deals with https://github.com/zed-industries/community/issues/2304
Deals with https://github.com/zed-industries/community/issues/2394

Release Notes:

- Fixed `editor::Hover` action (and `g h` command in Vim mode) not
working
2024-01-11 16:28:10 +02:00
Kirill Bulatov f00655a3d8 Restore hover action in the editor 2024-01-11 16:19:44 +02:00
Antonio Scandurra f18354c6fe Reuse cursor style when reusing a view tree 2024-01-11 15:03:34 +01:00