Commit Graph
11144 Commits
Author SHA1 Message Date
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 186219322f WIP 2022-10-17 18:00:54 +02:00
Antonio Scandurra d8a5dae23b WIP: Start integrating screen-sharing 2022-10-17 14:50:05 +02:00
Antonio Scandurra b828646c8b Remove participants from live-kit rooms when they leave zed rooms 2022-10-17 14:03:44 +02:00
Antonio Scandurra f665daba66 WIP: Start integrating with LiveKit when creating/joining rooms 2022-10-17 12:20:55 +02:00
Antonio Scandurra 561483fc6d Add live_kit_server::api::Client::{create,delete}_room 2022-10-17 11:24:09 +02:00
Antonio Scandurra 0a4093692f Update livekit_client 2022-10-17 10:48:09 +02: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
Antonio Scandurra beca32692b WIP 2022-10-17 09:59:16 +02:00
Nathan Sobo e0c6b22d0f WIP: Update token module to support server api 2022-10-17 09:59:16 +02:00
Antonio Scandurra 1f201e9778 WIP: start on live_kit_server 2022-10-17 09:59:16 +02:00
Antonio Scandurra c6985e9d30 Move live_kit to live_kit_client and add live_kit_server 2022-10-17 09:59:16 +02:00
Antonio Scandurra 22bb1615c4 Move ownership of MacOSDisplay to the rust side 2022-10-17 09:59:16 +02:00
Antonio Scandurra 7df2dff094 Temporarily use legacy screen capture API 2022-10-17 09:59:16 +02:00
Nathan Sobo d80b5d1950 WIP: Getting a big black window, then a crash 2022-10-17 09:59:16 +02:00
Nathan SoboandAntonio Scandurra 51208d10a9 Use ScreenCaptureKit-enabled LiveKit SDK and add display_sources function
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-10-17 09:59:16 +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
Nathan Sobo f26a6179b4 Remove dispatch_event from Element trait 2022-10-16 13:08:25 -06:00
Nathan Sobo ec79ea72fb Move Terminal key down event handling from element to View::key_down method 2022-10-16 12:55:02 -06:00
Nathan Sobo 25476bcbc6 Move handling of modifier changes to new View hook 2022-10-16 12:47:48 -06:00
Nathan Sobo 6c870a17a6 Start on view-level dispatch approach for keyboard events 2022-10-16 11:46:31 -06:00
Nathan Sobo 5cde1e8f36 Refine mouse event naming 2022-10-16 11:18:58 -06: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