zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 10:57:22 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,718 Commits 663 Branches 720 Tags 179 MiB
05389dc239
Commit Graph

4281 Commits

Author SHA1 Message Date
Max Brunsfeld
26ccd70e77 Scroll horizontal flex lists by whichever scroll delta dimension is greater 2022-10-18 12:59:04 -07:00
K Simmons
b0ddbeb0ad Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
Julia
826eb113e7
Merge pull request #1775 from zed-industries/drag-on-context-menu-still-click 
Don't allow drag event to fall through context menu
 2022-10-18 15:24:38 -04:00
Julia
2661a9cc98 Don't allow drag event to fall through context menu 2022-10-18 15:00:49 -04:00
K Simmons
b06366ebb7 Get rusqlite more shippable 2022-10-18 11:43:18 -07:00
Antonio Scandurra
d155c11729 Fix client unit test by sending Hello in FakeServer 2022-10-18 19:33:38 +02:00
Antonio Scandurra
0c3c1e1f68 WIP 2022-10-18 19:30:45 +02:00
Antonio Scandurra
6c322dc835 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
K Simmons
6019e4c37b remove items migration 2022-10-18 10:13:47 -07:00
K Simmons
9c8dd66b20 dont reference db items 2022-10-18 10:13:04 -07:00
Antonio Scandurra
0c0e8688ed Use PeerId in TestServer::disconnect_client 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-18 19:05:37 +02:00
Antonio Scandurra
6146923dbb 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 Scandurra
2c4f003897 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 Scandurra
0491747eed 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
Antonio Scandurra
29b9651ebd Use CFRelease instead of a custom LKRelease 2022-10-18 15:47:56 +02:00
Antonio Scandurra
48a1dd1588 Delete room when no participants are left 2022-10-18 14:59:12 +02:00
Antonio Scandurra
9cf39b1da6 Disconnect from live-kit Room on drop 2022-10-18 14:50:03 +02:00
Antonio Scandurra
47be340cac Fix invoking RemoveParticipant on live-kit server 2022-10-18 14:35:06 +02:00
Antonio Scandurra
bf98300547 Render remote participant's screen preserving aspect ratio 2022-10-18 14:16:19 +02:00
Antonio Scandurra
46635956f4 Emit Frame event when new frames are generated for a remote track 2022-10-18 12:18:49 +02:00
Antonio Scandurra
8c6de99159 Use participant identity and track sid everywhere 2022-10-18 12:05:59 +02:00
Nathan Sobo
a42a703b35 Pass tracks to Rust unretained 
We always call CFRetain when constructing a track on the Rust side.
 2022-10-17 23:56:41 -06:00
Nathan Sobo
59fab0bb2d WIP 2022-10-17 23:47:55 -06:00
Nathan Sobo
c73e2c2d0f Get test_app running without crashing 2022-10-17 23:38:43 -06:00
Nathan Sobo
8c1c98a0bf WIP 2022-10-17 23:25:04 -06:00
K Simmons
d99a074bc0 revert workspace changes 2022-10-17 17:05:08 -07:00
K Simmons
05b4b443d9 working items schema 2022-10-17 17:04:30 -07:00
Mikayla Maki
4b09f77950 WIP 2022-10-17 17:04:30 -07:00
Mikayla Maki
dbea3cf20c Converted to using rusqlite 2022-10-17 17:04:30 -07:00
K Simmons
aa8fa4a6d5 more wip 2022-10-17 17:04:29 -07:00
K Simmons
dbc03e2668 wip 2022-10-17 17:04:19 -07:00
Mikayla Maki
895aeb033f
Merge branch 'main' into breadcrumbs 2022-10-17 16:51:38 -07:00
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
5ef5147780
Merge branch 'main' into gpui-events 2022-10-17 15:43:41 -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
Mikayla Maki
93a30ea940 Removed breadcrumb scrollable 2022-10-17 15:29:51 -07:00
Mikayla Maki
5bb2edca8b Added absolute path info to remote worktrees (updated protocol version) 2022-10-17 15:27:46 -07:00
Mikayla Maki
1789dfb8b1 Fixed tests 2022-10-17 14:53:52 -07:00
Mikayla Maki
f473eadf2d Fixed failing test, now to make breadcrumbs scrollable... 2022-10-17 13:57:29 -07:00
Mikayla Maki
1f161b9aa1 Show full, absolute paths when displaying a local worktree 2022-10-17 13:35:45 -07:00
Mikayla Maki
354fefe61b Resovled behavioral inconsistency with how projects with multiple roots are handled 2022-10-17 13:08:05 -07:00
Mikayla Maki
19c98bb5ad 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
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
499b8f5f55 WIP 2022-10-17 18:00:54 +02:00
Antonio Scandurra
81d83841ab WIP: Start integrating screen-sharing 2022-10-17 14:50:05 +02:00
Antonio Scandurra
cce00526b9 Remove participants from live-kit rooms when they leave zed rooms 2022-10-17 14:03:44 +02:00
Antonio Scandurra
c9225bb87c WIP: Start integrating with LiveKit when creating/joining rooms 2022-10-17 12:20:55 +02:00
Antonio Scandurra
75c339851f Add live_kit_server::api::Client::{create,delete}_room 2022-10-17 11:24:09 +02:00
Antonio Scandurra
e39c7c62e4 Update livekit_client 2022-10-17 10:48:09 +02: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
Antonio Scandurra
f09d6b7b95 WIP 2022-10-17 09:59:16 +02:00
Nathan Sobo
19a2752674 WIP: Update token module to support server api 2022-10-17 09:59:16 +02:00
Antonio Scandurra
5d433b1666 WIP: start on live_kit_server 2022-10-17 09:59:16 +02:00
Antonio Scandurra
caeae38e3a Move live_kit to live_kit_client and add live_kit_server 2022-10-17 09:59:16 +02:00
Antonio Scandurra
c25acc155d Move ownership of MacOSDisplay to the rust side 2022-10-17 09:59:16 +02:00
Antonio Scandurra
4222f86537 Temporarily use legacy screen capture API 2022-10-17 09:59:16 +02:00
Nathan Sobo
9569323f93 WIP: Getting a big black window, then a crash 2022-10-17 09:59:16 +02:00
Nathan Sobo
0bbba90f30 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
f1ff557a25 Rearranged mouse handling 2022-10-16 17:31:19 -07:00
Nathan Sobo
12eab6551f Remove dispatch_event from Element trait 2022-10-16 13:08:25 -06:00
Nathan Sobo
d25c6b15a6 Move Terminal key down event handling from element to View::key_down method 2022-10-16 12:55:02 -06:00
Nathan Sobo
b9308ad80d Move handling of modifier changes to new View hook 2022-10-16 12:47:48 -06:00
Nathan Sobo
6e363e464c Start on view-level dispatch approach for keyboard events 2022-10-16 11:46:31 -06:00
Nathan Sobo
6e53deb1b2 Refine mouse event naming 2022-10-16 11:18:58 -06: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
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
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
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
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
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
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
Antonio Scandurra
a5a60eb854 Log view name alongside error in ChildView 2022-10-13 15:44:01 +02:00
Antonio Scandurra
edb61a9c8f Avoid panicking if child view points to a view that was not rendered 2022-10-13 15:11:57 +02:00
Antonio Scandurra
06dfb74663 Prevent ChildView from retaining an otherwise dropped view 2022-10-13 15:04:57 +02:00
Antonio Scandurra
c4680e66ff Fix error on clangd when compile-commands.json is present 
The language server was failing because we were forgetting to provide
a `jsonrpc` field for responses to requests coming from the lsp.
 2022-10-13 11:10:23 +02:00
Antonio Scandurra
06e9b8276f
Merge pull request #1745 from zed-industries/contact-popover-focus 
Fix some issues with contact popover focus
 2022-10-13 08:37:14 +01:00
Antonio Scandurra
37a0fd33c5 Use fake file system for buffer identity test 2022-10-13 09:33:55 +02:00
Antonio Scandurra
f28cc5ca0c Preserve buffer identity when underlying entry temporarily disappears 2022-10-13 09:10:10 +02:00
Antonio Scandurra
0a1aea6cb8 Add test to ensure buffer identity is kept across Project::rename 2022-10-13 08:17:35 +02:00
Julia
a6a7e85894 Misc fixes, still broken soft wrap 2022-10-13 02:02:29 -04:00
Julia
e75dcc853b Include deletion hunks in fold regardless of end 2022-10-13 00:42:53 -04:00
Max Brunsfeld
b5786cbf30 Dismiss contacts popover when clicking outside, even w/o focus change 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-10-12 17:55:11 -07:00
Max Brunsfeld
513c02e67f Remove spurious focus of contact popover when opening it 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-10-12 17:39:44 -07:00
Mikayla Maki
51c0a140c6
Merge pull request #1743 from zed-industries/new-settings-writing 
Improved settings writing to be strongly typed and based on settings file content diffs
 2022-10-12 17:18:48 -07:00
Mikayla Maki
e73270085b Fixed settings 2022-10-12 17:11:47 -07:00
Mikayla Maki
dd1320e6d1 Improved settings writing to be strongly typed and based on settings file content diffs 
Co-Authored-By: kay@zed.dev
 2022-10-12 17:05:23 -07:00
Kay Simmons
d42bf8eebe
Merge pull request #1740 from zed-industries/fix-dock-focus-issues 
Fix Dock infinite loop
 2022-10-12 16:19:09 -07:00
K Simmons
2a1dbd6fb5 Update gpui focus test to match the new removal of intermediate focus filtering 2022-10-12 15:57:29 -07:00
Max Brunsfeld
6cdf4e98fc Re-export basic text types from text and language crates 
Also avoid production dependencies on fs and rope in collab
 2022-10-12 15:48:19 -07:00
Kay Simmons
27a87c3d9e
Merge branch 'main' into fix-dock-focus-issues 2022-10-12 15:18:28 -07:00
K Simmons
1d8717f4de Remove focus filtering from gpui so all focus events result in focus-in and focus-out calls 
Remove pane focused event in favor of focus_in at the workspace level
Added is_child to ViewContext to determine if a given view is a child of the current view
Fix issue where dock would get in a infinite loop when activated after dragging an item out of it
Fix issue where the last focused view in an item was not correctly refocused when a pane is focused after switching active tabs

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-12 15:10:00 -07:00
Max Brunsfeld
490a608663 v0.60.0 2022-10-12 14:18:40 -07:00
Max Brunsfeld
89f05ada0b Allow toggling collaboration menu from the keyboard 2022-10-12 14:14:03 -07:00
Max Brunsfeld
69dcfbb423 Send guests DiskBasedDiagnosticsFinished messages when they join a project 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2022-10-12 13:49:09 -07:00
Julia
e744520d90 Correctly offset diff hunk layouts 2022-10-12 16:40:19 -04:00
Max Brunsfeld
3c3671a193 Avoid sending stale diagnostics after sharing a worktree 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2022-10-12 11:33:19 -07:00
Max Brunsfeld
cbf31e6d27
Merge pull request #1734 from zed-industries/fix-layout-crash 
Fix rounding error in computing editor's row range during layout
 2022-10-12 09:38:47 -07:00
Mikayla Maki
b3567a7240
Merge pull request #1736 from zed-industries/fix-terminal-bold 
Fix a bug in how I parse alacritty's styles
 2022-10-12 09:38:27 -07:00
Mikayla Maki
296656570e
Merge pull request #1735 from zed-industries/rollback-dock-anchor-setting 
Stops the dock anchor from being written to settings
 2022-10-12 09:34:27 -07:00
Mikayla Maki
aac24938f5 Fix a bug in how I parse alacritty's styles 2022-10-12 09:34:17 -07:00
Mikayla Maki
47332f97c7 Stops the dock anchor from being written to settings 2022-10-12 09:28:55 -07:00
Max Brunsfeld
1179f8f7be Fix rounding error in computing editor's row range during layout 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2022-10-12 09:19:29 -07:00
Antonio Scandurra
c4dde0f4e2 💄 2022-10-12 15:35:28 +02:00
Antonio Scandurra
ec19f0f8e9 Remove unnecessary async from Peer::add_connection 2022-10-12 15:32:39 +02:00
Antonio Scandurra
cc56fa9ea6 Introduce client-side timeout when trying to connect 2022-10-12 15:32:30 +02:00
Antonio Scandurra
83d3fad80d Clear auto-indent requests if they couldn't be computed 2022-10-12 10:53:44 +02:00
Antonio Scandurra
9adbab5d99 Fix opening a buffer after leaving and joining the same project 
This bug existed prior to #1700 and was caused by not clearing the
buffers that were already shared with a peer that left and opened
a project using the same connection. When such peer would re-join
the project and open a buffer that it had opened previously, the
host assumed the peer had already seen that buffer and wouldn't bother
sending it again.
 2022-10-12 10:31:06 +02:00
Julia
a6910584b6 Something's happening, nothing correct, but something 2022-10-12 00:39:56 -04:00
Mikayla Maki
b1f64d9550 Updated new vim tests with new rope crate 2022-10-11 20:25:39 -07:00
Mikayla Maki
41590ef64b
Merge branch 'main' into test-branch 2022-10-11 19:55:32 -07:00
Mikayla Maki
e7b6d1befe Added theme and dock anchor saving :D 2022-10-11 19:18:29 -07:00
Max Brunsfeld
7eceff1d7b Impose min scrollbar height in a way that doesn't impede scrollbar's movement 
Also, fix the editor's scroll max so that you can scroll to the last
display row.
 2022-10-11 18:50:04 -07:00
Kay Simmons
81a3a22379
Merge pull request #1685 from zed-industries/vim-text-objects 
Vim Text Objects and Numeric Repitions
 2022-10-11 16:36:19 -07:00
K Simmons
d1f1eb9a29 Add count argument to motion functions and add ability to jump to a given line 2022-10-11 16:27:54 -07:00
Mikayla Maki
5487f99ac7 Moved settings_file.rs into settings crate. Should be ready to start now :D 2022-10-11 16:03:38 -07:00
Mikayla Maki
0beb97547e Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
K Simmons
673041d1f5 working quote and bracket text objects 2022-10-11 15:17:29 -07:00
Nate Butler
5708879b5a Style elevations & update styleTrees 
Also rename `info` -> `accent`

Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
 2022-10-11 17:38:28 -04:00
Max Brunsfeld
638e9f9477
Merge pull request #1715 from zed-industries/scrollbars 
Add scrollbars
 2022-10-11 13:34:15 -07:00
Max Brunsfeld
acc85ad03c Impose a minimum height on the scrollbar 2022-10-11 13:18:33 -07:00
Mikayla Maki
0a8e2f6bb0 Moved fs to it's own crate, build failing due to cyclic dependency on rope 2022-10-11 13:03:36 -07:00
Mikayla Maki
a833652077 Undid change to paths variables and cleaned up leftovers 2022-10-11 12:48:30 -07:00
Mikayla Maki
7ce758b343 Added notes from working with Nathan 2022-10-11 12:48:30 -07:00
Mikayla Maki
cc8ae45012 Added theme writing code, really bad race condition 2022-10-11 12:48:30 -07:00
Max Brunsfeld
65b8c512fe Allow opening other local projects via contacts list 2022-10-11 12:37:00 -07:00
Max Brunsfeld
0e695eaae8 Wait for project sharing to complete in LSP status integration test 2022-10-11 12:15:54 -07:00
Max Brunsfeld
1f0a9ce418 Proceed with share while project state uploads 
Co-authored-by: Antonio Scandurra <as-cii@zed.dev>
 2022-10-11 10:17:20 -07:00
Antonio Scandurra
a656047c15
Merge pull request #1700 from zed-industries/room 
Introduce call-based collaboration
 2022-10-11 17:40:44 +01:00
Antonio Scandurra
f26695ea8c 💄 2022-10-11 18:34:04 +02:00
Max Brunsfeld
f4306d977f Refresh scrollbar auto-hide setting when opening a new editor 2022-10-11 09:28:17 -07:00
Max Brunsfeld
67a32de7d4 Hide the scrollbar track, not just the thumb 2022-10-11 09:26:19 -07:00
Antonio Scandurra
ba6c5441c0 Always show invite link in contacts popover 2022-10-11 18:22:00 +02:00
Max Brunsfeld
e2700ff8c6 Enable/disable scrollbar auto-hide based on OS setting 2022-10-11 09:13:34 -07:00
Antonio Scandurra
f83de0a91c Respect contacts popover size 2022-10-11 17:30:17 +02:00
Antonio Scandurra
4c07a0782b Allow active call to be optional on workspace 
This prepares us for a future where the workspace is unaware of the
active call and doesn't require all tests to invoke `call::init`.
 2022-10-11 17:27:37 +02:00
Antonio Scandurra
ee2587d3e5 Fix integration tests 2022-10-11 17:09:54 +02:00
Antonio Scandurra
45d118f96f Decide whether to clip to visible bounds on a per-element basis 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 17:05:13 +02:00
Antonio Scandurra
eb711cde53 Polish styling of contacts popover 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 16:52:20 +02:00
Antonio Scandurra
4504b36c8f Show a different message when participant is active on unshared project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 15:24:31 +02:00
Antonio Scandurra
29c3b81a0a Show prompt when closing last window while there's an active call 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 14:52:47 +02:00
Antonio Scandurra
feb17c29ec Show participant projects in contacts popover 2022-10-11 12:23:15 +02:00
Antonio Scandurra
8e7f96cebc Update contacts when automatically canceling calls 2022-10-11 11:55:15 +02:00
Antonio Scandurra
0a306808da Dismiss project shared notifications when a project was unshared 2022-10-11 11:44:31 +02:00
Antonio Scandurra
1d4bdfc4a1 Cancel calls automatically when caller hangs up or disconnects 2022-10-11 11:28:27 +02:00
Antonio Scandurra
9ec62d4c1f Foreground app when accepting calls and project shares 2022-10-11 11:03:49 +02:00
Antonio Scandurra
bf0a04ab50 Dismiss popover when contact finder is unfocused 2022-10-11 11:01:38 +02:00
Antonio Scandurra
bf488f2027 Show project root names when displaying incoming call notification 2022-10-11 10:59:36 +02:00
Max Brunsfeld
7b084199be Auto-hide scrollbars 2022-10-10 17:54:29 -07:00
Nathan Sobo
e0b6b0df2a Rename Join button to Open, rework message slightly 2022-10-10 18:12:00 -06:00
Max Brunsfeld
6dcf638322 Represent scrollbar range with f32s 2022-10-10 17:06:48 -07:00
Nathan Sobo
b8c2acf0f2 Show worktree root names when sharing additional projects on a call 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-10-10 17:56:03 -06:00
Max Brunsfeld
eedcc585af Add scrollbars to editors 2022-10-10 16:20:47 -07:00
K Simmons
6a237deb21 Add some tests for portions of visual text objects. Note: they are slightly broken currently as described in the tests 2022-10-10 15:32:12 -07:00
K Simmons
d2494822b0 Add assertion context manager to TestAppContext and convert existing vim tests to use neovim backed test context 2022-10-10 14:46:07 -07:00
Nathan Sobo
425e540c9a Fix tests by providing close: true 2022-10-10 15:29:24 -06:00
Nathan Sobo
3ae96f2c6e Don't autoclose brackets when is false 2022-10-10 15:15:43 -06:00
Mikayla Maki
576581c20d
Merge pull request #1699 from zed-industries/page-up 
Implemented page up and page down for the editor
 2022-10-10 11:43:35 -07:00
Mikayla Maki
1d2495d57b Re-arrange how lines are set 2022-10-10 11:38:28 -07:00
Julia
7d6690335f
Merge pull request #1712 from zed-industries/dont-select-on-copy-by-default-terminal 
Don't select on copy by default in the terminal
 2022-10-10 14:15:20 -04:00
Julia
2f96a09c46 Don't select on copy by default in the terminal 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-10 13:48:56 -04:00
Antonio Scandurra
94c68d246e 📝 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-10 19:18:05 +02:00
Antonio Scandurra
8dc99d42ff Remove menu bar extra 2022-10-10 18:21:11 +02:00
Antonio Scandurra
04fcd18c75 Show contacts popover when clicking on menu bar extra 2022-10-10 16:30:02 +02:00
Antonio Scandurra
d9d99e5e04 Fix seed script 2022-10-10 16:05:22 +02:00
Antonio Scandurra
5f9cedad23 Add margin to picker in contacts popover 2022-10-10 16:05:09 +02:00
Antonio Scandurra
afaacba41f Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Antonio Scandurra
7cfe435e62 Style project shared notifications 2022-10-10 14:37:51 +02:00
Antonio Scandurra
9d990ae329 Show all room participants in titlebar 
...and allow following them into external projects.
 2022-10-10 14:20:45 +02:00
Antonio Scandurra
25ff5959fb Superimpose external location message on active view 2022-10-10 12:23:50 +02:00
Antonio Scandurra
d7bac3cea6 Style incoming call notification 2022-10-10 11:36:39 +02:00
Antonio Scandurra
79748803a9 Add leave button on active call header 2022-10-10 10:30:51 +02:00
Antonio Scandurra
6f4edf6df5 Move contact finder into contacts popover 2022-10-10 09:56:21 +02:00
Mikayla Maki
1af4b263b2 Implemented page up and page down for the editor 2022-10-09 19:19:40 -07:00
K Simmons
5fec8c8bfd Enable verifying of visual mode selections in neovim backed tests 2022-10-09 01:19:22 -07:00
K Simmons
f90b693ed5 fix some warnings and merge errors 2022-10-08 23:49:04 -07:00
K Simmons
515c1ea123 Fixed some neovim test context issues, added repeated commands in vim mode, and ported some tests to use the neovim testing strategy 2022-10-08 21:52:07 -07:00
K Simmons
b82db3a254 Adds word and sentence text objects along with a new vim testing system which uses cached neovim data to verify our test accuracy 2022-10-08 21:51:49 -07:00
Antonio Scandurra
34cb742db1 Set current location after calling another user 2022-10-08 14:47:40 +02:00
Antonio Scandurra
59aaf4ce1b Call contact on enter 2022-10-08 14:43:41 +02:00
Antonio Scandurra
d14744d02f Show current user in active call 2022-10-08 14:38:17 +02:00
Max Brunsfeld
e96abf1429 0.59.0 2022-10-07 14:51:18 -07:00
Mikayla Maki
2758234e03
Merge pull request #1693 from zed-industries/terminal-tidying 
Terminal Tidying
 2022-10-07 13:11:43 -07:00
Max Brunsfeld
00188511cb
Merge pull request #1697 from zed-industries/css-highlighting-fixes 
Highlighting fixes
 2022-10-07 12:56:31 -07:00
Julia
4456e81163
Merge pull request #1696 from zed-industries/reset-diff-on-set-none-diff-base 
Reset buffer git diff when setting diff base to None
 2022-10-07 15:48:18 -04:00
Max Brunsfeld
6ecf870c66 Tweak SCREAMING_SNAKE_CASE regexes in highlight queries 2022-10-07 12:46:49 -07:00
Max Brunsfeld
95cb9ceac9 Collapse variant and type into the same color 2022-10-07 12:44:55 -07:00
Max Brunsfeld
fcf13b44fb CSS: color '#' the same as the rest of the color 2022-10-07 12:44:39 -07:00
Max Brunsfeld
070c4bc503 Add color for 'variable.special' and use it in highlight queries 2022-10-07 12:44:20 -07:00
Julia
e15f27106d Reset buffer git diff when setting diff base to None 
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
 2022-10-07 15:37:37 -04:00
Mikayla Maki
15595a67fa Added a horrible hacky way of doing cmd-k correctly. 2022-10-07 12:04:26 -07:00
Mikayla Maki
bf50a8ad8e Implemented a simplistic version of correct cmd-k behavior 2022-10-07 11:37:39 -07:00
Mikayla Maki
188b775fa6 Fixed non-block terminal cursors being displayed incorrectly 2022-10-07 10:03:09 -07:00
Max Brunsfeld
ec76146a23
Merge pull request #1692 from zed-industries/avoid-duplicate-autoformat-edits 
Avoid duplicate autoformat edits
 2022-10-07 09:35:10 -07:00
Antonio Scandurra
f9fb3f78b2 WIP: Render active call in contacts popover 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-07 17:01:48 +02:00
Antonio Scandurra
96c5bb8c39 Fix flicker due to adding and removing menu bar extra unnecessarily 2022-10-07 15:07:09 +02:00
Antonio Scandurra
560d8a8004 Don't leave the room if there's a pending room update 2022-10-07 14:52:39 +02:00
Antonio Scandurra
251e06c50f 💄 2022-10-07 14:51:04 +02:00
Antonio Scandurra
6fb5901d69 Ensure sharing the same project twice is idempotent 2022-10-07 14:47:06 +02:00
Antonio Scandurra
386de03f46 Fix room disconnection problems when creating room and sharing project 2022-10-07 14:39:11 +02:00
Antonio Scandurra
4aaf3df8c7 Show contact status 2022-10-07 13:56:28 +02:00
Antonio Scandurra
d7cea646fc Include a busy field in proto::Contact 2022-10-07 12:21:56 +02:00
Antonio Scandurra
e82320cde8 Never set a room on active call if it is offline 2022-10-07 12:00:23 +02:00
Antonio Scandurra
669406d5af Leave room when client is the only participant 2022-10-07 11:58:49 +02:00
Antonio Scandurra
b479c8c8ba Move project sharing into Room 2022-10-07 10:14:17 +02:00
Antonio Scandurra
3d467a9491 Unset room on active call when disconnecting 2022-10-07 09:23:25 +02:00
Julia
8fb8fff61b
Merge pull request #1682 from zed-industries/load-diff-base-from-correct-relative-path 
Fix some git gutter bugs
 2022-10-06 22:28:52 -04:00
Julia
d67fad8dca Extend a test to cover repos not at worktree root 2022-10-06 22:20:10 -04:00
Max Brunsfeld
47a8e4222a Don't allow multiple concurrent formatting requests for the same buffer 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-10-06 17:03:38 -07:00
Max Brunsfeld
4508d94a3e In deterministic executor, ensure fake timers are ordered by wake time 
Previously, advancing the clock would fail to wake a timer that was
set *after* another time whose wake time had not yet arrived.
 2022-10-06 17:03:23 -07:00
Max Brunsfeld
8411d886ac Fix multi-line string formatting in editor_test.rs 2022-10-06 15:13:29 -07:00
Max Brunsfeld
63e1c839fe Rename language::tests -> language::buffer_tests 2022-10-06 13:32:49 -07:00
Max Brunsfeld
b6525e9164 Extract editor tests to their own file 2022-10-06 13:32:34 -07:00
Max Brunsfeld
fe7a39ba5c Apply buffer diff edits as a single batch 2022-10-06 11:54:28 -07:00
Max Brunsfeld
51fa06cc8d
Merge pull request #1404 from zed-industries/html-support 
Basic html support
 2022-10-06 10:32:44 -07:00
Julia
771215d254 Reload git index on file events to catch new contents 2022-10-06 12:01:21 -04:00
Antonio Scandurra
9f81699e01 WIP: start on menu bar extra 2022-10-06 16:10:45 +02:00
Antonio Scandurra
95e08edbb8 Always include room id in protos 
This is redundant, but it futures-proof the ability to talk about
multiple rooms at any given time and feels safer in terms of race
conditions.
 2022-10-06 15:20:49 +02:00
Antonio Scandurra
4cb306fbf3 Implement call cancellation 2022-10-06 15:12:27 +02:00
Antonio Scandurra
2e84fc6737 Delete rooms without pending users or participants 2022-10-06 14:20:40 +02:00
Antonio Scandurra
c43956d70a Move contacts panel styles into contacts popover 2022-10-06 14:07:21 +02:00