yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
39175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 55952a4877 Add cmd-n and cmd-o to the default keymap 2022-05-19 14:39:06 -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
Keith Simmons e7227afe72 Merge pull request #1022 from zed-industries/editor-clone-selections 
Clone selections on editor split
 2022-05-19 12:49:43 -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 680dfbf0e0 Merge pull request #1018 from zed-industries/generate-themes-on-build 
Remove checked-in theme JSON files
 2022-05-18 14:26:54 -07: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 Brunsfeld 47ffa08c12 Write theme files atomically 2022-05-18 14:07:32 -07:00
Max Brunsfeld 5841225da8 Ensure /assets/themes directory exists 2022-05-18 12:43:26 -07:00
Max BrunsfeldandKeith Simmons 364dd472b7 Install node for run tests CI job 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-05-18 12:43: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
Max Brunsfeld fabed9ed3d 🔥 .zed.toml 2022-05-18 11:01:35 -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
Nate Butler 8f8ca78d50 Merge pull request #1012 from zed-industries/clean-up-themes 
Clean up themes
 2022-05-18 11:52:39 -04:00
Nate Butler 8ca222d4bb Clean up themes 
- Allow themes to have only a light or dark variant
- Added a commented template file
- Run formatter
 2022-05-18 11:41:56 -04:00
Antonio Scandurra 5962272eef Merge pull request #1010 from zed-industries/fix-stale-wrap-snapshot 
Bump `FoldSnapshot` version if excerpt gets edited outside of its bounds
 2022-05-18 10:44:08 +02: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 Brunsfeld f42fd9eda7 Merge pull request #1007 from zed-industries/dedup-contact-notifications 
Avoid creating duplicate notifications
 2022-05-17 11:29:10 -07:00
Max BrunsfeldandNathan Sobo 221bb40dc4 Avoid duplicate notifications 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-17 11:19:22 -07:00
Nate Butler c2ce23b3d3 Merge pull request #1005 from zed-industries/update-light-theme-borders 
Update light theme borders
 2022-05-17 13:30:15 -04:00
Nate Butler dde6e2985f Update light theme borders 2022-05-17 13:14:11 -04:00
Nathan Sobo df50166a08 v0.34.0 2022-05-17 11:10:21 -06:00
Nathan Sobo 7124c42669 Merge pull request #1003 from zed-industries/moar-logs 
Log JSON in Kubernetes
 2022-05-17 11:09:10 -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 Scandurra cf18e32d6b Merge pull request #1001 from zed-industries/request-to-join-project 
Request to join projects instead of sharing/unsharing
 2022-05-17 16:30:25 +02: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 ScandurraandNathan Sobo 5b4abf1109 Dynamically load all themes listed under styles/src/themes/*.ts 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-17 16:08:14 +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
Antonio Scandurra e062c97b68 WIP: accept to join requests if user is already participating 
There's a panic caused by `Store::check_invariants` that we still
need to figure out.
 2022-05-17 13:21:20 +02:00
Antonio Scandurra 70d91a0cff Hold a weak handle to Presenter when dispatching events 
This ensures that the only strong reference to the presenter is held
by `App`. This is important because we want to call `flush_effects`
when removing a window and implicit drops of the `Presenter` would
make that hard.

Before this commit, if a rendered view contained strong handles to
views and models, we would only drop them on the next `flush_effects`.
This was manifesting itself in `Project`s not being released when
closing their containing window.
 2022-05-17 13:04:38 +02:00
Antonio Scandurra 3bc2358e17 Send LeaveProject when waiting room is dismissed while waiting 2022-05-17 11:25:14 +02:00
Nathan Sobo 6be7161888 Cancel join requests when the requester closes the window 2022-05-16 20:29:36 -06:00
Nathan Sobo 30a1f0275b Refine messages on waiting to join screen and include host avatar 2022-05-16 16:52:31 -06:00
Keith Simmons 9d455bb648 Merge pull request #999 from zed-industries/update-theme-system 
Rework color schemes
 2022-05-16 15:28:18 -07:00
Nate ButlerandKeith Simmons e9137fa0b1 Rework color schemes 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-05-16 18:11:22 -04:00
Nate Butler d60fb0cb7d Remove the focused token 
Currently we don't have any concept of a true focus state. All states we currently use focus should actually be `active`.

Removing this token until we introduce a distinction between active and focused states.
 2022-05-16 15:38:06 -04:00
Nathan Sobo 9620e6e77b Remove "They won't know if you decline" message 2022-05-16 13:15:46 -06:00
Antonio ScandurraandNathan Sobo 1738d4dbbe Show the reason why a join request was declined 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-16 19:57:50 +02:00