Commit Graph
39175 Commits
Author SHA1 Message Date
Mikayla Maki 76e2fbfe31 Added a horrible hacky way of doing cmd-k correctly. 2022-10-07 12:04:26 -07:00
Mikayla Maki 4bcbeef605 Implemented a simplistic version of correct cmd-k behavior 2022-10-07 11:37:39 -07:00
Mikayla Maki ed30bd57a9 Fixed non-block terminal cursors being displayed incorrectly 2022-10-07 10:03:09 -07:00
Max Brunsfeld d77aa013a9 Merge pull request #1692 from zed-industries/avoid-duplicate-autoformat-edits
Avoid duplicate autoformat edits
2022-10-07 09:35:10 -07:00
Antonio ScandurraandNathan Sobo cf72bc4a14 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 9932ddfd59 Fix flicker due to adding and removing menu bar extra unnecessarily 2022-10-07 15:07:09 +02:00
Antonio Scandurra 11cdfc954c Don't leave the room if there's a pending room update 2022-10-07 14:52:39 +02:00
Antonio Scandurra da67401be9 💄 2022-10-07 14:51:04 +02:00
Antonio Scandurra 17ceb30ae7 Ensure sharing the same project twice is idempotent 2022-10-07 14:47:06 +02:00
Antonio Scandurra 5c0e496872 Fix styling for busy contacts 2022-10-07 14:42:18 +02:00
Antonio Scandurra d0fb6b3376 Fix room disconnection problems when creating room and sharing project 2022-10-07 14:39:11 +02:00
Antonio Scandurra 6393ad8c75 Show contact status 2022-10-07 13:56:28 +02:00
Antonio Scandurra 28de74f845 Include a busy field in proto::Contact 2022-10-07 12:21:56 +02:00
Antonio Scandurra bac01e2fda Never set a room on active call if it is offline 2022-10-07 12:00:23 +02:00
Antonio Scandurra b80a39c165 Leave room when client is the only participant 2022-10-07 11:58:49 +02:00
Antonio Scandurra 6e6e44b20a Move project sharing into Room 2022-10-07 10:14:17 +02:00
Antonio Scandurra 991a2fd9b2 Unset room on active call when disconnecting 2022-10-07 09:23:25 +02:00
Julia 26f308f6e4 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 8b93d084ea Extend a test to cover repos not at worktree root 2022-10-06 22:20:10 -04:00
Nate Butler e35e052c58 Update contextMenu.ts 2022-10-06 21:08:53 -04:00
Max BrunsfeldandNathan Sobo e6fe6c8122 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 26e1715699 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 b4bd9c3f6d Fix multi-line string formatting in editor_test.rs 2022-10-06 15:13:29 -07:00
Max Brunsfeld 3d54c58852 Merge pull request #1691 from zed-industries/move-tests
Organize buffer and editor tests
2022-10-06 13:39:54 -07:00
Max Brunsfeld 20f22f78e4 Rename language::tests -> language::buffer_tests 2022-10-06 13:32:49 -07:00
Max Brunsfeld 8df69c8613 Extract editor tests to their own file 2022-10-06 13:32:34 -07:00
Max Brunsfeld 01db1a2d05 Merge pull request #1689 from zed-industries/optimize-buffer-diff
Apply buffer diff edits as a single batch
2022-10-06 12:28:42 -07:00
Max Brunsfeld 260e5e66e8 Apply buffer diff edits as a single batch 2022-10-06 11:54:28 -07:00
Max Brunsfeld 428e05a5fa Merge pull request #1404 from zed-industries/html-support
Basic html support
2022-10-06 10:32:44 -07:00
Julia 981253213d Reload git index on file events to catch new contents 2022-10-06 12:01:21 -04:00
Antonio Scandurra 82458e465b WIP: start on menu bar extra 2022-10-06 16:10:45 +02:00
Antonio Scandurra 0bd465df40 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 35d55323e4 Remove stale contacts panel reference 2022-10-06 15:17:02 +02:00
Antonio Scandurra bf30092c63 Implement call cancellation 2022-10-06 15:12:27 +02:00
Antonio Scandurra 7a30636a76 Delete rooms without pending users or participants 2022-10-06 14:20:40 +02:00
Antonio Scandurra a2c823e866 Move contacts panel styles into contacts popover 2022-10-06 14:07:21 +02:00
Antonio Scandurra f3b459ede5 Move contacts panel features into collab_ui 2022-10-06 14:00:14 +02:00
Antonio Scandurra 20482bad8d Move IncomingCall into call crate 2022-10-06 09:52:03 +02:00
Antonio Scandurra 6597a5183a Move incoming calls into ActiveCall 2022-10-06 09:50:26 +02:00
Joseph T. Lyons 0fb441a1f3 Add Discord webhook for published releases (#1684) 2022-10-05 21:22:53 -04:00
Max Brunsfeld 62b9331c6f Add a test for multi-language auto-indent 2022-10-05 17:59:31 -07:00
Max Brunsfeld 225f341f0a Derive indent size from the language at the cursor when auto-indenting 2022-10-05 17:07:35 -07:00
Max Brunsfeld fb39256ee5 Remove last usages of MultiBufferSnapshot::language 2022-10-05 14:44:34 -07:00
Julia 581c7bfad6 Load diff base from correct relative path 2022-10-05 16:04:55 -04:00
Max Brunsfeld 30cf42d108 Finish generalizing ToggleComments to support block comments 2022-10-05 12:25:32 -07:00
Nate Butler 553d02700d WIP 2022-10-05 12:40:38 -04:00
Antonio Scandurra 33eee3003f Check room invariants in Store::check_invariants 2022-10-05 16:29:22 +02:00
Antonio Scandurra 7c4051e642 Enhance integration test to verify creating rooms while busy 2022-10-05 16:20:01 +02:00
Antonio Scandurra abad8199ee Add integration test verifying calls to busy users 2022-10-05 16:14:40 +02:00
Antonio Scandurra 8d591c6ab1 Allow following users into external projects 2022-10-05 15:32:55 +02:00