Commit Graph
31406 Commits
Author SHA1 Message Date
Antonio ScandurraandNathan Sobo a16c11af5b Correctly assign ignored status in refresh_entry
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-05-23 19:19:13 +02:00
Antonio Scandurra 3acad1f75c WIP: stream ignored entries 2022-05-23 16:38:16 +02:00
Antonio Scandurra 039dccc483 Show ignored entries in project panel 2022-05-23 16:37:57 +02:00
Antonio Scandurra c96ff01fbb Fix worktree::Snapshot::entries(true) always being empty 2022-05-23 15:38:20 +02:00
Antonio Scandurra 2ec31aa0b6 Broadcast proto::UnregisterProject when host closes a project 2022-05-23 15:38:01 +02:00
Antonio Scandurra 2893b2c9a5 🎨 2022-05-23 09:48:00 +02:00
Antonio Scandurra fc8df3980f Restart FSEventStream at the last seen event when "dropped" is reported 2022-05-23 09:33:10 +02:00
Antonio Scandurra d3d8656a5f Pass a richer State pointer to fsevents trampoline
This will be useful to re-instate a new stream when dropping events.
2022-05-23 09:08:32 +02:00
Max Brunsfeld 259d76aa40 Start work on handling multibuffers properly when closing unsaved buffers 2022-05-22 16:48:33 -07:00
Antonio Scandurra 1fb594a0ac Clear multi-buffer redo stack when pushing transaction onto undo stack 2022-05-22 10:44:32 +02:00
Antonio Scandurra 71dfc5d915 Clear redo stack when pushing remote transaction or ending a local one 2022-05-22 10:33:26 +02:00
Nathan Sobo ed5f5dc722 Accept an optional email address when creating new users 2022-05-20 20:25:21 -06:00
Max Brunsfeld 3519a4ed45 Add "Close Window" command 2022-05-20 16:53:03 -07:00
Max Brunsfeld 4f8c867287 Add "Save As" command 2022-05-20 16:24:42 -07:00
Max Brunsfeld e15ed5e5d6 Add "Add Folder to Project" command to application menu 2022-05-20 16:19:43 -07:00
Max Brunsfeld 6082282925 Add "New Window" command 2022-05-20 11:01:20 -07:00
Max Brunsfeld 8b5b908985 Merge pull request #1023 from zed-industries/app-menu-improvements
Correctly populate application menus' keystrokes and enabled status
2022-05-20 10:22:20 -07:00
Max Brunsfeld d1dc5d73f9 Disable menu item key equivalents while there are pending keystrokes 2022-05-20 10:04:43 -07:00
Antonio ScandurraandNathan Sobo c34ead1401 Rename first_connection to connected_once
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-05-20 17:35:00 +02:00
Antonio ScandurraandNathan Sobo 5954c1b146 Show contacts panel the first time a new user connects to collab
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-05-20 17:33:09 +02:00
Antonio Scandurra bb53ff8611 Send a ShowContacts message the first time a user connects to collab 2022-05-20 15:47:14 +02:00
Antonio Scandurra d3a80c0f7c Update users and invite count after an invite gets redeemed 2022-05-20 12:02:31 +02:00
Max Brunsfeld 09dde247f2 Convert function keys to the correct macOS codes for menu items 2022-05-19 17:37:46 -07:00
Nathan SoboandAntonio Scandurra 3b4085b654 Add affordance to copy user's invite link if they have a code
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-05-19 17:57:46 -06:00
Max Brunsfeld 281ca7d5fc Add application menu items 2022-05-19 16:50:40 -07:00
Max Brunsfeld 135cef12b6 Enable and disable application menu items based on the active view 2022-05-19 16:50:40 -07:00
Max Brunsfeld a500249333 Replace build_workspace fn with an initialize function that takes a workspace
This makes it clearer that the function is not providing necessary
dependencies to a workspace, but rather configuring it with all of
the panels and widgets which are defined in downstream crates.
2022-05-19 16:50:22 -07:00
Max Brunsfeld a6cbf0e557 Pass UserStore to ContactsPanel instead of AppState 2022-05-19 14:43:36 -07:00
Max Brunsfeld e6011794ca Remove AppState from workspace actions
This allows those actions to be bound to keystrokes in the keymap.
Also, remove the WorkspaceParams struct, simplify how Workspaces are
constructed.
2022-05-19 14:37:26 -07:00
Nathan SoboandAntonio Scandurra a10b9e8c4c Add ability to get the user for an invite code in collab API
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-05-19 12:35:07 -06:00
Keith Simmons 4ba404bc74 Clone selections on editor split 2022-05-19 11:22:53 -07:00
Nathan SoboandAntonio Scandurra 505e773544 Enable descriptive HTTP errors to be returned from DB layer
For now, we only use this when redeeming an invite code.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-05-19 11:55:55 -06:00
Nathan Sobo 0ad5734c22 WIP 2022-05-19 11:09:44 -06:00
Max Brunsfeld d483d1100d Derive application menu key equivalents from the keymap 2022-05-19 10:04:01 -07:00
Nathan Sobo 7f9e1b321a WIP 2022-05-18 16:14:58 -06:00
Max Brunsfeld 720fed2624 Delete theme files more selectively when regenerating them
Avoid deleting files that will be rewritten later, so that Zed
won't observe states where themes are missing if two zed
processes are running at once.
2022-05-18 14:17:26 -07:00
Max BrunsfeldandKeith Simmons 165b1ed73b Remove checked-in theme JSON files
* Generate the themes on build
* In debug builds, watch the theme sources. When they change, re-generate
  the themes and reload the current theme, removing the need for the
  `theme_selector::Reload` command.

Co-authored-by: Keith Simmons <keith@zed.dev>
2022-05-18 12:43:26 -07:00
Nathan Sobo 304aa0d74a WIP 2022-05-18 11:51:47 -06:00
Nathan SoboandAntonio Scandurra 0331fdef6d Return 404 from API if no user is found
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-05-18 10:32:58 -06:00
Nathan SoboandAntonio Scandurra 597e0563fa Add ability to update invite count to collab API
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-05-18 10:23:08 -06:00
Nathan SoboandAntonio Scandurra dfa2bec181 Add invite codes / counts to users table
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-05-18 09:56:37 -06:00
Antonio Scandurra 65d11f89f4 Bump FoldSnapshot version if excerpt gets edited outside of its bounds
This will cause layers above `FoldMap` to grab a fresh snapshot of the `FoldMap`
and, as a result, of the underlying `MultiBufferSnapshot`. It is a necessary change
because, even though the coordinate space is not affected, a buffer edit taking place
*before* an excerpt range could cause the excerpt buffer rows to change, e.g. if
lines were added or removed. This manifested itself in a randomized test.
2022-05-18 10:13:18 +02:00
Max BrunsfeldandNathan Sobo 221bb40dc4 Avoid duplicate notifications
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-05-17 11:19:22 -07:00
Nathan Sobo df50166a08 v0.34.0 2022-05-17 11:10:21 -06:00
Nathan SoboandAntonio Scandurra d6ac349a3f Log JSON in Kubernetes
If you set LOG_JSON=true, we'll output JSON from the tracing subscriber instead of pretty-printing trace output.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-05-17 11:05:22 -06:00
Antonio ScandurraandNathan Sobo 0bb77237db Show guest only once even if they joined on two different windows
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-05-17 16:21:09 +02:00
Antonio Scandurra 9667786124 Automatically follow host when joining a project 2022-05-17 15:35:57 +02:00
Antonio Scandurra 32b92599e6 Merge branch 'main' into request-to-join-project 2022-05-17 14:55:20 +02:00
Antonio Scandurra 089c32940e Ensure join request reaches the server before disconnecting host in test 2022-05-17 14:50:28 +02:00
Antonio Scandurra 7103be853d Fix Store::remove_connection not removing guests from projects 2022-05-17 14:50:00 +02:00