oak-team/oak-gpui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,213 Commits 1 Branch 0 Tags
de99dcb0c3a9dbfecff554db077f4818428d4b6a
Commit Graph
4213 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld de99dcb0c3 Add cmd-n and cmd-o to the default keymap 2022-05-19 14:39:06 -07:00
Max Brunsfeld ef0b584532 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
Max Brunsfeld 7445197f4d Derive application menu key equivalents from the keymap 2022-05-19 10:04:01 -07:00
Max Brunsfeld 8dd6ad3116 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 fbacc12672 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 89e91939e4 Write theme files atomically 2022-05-18 14:07:32 -07:00
Max Brunsfeld 47591ec9a7 Ensure /assets/themes directory exists 2022-05-18 12:43:26 -07:00
Max BrunsfeldandKeith Simmons 185bafcc05 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 ec41dd9f18 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 bdeac6b66a 🔥 .zed.toml 2022-05-18 11:01:35 -07:00
Nate Butler 56553c3f90 Merge pull request #1012 from zed-industries/clean-up-themes 
Clean up themes
 2022-05-18 11:52:39 -04:00
Nate Butler 50e3745b92 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 610812eca0 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 c0bf4a5bfd 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 efd9563b25 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 9b29245590 Avoid duplicate notifications 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-17 11:19:22 -07:00
Nate Butler d5c7a96f98 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 72ab5740f1 Update light theme borders 2022-05-17 13:14:11 -04:00
Nathan Sobo 1c9ad942df v0.34.0 2022-05-17 11:10:21 -06:00
Nathan Sobo 1e366b8093 Merge pull request #1003 from zed-industries/moar-logs 
Log JSON in Kubernetes
 2022-05-17 11:09:10 -06:00
Nathan SoboandAntonio Scandurra fb246ac343 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 ad94b4cc73 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 2d986c7968 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 692be10b10 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 8f88803695 Automatically follow host when joining a project 2022-05-17 15:35:57 +02:00
Antonio Scandurra 225536accc Merge branch 'main' into request-to-join-project 2022-05-17 14:55:20 +02:00
Antonio Scandurra 8393bfe032 Ensure join request reaches the server before disconnecting host in test 2022-05-17 14:50:28 +02:00
Antonio Scandurra a828282771 Fix Store::remove_connection not removing guests from projects 2022-05-17 14:50:00 +02:00
Antonio Scandurra 7b161b81b5 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 e0c772db3e 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 cc598a6f71 Send LeaveProject when waiting room is dismissed while waiting 2022-05-17 11:25:14 +02:00
Nathan Sobo d821e7a4c1 Cancel join requests when the requester closes the window 2022-05-16 20:29:36 -06:00
Nathan Sobo 7c3eebf93e Refine messages on waiting to join screen and include host avatar 2022-05-16 16:52:31 -06:00
Keith Simmons 25427f0ff8 Merge pull request #999 from zed-industries/update-theme-system 
Rework color schemes
 2022-05-16 15:28:18 -07:00
Nate ButlerandKeith Simmons af5bb92847 Rework color schemes 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-05-16 18:11:22 -04:00
Nate Butler 7d22ede804 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 91257f308e Remove "They won't know if you decline" message 2022-05-16 13:15:46 -06:00
Antonio ScandurraandNathan Sobo ed6ed99d8f 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
Antonio Scandurra 740ec3d192 WIP: decline pending join requests when project is unregistered 2022-05-16 17:46:08 +02:00
Antonio Scandurra aa90c06012 Display a temporary window while remote project is loading 2022-05-16 17:45:50 +02:00
Antonio Scandurra e6576b32b2 Don't show "they won't know if you decline" when request is accepted 2022-05-16 15:37:29 +02:00
Antonio Scandurra c2973f33c2 Uncomment randomized tests for contacts 2022-05-16 15:13:32 +02:00
Antonio Scandurra 47ce8ae05c Poll snapshot after refreshing entry 2022-05-16 11:50:21 +02:00
Antonio Scandurra b144995f27 Grab share state after retrieving metadata when refreshing entry 2022-05-16 11:46:49 +02:00
Antonio Scandurra 576656ccf2 Delete commented-out code 2022-05-16 09:50:36 +02:00
Antonio Scandurra bf638afac5 Initialize UserStore before client connects in integration tests 
This fixes a failure in `test_contacts` where we were receiving the
initial `proto::UpdateContacts` message before `UserStore` had a chance
to register a message handler for it.
 2022-05-16 09:48:24 +02:00
Keith Simmons a7937f2d48 Merge pull request #997 from zed-industries/fix-outline-panic 
Make multibuffer read pub(crate) and replace with accessors
 2022-05-13 17:07:43 -07:00
Max Brunsfeld 842bfae3af WIP - update worktree's scan_id when mutating it in the foreground 2022-05-13 17:03:48 -07:00
Keith Simmons a2fd41174f Reduce accessibility of multibuffer read to reduce risk of borrowing snapshot and buffer refcells twice 2022-05-13 16:58:30 -07:00
Keith Simmons 2f7eb6dbc5 Merge pull request #973 from zed-industries/selections-refactor 
Pull selections out of editor into selections collection
 2022-05-13 16:07:26 -07:00