Commit Graph
39175 Commits
Author SHA1 Message Date
JuliaandNathan Sobo fb047a226d Avoid moving contacts popover during call start & add button style state
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-02-22 11:34:55 -05:00
Julia 3c7ff46f50 Initial adding of contact menu to call-less share button 2023-02-22 11:22:37 -05:00
JuliaandAntonio Scandurra 84e1237d45 Add followers table to sqlite scheme for tests
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:22:37 -05:00
Julia 221d80a608 Shuffle share/unshare button back to the right side 2023-02-22 11:22:37 -05:00
Julia 8946fbd17d Highlight face pile which local user is following 2023-02-22 11:22:37 -05:00
Julia 21bb7d85a6 Handle case where follower is local user 2023-02-22 11:22:37 -05:00
Julia 7795dc84e9 Add username to right side 2023-02-22 11:22:37 -05:00
Julia 90255cce45 Make things a bit more infallible 2023-02-22 11:22:37 -05:00
Julia fa56590cd7 Following face piles finally take their first breath 2023-02-22 11:21:23 -05:00
JuliaandMax Brunsfeld 62ea8909c1 Fix deadlock in db get_room
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:21:23 -05:00
Julia 988f9c1266 Abuse a closure instead of abusing options/iterators quite so much 2023-02-22 11:21:23 -05:00
Julia 3d9742d272 Absolute pain of the iterator kind (start laying out a user's followers) 2023-02-22 11:21:23 -05:00
Julia bd88f47816 Initial tracking of unfollows on collab server 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra a3d474af23 Begin tracking follow states on collab server
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis 11c724d5fe Add Flex with_reversed_paint_order & initially move face piles to left
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis 6fb45a7366 Start fleshing out layout of collaborator list entries
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
JuliaandPetros Amoiridis fe1c6df418 Tell project when it has been unshared
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
Julia 3bca2fdae9 Add collaborators to collaborator list, including self user 2023-02-22 11:21:23 -05:00
Julia ea3bb46d2b Add collaborator count to collaborator list button 2023-02-22 11:21:23 -05:00
Julia 944c6fba5f Switch collaborator list to using own style 2023-02-22 11:21:23 -05:00
JuliaandAntonio Scandurra 084677795d Begin adding collaborator list popover
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:21:23 -05:00
Julia e13d10cdb5 Move share button and support unsharing 2023-02-22 11:21:23 -05:00
Julia 9cc7d74f69 Move workspace title into collaboration titlebar item render 2023-02-22 11:21:11 -05:00
Antonio Scandurra ea07c26aac Hold room lock through the entirety of a room_transaction
Previously, when the host repeatedly sent `UpdateWorktree` messages,
new guests attempting to join a project would observe a severe slowdown
caused by a database serialization error (e.g., the coherence of the data
would get violated midway through `Database::join_project` due to worktree
entries being mutated as the user joined). Writing entries is pretty fast,
whereas reading all of them for a project can take more than 100ms.
Transactions that failed due to a serialization error are retried, but the guest
would keep retrying until the host finished writing because the guest's read
was slow.

This commit changes the semantics of `room_transaction` to acquire a room
lock before even starting the transaction and holding it all the way after
commit (storing it, as before, in the `RoomGuard`). This ensures that a fast
writer (the host) can't starve a slow reader (the guest), allowing the latter
to make progress by temporarily pausing writes by the former.
2023-02-22 16:04:29 +01:00
Kay Simmons effca56eb4 Merge pull request #2189 from zed-industries/labeled-tasks
Labeled Tasks
2023-02-21 21:31:47 -08:00
Kay Simmons 561b5abc6f fix test warning 2023-02-21 21:13:03 -08:00
Kay Simmons 8ae4613d87 Fix formatting 2023-02-21 21:07:45 -08:00
Mikayla Maki 6f6d374f7c Remove now-default stubs 2023-02-21 17:51:49 -08:00
Mikayla Maki 7d62089491 Add more default impls to the item trait
Change pane to not split if the underlying item cannot be cloned
2023-02-21 17:29:39 -08:00
Mikayla Maki 5ecc0017b9 Merge pull request #2197 from zed-industries/label-text-cow
Changed label and text to be generic over static and owned strings
2023-02-21 17:05:57 -08:00
Mikayla Maki 6aec385c3f Changed label and text to be generic over static strings and owned strings 2023-02-21 16:47:29 -08:00
Kay Simmons 2c5d77b31e Add basic test for labeled tasks 2023-02-21 16:14:22 -08:00
Joseph T. Lyons 9d0c4b8104 Merge pull request #2195 from zed-industries/add-reveal-in-finder-to-additional-locations 2023-02-21 18:48:16 -05:00
Mikayla Maki e65bfa7a96 Merge pull request #2196 from zed-industries/open_urls
Fix open URLs, restarts, and make bundling easier to use
2023-02-21 15:36:50 -08:00
Mikayla MakiandMax e5cd53aa42 Fixes a race condition in the restart implementation
Fixes open_urls racing workspace initialization and causing a double-open (community#927)
Adds a -d flag to the bundle script to compile in debug mode

Co-Authored-by: Max <max@zed.dev>
2023-02-21 15:28:16 -08:00
Joseph LyonsandJulia 23e01fdb31 Add reveal in finder to additional locations
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-02-21 16:09:11 -05:00
Joseph Lyons 0bd34ef698 Remove print macros 2023-02-21 10:46:12 -05:00
Kay Simmons 60590721ce Add labeled tasks to gpui and observe them in the activity status to give feedback when we are still waiting for the language server 2023-02-20 20:28:48 -08:00
Max Brunsfeld e9b7d7f55a Merge pull request #2194 from zed-industries/window-position-env-vars
Fix handling of ZED_WINDOW_{SIZE,POSITION} env vars
2023-02-20 15:29:51 -08:00
Max BrunsfeldandNathan Sobo 3a32412b5e Fix handling of ZED_WINDOW_{SIZE,POSITION} env vars
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2023-02-20 15:11:20 -08:00
Max Brunsfeld d28312317f Merge pull request #2193 from zed-industries/autoclose-fixes
Restructure scope-specific auto-close pairs, fix regression in skipping over auto-closed brackets
2023-02-20 13:51:29 -08:00
Max Brunsfeld f517038f77 Add unit test for auto-closing quotation marks with overrides 2023-02-20 13:46:17 -08:00
Max Brunsfeld 40f51c31ed Run cargo fmt 2023-02-20 11:10:30 -08:00
Julia ba93ab6676 Merge pull request #2192 from zed-industries/format-ci-enforcement
Enforce rustfmt on CI & clean up some let-else format errors
2023-02-20 13:55:34 -05:00
Max Brunsfeld f52b56715e Add test that loads all bundled languages 2023-02-20 10:53:37 -08:00
Max Brunsfeld c82fcbf654 Add missing comment pattern to TSX overrides query 2023-02-20 10:53:37 -08:00
Max Brunsfeld d6b369095f Restructure how bracket pairs are overridden to unify lists
This way, a bracket pair that is disabled in a given scope can still be skipped, if
it was auto-closed before that scope existed.
2023-02-20 10:53:37 -08:00
Max Brunsfeld 5c36234243 Merge branch 'main' into randomized-tests-operation-script 2023-02-20 10:39:00 -08:00
Julia 5082654241 Enforce rustfmt on CI & clean up some let-else format errors 2023-02-20 13:27:35 -05:00
Max Brunsfeld 853c34fdfb Merge pull request #2187 from zed-industries/save-untitled-buffer-bugs
Fix newly-discovered bugs in saving untitled buffers
2023-02-20 10:05:58 -08:00