yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,352 Commits 5 Branches 0 Tags
f80ea5cd5b3855176efcdf8a4bdf34713cd4a2ff
Commit Graph
6352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra f80ea5cd5b Merge pull request #1774 from zed-industries/stale-connections 
Correctly handle disconnect when a different client for the same user is on a call
 2022-10-18 18:37:43 +01:00
Antonio Scandurra caf566507b Fix client unit test by sending Hello in FakeServer 2022-10-18 19:33:38 +02:00
Antonio ScandurraandNathan Sobo a1ed37743e Clear out incoming call when removing last connection for a user 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-18 19:15:14 +02:00
Antonio ScandurraandNathan Sobo 0630eacbdb Use PeerId in TestServer::disconnect_client 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-18 19:05:37 +02:00
Antonio ScandurraandNathan Sobo 3ceace48fb WIP: Start on test to ensure incoming calls cancel upon recipient disconnection 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-18 18:45:50 +02:00
Antonio ScandurraandNathan Sobo 05d7ed8c59 Tell clients their peer id on connection in Hello message 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-18 18:42:55 +02:00
Antonio ScandurraandNathan Sobo 815bf905df Only leave room on connections that are associated with the active call 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-18 17:42:10 +02:00
Mikayla Maki cd2a5c370b Merge pull request #1769 from zed-industries/breadcrumbs 
Fix breadcrumbs
 2022-10-17 17:02:56 -07:00
Mikayla Maki c59df65e85 Merge branch 'main' into breadcrumbs 2022-10-17 16:51:38 -07:00
Kay Simmons 48683f4a6a Merge pull request #1763 from zed-industries/cursor-blink-setting 
Adds the ability to disable cursor blinking and replicates cursor shape to collaborators
 2022-10-17 16:51:20 -07:00
K Simmons 93f25e3e92 swap to using vercel to run the local zed.dev server 2022-10-17 16:49:34 -07:00
K SimmonsandMikayla Maki 456c3cad4b 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 489f2b1555 increment protocol version 2022-10-17 16:20:51 -07:00
K Simmons 55b9eff3df Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Mikayla Maki 8c42dcf15d 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
Mikayla Maki fadf0a2ea6 Removed breadcrumb scrollable 2022-10-17 15:29:51 -07:00
Mikayla Maki 38ea470734 Added absolute path info to remote worktrees (updated protocol version) 2022-10-17 15:27:46 -07:00
Mikayla Maki e02528e8c0 Fixed tests 2022-10-17 14:53:52 -07:00
Mikayla Maki 2d01e351be Fixed failing test, now to make breadcrumbs scrollable... 2022-10-17 13:57:29 -07:00
Mikayla Maki 416909e136 Show full, absolute paths when displaying a local worktree 2022-10-17 13:35:45 -07:00
Mikayla Maki ca2409e9bf Resovled behavioral inconsistency with how projects with multiple roots are handled 2022-10-17 13:08:05 -07:00
Mikayla Maki f23f3ad9f8 fixed a bug where files outside of the project would show 'untitled' in the search bar 2022-10-17 12:58:48 -07:00
Julia a2e05e3a47 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 5d60592d49 Cleanup 2022-10-17 14:41:16 -04:00
Julia bc4eb620c4 Inclusively check for hunk in fold range 2022-10-17 13:11:11 -04:00
Julia 4298ebd940 Deduplicate identical hunk layouts 2022-10-17 12:41:20 -04:00
Julia 0514ed1976 More concrete usage of display map to handle diff hunk gutter layout 2022-10-17 12:28:44 -04:00
Antonio Scandurra 94785bf538 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 29291604a6 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 94aae51143 Rearranged mouse handling 2022-10-16 17:31:19 -07:00
Joseph T. Lyons a48136cd77 Merge pull request #1666 from zed-industries/settings-for-journal 
Settings for journal
 2022-10-16 19:55:27 -04:00
Joseph T Lyons b3c92b828c Derive Serialize on HourFormat 2022-10-16 12:51:48 -04:00
Joseph T Lyons 2f7b78263c Do not derive Default on JournalSettings 2022-10-16 12:51:34 -04:00
Joseph T Lyons 34bc185fcb Merge branch 'main' into settings-for-journal 2022-10-16 12:42:18 -04:00
Nathan Sobo 3e27b81d17 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 d2431d9540 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 SoboandMax Brunsfeld f80f306ad8 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 SoboandMax Brunsfeld 4aff034ff5 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 f2f6cbb57b 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 a841af67c3 Revert unnecessary logic for fetching invites' platform_unknown flag 2022-10-14 16:13:38 -07:00
Nathan Sobo 5c0f9e5c51 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 f03687bfcd Include waitlist entries w/ unknown platform when summarizing and sending invites 2022-10-14 15:20:23 -07:00
JuliaandKay Simmons 1eaeba3fc8 WIP 
Co-Authored-By: Kay Simmons <kay@zed.dev>
 2022-10-14 17:14:33 -04:00
Mikayla Maki 420bd22225 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 7ae0ac843a 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 669898eef8 v0.60.4 2022-10-14 12:44:22 -07:00
Max BrunsfeldandMikayla Maki 7c96e0d6e6 Add MovePageUp and MovePageDown editor commands 
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2022-10-14 12:36:46 -07:00
Max BrunsfeldandMikayla Maki db9bd61f0d 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 299f18a971 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 023bd6ee8f 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