Commit Graph
39175 Commits
Author SHA1 Message Date
Mikayla Maki 001a8931fa Merge branch 'terminal-mouse' of github.com:zed-industries/zed into terminal-mouse 2022-08-19 13:04:34 -07:00
Mikayla Maki d1e9c7cbcb Finished majority of mouse work. Need to add a setting and change up mouse handlers, and it'll be done. 2022-08-19 13:03:29 -07:00
Mikayla Maki b174efaf44 Added modifiers to scroll wheel eevent 2022-08-19 12:10:12 -07:00
Mikayla Maki abcab561dc Handlers attached, things are looking good 2 go 2022-08-19 11:41:17 -07:00
Mikayla Maki f3a0d2b1e3 Moved back to the drag handler, selections work again 2022-08-19 09:50:26 -07:00
Max Brunsfeld 5dfeb47204 0.52.0 2022-08-19 09:20:26 -07:00
Max Brunsfeld fa0667d6cf Revert "Merge pull request #1481 from zed-industries/trigger-search-automatically"
This reverts commit 3d0bfff0e9, reversing
changes made to 4338f0571c.
2022-08-19 09:17:43 -07:00
Mikayla Maki 4f5e96eee9 Merge branch 'main' into terminal-mouse 2022-08-18 17:41:19 -07:00
Mikayla Maki b672071b30 Half way done with mouse reporting 2022-08-18 17:37:24 -07:00
Julia ec787357a1 Merge pull request #1537 from zed-industries/fix-goto-links-with-selections
Fix goto links with selections
2022-08-18 18:49:21 -04:00
ForLoveOfCatsandMax Brunsfeld ca94553ba1 Add test for pending selection influence on go-to links
Co-authored-by: Max Brunsfeld <max@zed.dev>
2022-08-18 18:34:01 -04:00
ForLoveOfCats 5bcebd6630 Clear last-mouse-moved pressed button when that button gets a mouse-up
This fixes an annoying issue where if the last mouse moved event was
during a drag it would never trigger mouse cursor changes until next
mouse move reset it. It makes sense to continue to not change the cursor
while the button is pressed so instead this tracks when the mouse button
is released in order to update the mouse move event
2022-08-18 18:34:01 -04:00
ForLoveOfCatsandAntonio Scandurra 6a14b75286 Avoid triggering goto-definition links while with a pending selection
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-08-18 18:34:01 -04:00
Mikayla Maki 847da317c0 Begin mouse mode 2022-08-18 13:28:55 -07:00
Mikayla Maki 603888d78c Merge pull request #1524 from zed-industries/ime-finalize
IME Changes: Tracking PR
2022-08-18 13:27:30 -07:00
Mikayla Maki d70cbbf3e6 Remove todo 2022-08-18 13:24:00 -07:00
Mikayla Maki e267f86088 Fixed scrolling on text input 2022-08-18 13:22:48 -07:00
Mikayla Maki 7e6729b082 Finished IME for now 2022-08-18 12:57:19 -07:00
Mikayla Maki 057018efbb Fixed cursor blinking, added other cursor shape rendering 2022-08-18 11:28:18 -07:00
Antonio Scandurra 0b3e8c4d4e Merge pull request #1534 from zed-industries/fix-crash-on-window-close
Fix crash when closing a window while in full-screen mode
2022-08-18 15:58:49 +02:00
Antonio Scandurra 42cd80fe24 Fix crash when closing a window while in full-screen mode
This commit delays closing the native window to the next tick to
avoid borrowing either `WindowState` or `MutableAppContext` twice.
2022-08-18 14:59:17 +02:00
Mikayla Maki 7bd3643fa3 Fixed blink problems 2022-08-17 14:41:28 -07:00
Nathan Sobo eaf4f65157 v0.51.1 2022-08-17 09:47:19 -06:00
Nathan Sobo f6ab9eaa84 Merge pull request #1532 from zed-industries/fix-adding-contacts
Fix focus regression in contact finder
2022-08-17 09:43:04 -06:00
Nathan SoboandAntonio Scandurra e5c2196cd9 Fix focus regression in contact finder
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-08-17 09:33:48 -06:00
Antonio Scandurra 3a30578d20 v0.51.0 2022-08-17 12:10:32 +02:00
Antonio Scandurra 745ef89d4a Merge pull request #1530 from zed-industries/robust-buffer-relaying
Create buffers for remote collaborators out of band
2022-08-17 12:04:18 +02:00
Antonio Scandurra 2e7bfd19c1 Create buffers for remote collaborators out of band
Previously, we would use `Project::serialize_buffer_for_peer` and
`Project::deserialize_buffer` respectively in the host and in the
guest to create a new buffer or just send its ID if the host thought
the buffer had already been sent.

These methods would be called as part of other methods, such as
`Project::open_buffer_by_id` or `Project::open_buffer_for_symbol`.
However, if any of the tasks driving the futures that eventually
called `Project::deserialize_buffer` were dropped after the host
responded with the buffer state but (crucially) before the guest
deserialized it and registered it, there could be a situation where
the host thought the guest had the buffer (thus sending them just the
buffer id) and the guest would wait indefinitely.

Given how crucial this interaction is, this commit switches to creating
remote buffers for peers out of band. The host will push buffers to guests,
who will always refer to buffers via IDs and wait for the host to send them,
as opposed to including the buffer's payload as part of some other operation.
2022-08-17 11:55:36 +02:00
Antonio Scandurra 6616171c6c Add failing unit test for buffer opening cancellation 2022-08-17 11:55:34 +02:00
Antonio Scandurra 5579ec7032 Merge pull request #1529 from zed-industries/undo-divergence
Fix divergence bug in undo/redo
2022-08-17 11:38:50 +02:00
Antonio Scandurra 5f5af7fa29 Bump protocol version 2022-08-17 11:31:48 +02:00
Antonio Scandurra d5a38f0bb1 Fix divergence bug in undo/redo
As part of #1405, we changed the way we performed undo and redo to
support combining transactions that were not temporally adjacent for
IME purposes.

We introduced a bug with that release that caused divergence
when performing undo: the bug was caused by only changing the visibility
of fragments whose insertion id was contained in the undo operation. However,
an undo operation also affects deletions which we were mistakenly not
considering. Randomized tests caught this but I guess we didn't run enough
of them.
2022-08-17 11:30:04 +02:00
Antonio Scandurra f90e604e43 Merge pull request #1526 from zed-industries/crash-on-file-prompt-with-japanese-keyboard-layout
Fix crash when attempting to show file prompt while using Japanese keyboard layout
2022-08-17 09:56:09 +02:00
Mikayla Maki 072011e0fa Added alt screen mode check 2022-08-16 23:10:49 -07:00
Mikayla Maki ea521e7936 Added show character palette. Need to position correctly. 2022-08-16 23:10:05 -07:00
Mikayla Maki 2c6c16a318 Repeat key problems fixed. 2022-08-16 23:00:09 -07:00
Mikayla Maki a2f5a753ee Merged main into ime-finalize 2022-08-16 22:57:07 -07:00
Mikayla Maki f2983ee2d2 Merge pull request #1527 from zed-industries/ime-fix
Fix panic on main
2022-08-16 22:47:02 -07:00
Mikayla Maki 4e8b628cb5 Fix panic on main 2022-08-16 22:36:24 -07:00
Mikayla Maki 0fa102661e Checkpoint, alt-n l is very broken. Bisecting. 2022-08-16 22:12:06 -07:00
Max Brunsfeld 9d24854df1 Fix crash when attempting to show file prompt while using Japanese keyboard layout 2022-08-16 17:44:58 -07:00
Max Brunsfeld 0dc796e7f9 Merge pull request #1523 from zed-industries/remove-gpl-dep
Remove unused http-auth-basic dependency
2022-08-16 13:02:17 -07:00
Mikayla Maki 8342dc0e32 Begin work on IME changes 2022-08-16 13:01:35 -07:00
Max Brunsfeld ed08f17dc6 remove http-auth-basic dependency 2022-08-16 12:58:53 -07:00
Mikayla Maki 98faaeb87f Merge pull request #1520 from zed-industries/terminal-blink
Terminal cursor blinking
2022-08-15 18:39:23 -07:00
Mikayla Maki b8f120b451 Added a hollow mode to the cursor rendering code, for terminal lost focus 2022-08-15 18:27:26 -07:00
Mikayla Maki 42b91c9dfa Added cursor blink and settings 2022-08-15 18:05:07 -07:00
Max Brunsfeld b54f8045b1 Merge pull request #1519 from zed-industries/go-to-def-link-font-size-change
Clear any stale go-to-definition link when resizing the buffer font
2022-08-15 17:40:00 -07:00
Max Brunsfeld 2b7509a3ca Clear go-to-def link when deactivating the window 2022-08-15 17:30:41 -07:00
Mikayla Maki c8897c74f7 Basic cursor blinking :) 2022-08-15 17:00:44 -07:00