Commit Graph
14844 Commits
Author SHA1 Message Date
Piotr Osiewicz 9d2ee4e244 Start emitting notifications for calls 2023-11-24 00:52:44 +01:00
Piotr Osiewicz 2b592c03f3 Allow calling an user, render contacts in collab panel 2023-11-23 16:19:25 +01:00
Piotr Osiewicz fd6d092d58 Authenticate on app startup 2023-11-23 15:08:21 +01:00
Piotr Osiewicz a77236438c Remove redundant comment 2023-11-23 15:03:54 +01:00
Piotr Osiewicz 53c0eb5d47 Merge branch 'main' into collab_ui-zed2 2023-11-23 15:02:55 +01:00
Piotr Osiewicz 8e25303889 Add basic call/user UI in top-right corner.
Allow ui::Avatar to take custom data instead of always relying on URI resolution
2023-11-23 15:00:13 +01:00
Piotr Osiewicz e1430aa71a Add scripts for running Zed2 collab environment (#3395)
./script/zed-local now looks for "--zed2" flag in its args and runs Zed2
binaries instead of zed1. 'foreman start' can be launched with '-f
Procfile.zed2" argument to launch zed2 collab server.

Release Notes:

- N/A
2023-11-23 14:45:52 +01:00
Piotr Osiewicz 648520cb16 Add scripts for running Zed2 collab environment
./script/zed-local now looks for "--zed2" flag in its args and runs Zed2 binaries instead of zed1.
'foreman start' can be launched with '-f Procfile.zed2" argument to launch zed2 collab server.
2023-11-23 14:19:06 +01:00
Antonio Scandurra 811f503b48 Rename element-related traits (#3390)
@as-cii I think this naming makes more sense. If you like it, can you
push forward?

Release Notes:

- N/A
2023-11-23 13:03:05 +01:00
Antonio Scandurra 8d1bfd142c Merge branch 'main' into rename-element-traits
# Conflicts:
#	crates/gpui2/src/elements/uniform_list.rs
#	crates/ui2/src/components/context_menu.rs
#	crates/ui2/src/components/list.rs
2023-11-23 12:47:46 +01:00
Joseph T. Lyons 46f9834067 Add app events (#3372)
Adds app events (`first open` and `open`). For the time being, I'm
abandonding trying to add `close`, after running into many issues
trying. The code is in place for me to continue on that work, but at the
moment, we require having the telemetry settings in hand when calling
any of the methods that log an event, so we can honor the user's
preference for sending telemetry or not, but when running the
`on_app_close` method, to send off an app `close` event, the settings
are no longer available (probably the order of teardown?), which causes
some tests to end up failing. I'm not sure how to solve this. Maybe we
keep the settings on the telemetry struct and update it each time any
event is logged, then, on app shutdown, when logging the app `close`
event, we can use the stored version (idk).

Release Notes:

- N/A
2023-11-22 23:16:28 -05:00
Joseph T. Lyons 3d0fe1fdae Remove unused import 2023-11-22 23:03:11 -05:00
Joseph T. Lyons 16c9f9729e Disable app close event 2023-11-22 23:01:31 -05:00
Joseph T. Lyons a57ce5097a Remove comments 2023-11-22 23:01:18 -05:00
Julia a2d8ddf4c7 zed2(ish) Cancel completion resolution when new list (#3391)
Release Notes:

- N/A
2023-11-22 18:44:34 -05:00
Mikayla Maki 209d6eaa31 Fix pane splitting panic (#3381)
Also opens the window on startup.

Release Notes:

-
2023-11-22 14:12:28 -08:00
Piotr Osiewicz 77154619f3 ci: Add ci-config.toml in .cargo folder. (#3392)
Release Notes:

- N/A
2023-11-22 22:54:16 +01:00
Mikayla f36465f357 Merge branch 'main' into panic-hunting 2023-11-22 13:47:17 -08:00
Mikayla 9d7963040d Fix failing test 2023-11-22 13:41:48 -08:00
Piotr Osiewicz 2df0a46cbe Decouple workspace from call (#3380)
This PR decouples `call2` from `workspace2` in order to improve our
compile times.
Why pick such a small, innocent crate as `call`? It depends on
`live_kit_client`, which is not-so-innocent and is in fact stalling our
clean builds.
In this PR, `call2` depends on `workspace2`; workspace crate defines a
`CallHandler` trait for which the implementation resides in `call`; it
it then all tied together in `zed`, which passes a factory of `Box<dyn
CallHandler>` into workspace's `AppState`.
Clean debug build before this change: ~1m45s
Clean debug build after this change: ~1m25s

Clean release build before this change: ~6m30s
Clean release build after this change: ~4m30s

~Gonna follow up with release timings where I expect the change to be
more impactful (as this allows 2/3 of the infamous trio of
"project-workspace-editor" long pole to proceed quicker, without being
blocked on live-kit-client build script)~.
This should have little effect (if any) in incremental scenarios, where
live_kit_client is already built.
[release
timings.zip](https://github.com/zed-industries/zed/files/13431121/release.timings.zip)

Release Notes:
- N/A
2023-11-22 22:31:47 +01:00
Julia e3e29009bf zed2(ish) Cancel completion resolution when new list 2023-11-22 16:26:27 -05:00
Joseph T. Lyons cc2fb1ce75 Remove dbg 2023-11-22 16:26:15 -05:00
Piotr Osiewicz 2091d6f028 ci: Add ci-config.toml in .cargo folder. 2023-11-22 22:25:26 +01:00
Joseph T. Lyons e6b98f983c Revert "Convert telemetry into a model"
This reverts commit dccb75b43f.
2023-11-22 16:16:44 -05:00
Joseph T. Lyons 51855f173c Merge branch 'main' into add-app-events 2023-11-22 16:16:11 -05:00
Joseph T. LyonsandJulia dccb75b43f Convert telemetry into a model
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-11-22 16:16:10 -05:00
Julia 2704b92d2e zed1: Cancel completion resolution when new list (#3389)
Release Notes:

- Fixed a bug where Zed would continue to request documentation for
completion lists which were stale or no longer visible.
2023-11-22 14:23:09 -05:00
Julia efb2de7ae8 Update copilot when we are the last task 2023-11-22 14:03:43 -05:00
Antonio Scandurra e0ca0d17b7 Fix positioning editor2's context menu when scrolling up/down (#3388)
Release Notes:

- N/A
2023-11-22 19:56:36 +01:00
Piotr Osiewicz 6f30cfcf9b Fix warnings in unimplemented function 2023-11-22 19:24:38 +01:00
Piotr Osiewicz f6e2e425dd Add dummy call handler for tests 2023-11-22 19:23:58 +01:00
Nathan Sobo d50a688a33 Reorganize element-related traits 2023-11-22 11:19:43 -07:00
JuliaandMax Brunsfeld a63dda8205 zed1: Cancel completion resolution when new list
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-11-22 13:16:52 -05:00
Joseph T. Lyons 58ebecc8c7 collab 0.29.0 2023-11-22 13:05:29 -05:00
Antonio Scandurra 496e54b117 Correctly swap position of context menu 2023-11-22 19:02:44 +01:00
Joseph T. Lyons ecd1b1f519 v0.115.x dev 2023-11-22 12:57:32 -05:00
Marshall Bowers 057e8c6620 Rework ListItem to use children (#3387)
This PR reworks the `ListItem` component to accept `children` rather
than just a `Label`.

This is a step towards making the `ListItem` component more open.

As part of this the `ContextMenu` was simplified to only construct the
various list components in `render` rather than holding them as part of
its state.

Release Notes:

- N/A
2023-11-22 12:55:20 -05:00
Marshall Bowers f940e0e565 Use children for ListItems 2023-11-22 12:44:51 -05:00
Marshall Bowers 9223a86e67 Simplify ContextMenu by not storing list components 2023-11-22 12:41:29 -05:00
Marshall Bowers c109cec0cf Comment out todo!() to fix panic when opening context menus 2023-11-22 12:41:06 -05:00
Antonio Scandurra 08a47a644c Fix drawing uniform list elements when scrolling 2023-11-22 18:32:02 +01:00
Antonio Scandurra b060df06f9 Fix scrolling in gpui2::UniformList (#3386)
Release Notes:

- N/A
2023-11-22 18:10:49 +01:00
Antonio Scandurra b2fa7da14d Track scroll in editor's context menu 2023-11-22 17:58:00 +01:00
Antonio Scandurra f2ec8d37e8 Use interactivity's base style for UniformList 2023-11-22 17:50:34 +01:00
Antonio Scandurra 878700a72a Initial autocomplete support for editor2 (#3383)
Release Notes:

- N/A
2023-11-22 16:02:37 +01:00
Piotr Osiewicz 57c8cd9140 CI: use global config toml (#3384)
It looks like we should keep RUSTFLAGS consistent in CI if possible;
some commands augmented RUSTFLAGS with "-D warnings" which overrode
`.cargo/config.toml`, causing unnecessary rebuilds even for non-bundling
runs. Tl;dr: for the last few days our average CI time spiked
significantly.
There are several solutions:
- We can place `-D warnings` in our `.cargo/config.toml`. That's not a
good solution, because then you wouldn't ever be able to build Zed with
warnings locally. A true PITA!
- We can place another config.toml somewhere in the search path
(https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure)
and rely on the merging of properties. That way we can avoid having `-D
warnings` on developer machines while being able to override CI
behaviour at will.

This PR implements the latter approach by creating the new config file
manually. Ideally we should have it a a separate file in repository
that's moved into $HOME/.cargo on each CI run. Maybe we should even
place it somewhere more local to the checked out Zed version, as placing
it in a global spot is kinda bad too - what if we start building
multiple cargo projects on our CI machines?

Release Notes:

- N/A
2023-11-22 15:25:43 +01:00
Piotr Osiewicz 47a59b09d1 Bump artifact size limit for CI to 100GB 2023-11-22 15:14:24 +01:00
Piotr Osiewicz 538adedbf1 Use printf instead of echo 2023-11-22 14:41:26 +01:00
Piotr Osiewicz 6df0319369 Change tabs to spaces 2023-11-22 14:37:41 +01:00
Piotr Osiewicz ae4b4e55e9 chore/CI: place .cargo/config.toml augmentations in ~/.cargo/config.toml 2023-11-22 14:36:10 +01:00