mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-31 21:36:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
5874 commits 779 branches 798 tags 297 MiB
Commit graph

5874 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mikayla Maki
a279f83cd6 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
efd3247ce4 Added modifiers to scroll wheel eevent 2022-08-19 12:10:12 -07:00
Mikayla Maki
a806634b82 Handlers attached, things are looking good 2 go 2022-08-19 11:41:17 -07:00
Mikayla Maki
04600d73fc Moved back to the drag handler, selections work again 2022-08-19 09:50:26 -07:00
Max Brunsfeld
6e67448420 0.52.0 2022-08-19 09:20:26 -07:00
Max Brunsfeld
d15ba8efb4 Revert "Merge pull request #1481 from zed-industries/trigger-search-automatically" 
This reverts commit ae8dd1e3fd, reversing
changes made to 96d5dcadf1.
 2022-08-19 09:17:43 -07:00
Mikayla Maki
cb0bd340b9
Merge branch 'main' into terminal-mouse 2022-08-18 17:41:19 -07:00
Mikayla Maki
37ca7a6658 Half way done with mouse reporting 2022-08-18 17:37:24 -07:00
Julia
1f7db46d98
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
ForLoveOfCats
8583320e9b 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
b8b951deab 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
ForLoveOfCats
b61e9a940e 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
a0d0c84eee Begin mouse mode 2022-08-18 13:28:55 -07:00
Mikayla Maki
0fef72ac5f
Merge pull request #1524 from zed-industries/ime-finalize 
IME Changes: Tracking PR
 2022-08-18 13:27:30 -07:00
Mikayla Maki
2c4ea7f01d Remove todo 2022-08-18 13:24:00 -07:00
Mikayla Maki
aa98e5c3f7 Fixed scrolling on text input 2022-08-18 13:22:48 -07:00
Mikayla Maki
d545e59b49 Finished IME for now 2022-08-18 12:57:19 -07:00
Mikayla Maki
6652d41864 Fixed cursor blinking, added other cursor shape rendering 2022-08-18 11:28:18 -07:00
Antonio Scandurra
6ffaa0394a
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
06f9516d31 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
acce0042f9 Fixed blink problems 2022-08-17 14:41:28 -07:00
Nathan Sobo
d3904cd961 v0.51.1 2022-08-17 09:47:19 -06:00
Nathan Sobo
062105edb9
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 Sobo
443432606e 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
b60277cad6 v0.51.0 2022-08-17 12:10:32 +02:00
Antonio Scandurra
b53eacc1fa
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
9c9bf07e40 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
75c9b90c76 Add failing unit test for buffer opening cancellation 2022-08-17 11:55:34 +02:00
Antonio Scandurra
eddab33b16
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
9726d1f049 Bump protocol version 2022-08-17 11:31:48 +02:00
Antonio Scandurra
ab236a6008 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
da805b3d13
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
5ad746e53f Added alt screen mode check 2022-08-16 23:10:49 -07:00
Mikayla Maki
bf7b3150e4 Added show character palette. Need to position correctly. 2022-08-16 23:10:05 -07:00
Mikayla Maki
1f82c0c8bf Repeat key problems fixed. 2022-08-16 23:00:09 -07:00
Mikayla Maki
2f2e5506ce Merged main into ime-finalize 2022-08-16 22:57:07 -07:00
Mikayla Maki
c612dc8a31
Merge pull request #1527 from zed-industries/ime-fix 
Fix panic on main
 2022-08-16 22:47:02 -07:00
Mikayla Maki
aa75fbe56c Fix panic on main 2022-08-16 22:36:24 -07:00
Mikayla Maki
94ba282e76 Checkpoint, alt-n l is very broken. Bisecting. 2022-08-16 22:12:06 -07:00
Max Brunsfeld
e4eead6477 Fix crash when attempting to show file prompt while using Japanese keyboard layout 2022-08-16 17:44:58 -07:00
Max Brunsfeld
3f50d15f7c
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
18dc12218f Begin work on IME changes 2022-08-16 13:01:35 -07:00
Max Brunsfeld
ea09ef2c1a remove http-auth-basic dependency 2022-08-16 12:58:53 -07:00
Mikayla Maki
73cd6b51d8
Merge pull request #1520 from zed-industries/terminal-blink 
Terminal cursor blinking
 2022-08-15 18:39:23 -07:00
Mikayla Maki
b9c73127b4 Added a hollow mode to the cursor rendering code, for terminal lost focus 2022-08-15 18:27:26 -07:00
Mikayla Maki
bba51c3ae6 Added cursor blink and settings 2022-08-15 18:05:07 -07:00
Max Brunsfeld
1f00f6c163
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
754a130e59 Clear go-to-def link when deactivating the window 2022-08-15 17:30:41 -07:00
Mikayla Maki
7b3a7727c6 Basic cursor blinking :) 2022-08-15 17:00:44 -07:00
Max Brunsfeld
7de8228efd Clear stale go-to-def link when resizing buffer font 2022-08-15 16:15:20 -07:00