mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-27 16:57:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
6334 commits 697 branches 747 tags 280 MiB
Commit graph

6334 commits

This branch
This branch
All branches
Author SHA1 Message Date
K Simmons
54cf6fa838 Pull blink functionality out of editor and into blink manager. Make blink manager subscribe to settings changes in order to start blinking properly when it is re-enabled. 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-17 16:20:51 -07:00
K Simmons
09a0b3eb55 increment protocol version 2022-10-17 16:20:51 -07:00
K Simmons
40c3e925ad Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Mikayla Maki
318b923bac
Merge pull request #1765 from zed-industries/fix-terminal-hyperlinks 
Open hyperlinks on up, not down, and disable them when dragging.
 2022-10-17 15:41:40 -07:00
Julia
2149c17a0a
Merge pull request #1768 from zed-industries/git-gutter-meets-code-folding 
Git gutter meets code folding (and word wrap fixes)
 2022-10-17 14:51:47 -04:00
Julia
1716aff969 Cleanup 2022-10-17 14:41:16 -04:00
Julia
2a5d7ea2de Inclusively check for hunk in fold range 2022-10-17 13:11:11 -04:00
Julia
be34c50c72 Deduplicate identical hunk layouts 2022-10-17 12:41:20 -04:00
Julia
50ae3e03f7 More concrete usage of display map to handle diff hunk gutter layout 2022-10-17 12:28:44 -04:00
Antonio Scandurra
b6bb2985f5
Merge pull request #1767 from zed-industries/notify-on-auto-update 
Notify `ActivityIndicator` when `AutoUpdater` changes
 2022-10-17 09:10:57 +01:00
Antonio Scandurra
6bdbab2faf Notify ActivityIndicator when AutoUpdater changes 
This fixes a bug that caused the status bar to not update when the
auto-update system changed its status.
 2022-10-17 10:05:38 +02:00
Mikayla Maki
f1ff557a25 Rearranged mouse handling 2022-10-16 17:31:19 -07:00
Joseph T. Lyons
23d7143298
Merge pull request #1666 from zed-industries/settings-for-journal 
Settings for journal
 2022-10-16 19:55:27 -04:00
Joseph T Lyons
0717c168d9 Derive Serialize on HourFormat 2022-10-16 12:51:48 -04:00
Joseph T Lyons
6d020a3ee9 Do not derive Default on JournalSettings 2022-10-16 12:51:34 -04:00
Joseph T Lyons
9a381c1803 Merge branch 'main' into settings-for-journal 2022-10-16 12:42:18 -04:00
Nathan Sobo
3e23d1f48d
Merge pull request #1762 from zed-industries/less-click-and-hover-invalidation 
Reduce unnecessary view invalidations related to mouse events
 2022-10-16 10:23:54 -06:00
Nathan Sobo
1750fcf833
Merge pull request #1761 from zed-industries/mouse-region-view-invalidation 
Remove unconditional invalidation when calling mouse region handlers
 2022-10-14 18:31:23 -06:00
Nathan Sobo
646d344a11 Avoid re-rendering editor on mouse move 
Only notify editor when clearing highlights if there were highlights to
begin with.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-10-14 18:27:55 -06:00
Nathan Sobo
bc03592912 Only invalidate parent view on click/hover if we read that state when rendering 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-10-14 18:09:15 -06:00
Max Brunsfeld
a4b518ec72
Merge pull request #1760 from zed-industries/invite-unknown-platform 
Include waitlist entries w/ unknown platform when summarizing and sending invites
 2022-10-14 16:24:48 -07:00
Max Brunsfeld
b541ac313c Revert unnecessary logic for fetching invites' platform_unknown flag 2022-10-14 16:13:38 -07:00
Nathan Sobo
934474f87e Remove unconditional invalidation when calling mouse region handlers 
We want invalidation to opt-in as much as possible.
If you want a view to re-render, you need to call `cx.notify`.
 2022-10-14 17:06:46 -06:00
Max Brunsfeld
3a4e802093 Include waitlist entries w/ unknown platform when summarizing and sending invites 2022-10-14 15:20:23 -07:00
Julia
b3eb5f7cdf WIP 
Co-Authored-By: Kay Simmons <kay@zed.dev>
 2022-10-14 17:14:33 -04:00
Mikayla Maki
c21e0e916c
Merge pull request #1759 from zed-industries/move-page-up-down 
Move page up / down
 2022-10-14 14:02:27 -07:00
Mikayla Maki
d301a215f7 Finished implementing vscode, emacs, and mac style pageup/down. Added keybindings ctrl-v, alt-v for emacs up/down and shift-pageup, shift-pagedown for vscode style. Also improved incorporated pageup/down into context menus 2022-10-14 13:52:30 -07:00
Max Brunsfeld
8044beffc7 v0.60.4 2022-10-14 12:44:22 -07:00
Max Brunsfeld
8df84e0341 Add MovePageUp and MovePageDown editor commands 
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2022-10-14 12:36:46 -07:00
Max Brunsfeld
137a9cefbd Enable auto-scroll when moving cursors in Editor::handle_input 
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2022-10-14 11:32:22 -07:00
Max Brunsfeld
55576f879b
Merge pull request #1758 from zed-industries/editor-paint-panic 
Consolidate calculation of editor's visible row range
 2022-10-14 10:47:16 -07:00
Max Brunsfeld
78aee53411
Merge pull request #1757 from zed-industries/detect-unshare 
Clear project's shared state upon every disconnection
 2022-10-14 10:44:35 -07:00
Max Brunsfeld
864020463f Consolidate calculation of editor's visible row range 
We think this will fix a panic that was occuring in `paint_highlighted_range`
due to an out-of-bounds read into the line layouts. We think doing essentially the same
calculation in two different ways with floating point numbers might have
caused a different end row to be calculated in 2 different code paths.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-10-14 10:37:44 -07:00
Max Brunsfeld
2d3d07d4d7 Clear project's shared state upon every disconnection 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <as-cii@zed.dev>
 2022-10-14 10:17:59 -07:00
Max Brunsfeld
ad6f9b2499 0.60.3 2022-10-14 09:35:57 -07:00
Max Brunsfeld
330968434f
Merge pull request #1756 from zed-industries/autoclose-wrong-closing-bracket 
Avoid skipping over a different closing bracket in autoclose
 2022-10-14 09:34:33 -07:00
Max Brunsfeld
4b12fb6b3b Avoid skipping over a different closing bracket in autoclose 2022-10-14 09:30:30 -07:00
Nathan Sobo
eef086f60f 0.60.2 2022-10-13 16:26:26 -06:00
Nathan Sobo
6ac0b81778
Merge pull request #1754 from zed-industries/fix-list-scroll 
Pass the current view id when painting List's mouse region instead of 10
 2022-10-13 16:24:55 -06:00
Nathan Sobo
8d82702da2 Pass the current view id value when painting List's mouse region 
Previously, a dummy value was being passed. I think this slipped in accidentally.
 2022-10-13 15:57:19 -06:00
Julia
dde3dfdbf6 Quick cut of using display point conversion to layout hunks 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-10-13 16:34:34 -04:00
Julia
8d609959f1 Clean 2022-10-13 15:23:41 -04:00
Julia
16f854b636 Expand diff gutter indicator to cover all of a wrapped line 2022-10-13 14:05:57 -04:00
Julia
9c47325c25 Use correct range to get diff hunks in the presence of wrapped lines 2022-10-13 13:52:44 -04:00
Max Brunsfeld
cf499abf31 v0.60.1 2022-10-13 10:00:07 -07:00
Antonio Scandurra
86ddbc6d26
Merge pull request #1752 from zed-industries/allow-inviting-users-to-another-guest-project 
Allow inviting users to a project that was shared by someone else
 2022-10-13 17:58:22 +01:00
Antonio Scandurra
b8bc5a282e Allow inviting users to a project that was shared by someone else 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-10-13 18:48:14 +02:00
Antonio Scandurra
f5db02a605
Merge pull request #1749 from zed-industries/child-view-panic 
Prevent `ChildView` from retaining an otherwise dropped view
 2022-10-13 15:45:53 +01:00
Antonio Scandurra
9ebd586350 Improve error message when rendering a child view for a dropped view 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-13 16:40:52 +02:00
Antonio Scandurra
1bec8087ee Add unit test for ChildView 2022-10-13 15:59:52 +02:00