Commit Graph
1066 Commits
Author SHA1 Message Date
Mikayla 7f16fb40ca Merge branch 'main' into disclosable-component 2023-08-23 16:30:27 -07:00
Piotr Osiewicz ce148b99a5 Bump rust embed (#2883)
This is a follow-up to a recent patch I've submitted to this crate to
improve compile time and runtime (in older versions file lookup was
essentially O(n) with respect to path count, now it's O(log n))

Release Notes:

- N/A
2023-08-24 00:16:35 +02:00
Joseph T. Lyons 4bd17b5eeb collab 0.18.0 2023-08-23 14:19:24 -04:00
Joseph T. Lyons 55fe2f2ce2 v0.102.x dev 2023-08-23 12:49:13 -04:00
Nathan Sobo ec9bebc7f4 Merge branch 'main' into divs 2023-08-22 16:35:56 -06:00
Piotr Osiewicz 45d7ec8260 chore: Update Cargo.lock following rodio PR (#2870)
That's merely a follow-up to a previous PR.
Release Notes:
- N/A
2023-08-21 11:33:06 +02:00
Mikayla cd67d45258 Implement component test page 2023-08-19 16:29:24 -07:00
Mikayla e24c757784 Finish building out adapters and names
Document core traits
Add start for a component storybook
2023-08-19 14:40:05 -07:00
Max Brunsfeld 7dd3b13932 Upgrade Tree-sitter for error recovery bug fix 2023-08-18 11:31:40 -07:00
Nathan Sobo 14368fd0b4 Introduce Refinement trait and derive macro 2023-08-18 01:03:46 -06:00
Max Brunsfeld 62f33adbc5 Return to master branch of alacritty 2023-08-17 15:31:27 -07:00
Max Brunsfeld ca81930220 Use our fork of alacritty to avoid winit dependency (#2853)
Bumps `alacritty_terminal` for
https://github.com/alacritty/alacritty/pull/7149
2023-08-16 14:54:55 -07:00
Max Brunsfeld 65e251d596 Use our fork of alacritty to avoid winit dependency 2023-08-16 14:31:38 -07:00
Kirill Bulatov e1dd34c185 Extract quick_action_bar into its own crate 2023-08-16 23:38:11 +03:00
Nathan SoboandAntonio Scandurra bd7db52bc0 Get text rendering
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-08-16 12:50:35 -06:00
Joseph T. Lyons 45cbc6b7c5 v0.101.x dev 2023-08-16 14:22:54 -04:00
Max Brunsfeld 57a8c6d506 collab 0.17.0 2023-08-16 11:05:08 -07:00
Max Brunsfeld 5b150ecfc7 Introduce channels and move collab popover contents to a collaboration panel (#2828)
### Summary

This PR introduces channels: a new way of starting collaboration
sessions. You can create channels and invite others to join them. You
can then hold a call in a channel, where any member of the channel is
free to join the call without needing to be invited.

Channels are displayed in a new panel called the collaboration panel,
which now also contains the contacts list, and the current call. The
collaboration popover has been removed from the titlebar.

![Screen Shot 2023-08-15 at 9 25 37
AM](https://github.com/zed-industries/zed/assets/326587/0f989dea-7fb7-4d50-9acd-25c8f1c30cd1)


For now, the channels functionality will only be revealed to staff, so
the public-facing change is just the move from the popover to the panel.

### To-do

* User-facing UI
  * [x] signed-out state for collab panel
  * [x] new icon for collab panel
  * [x] for now, channels section only appears for zed staff
* [x] current call section styling
(https://zed-industries.slack.com/archives/C05CJUNF2BU/p1691189389988239?thread_ts=1691189120.403009&cid=C05CJUNF2BU)
* [x] Channel members
* Channels
  * [x] style channel name editor
* [x] decide on a special "empty state" for the panel, when user has no
contacts
* [x] ensure channels are sorted in a consistent way (expose channel id
paths to client)
  * [x] Figure out layered panels UX
  * [x] Change add contacts to be the same kind of tabbed modal
* [x] race condition between channel updates and user fetches
(`ChannelStore::handle_update_contacts`)
* [x] race condition between joining channels and channel update
messages `collab::rpc::channel_updated`)
* [x] don't display mic as muted when microphone share is pending upon
first joining call

Release Notes:

- Moved the collaboration dropdown into its own panel.
- Added settings for disabling the AI assistant panel button.
- Switch to lazily initializing audio output sources
(https://github.com/zed-industries/community/issues/1840,
https://github.com/zed-industries/community/issues/1919)
2023-08-16 11:03:53 -07:00
Kirill Bulatov 6d3e568fdc Move gpui derives tests into gpui crate to avoid dependency cycles
`cargo run` on Zed project leads to rust-analyzer evantually emitting

`[ERROR project_model::workspace] cyclic deps:
gpui_macros(Idx::<CrateData>(269)) -> gpui(Idx::<CrateData>(264)),
alternative path: gpui(Idx::<CrateData>(264)) ->
gpui_macros(Idx::<CrateData>(269))`

error after loading the project.

The PR fixes this by moving away the test to the "root" project.
2023-08-16 10:19:20 +03:00
Nathan SoboandMikayla Maki 64f61d293a Merge branch 'main' into taffy
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-08-14 13:50:21 -06:00
Nathan Sobo 7ce33aaabb WIP 2023-08-13 02:27:36 -06:00
Nathan Sobo 43c97bc0e5 WIP 2023-08-13 01:40:05 -06:00
Mikayla d55c1ad81e Merge branch 'main' into collab-panel 2023-08-12 12:44:22 -07:00
Nathan Sobo f0103e5142 WIP 2023-08-12 10:00:08 -06:00
Nathan Sobo 3b82dbc0c1 Put a Taffy layout engine on window 2023-08-12 00:58:11 -06:00
Mikayla 3a9e050232 Add a compile test for the element derive 2023-08-11 18:00:12 -07:00
Nathan Sobo fc4ea20276 WIP 2023-08-11 07:39:30 -06:00
Nathan Sobo 284414cfba Ditch the hot reloading approach 2023-08-11 00:26:58 -06:00
Nathan Sobo 7e2a227831 What if we base themes on Rose Pine 2023-08-09 20:54:30 -06:00
Mikayla 8b73737072 Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Joseph T. Lyons 9718348b09 v0.100.x dev 2023-08-09 12:30:39 -04:00
Nathan Sobo 2ac55ed691 Merge branch 'main' into cells 2023-08-08 21:23:57 -06:00
Nathan Sobo 5bdfe4199e Merge remote-tracking branch 'origin/main' into window-handles 2023-08-07 22:07:20 -06:00
Mikaylaandmax e5812b5c7f Improve local collaboration script to accept a zed impersonate
Gate channels UI behind a flag

co-authored-by: max <max@zed.dev>
2023-08-07 16:45:13 -07:00
Max Brunsfeld d51cac5ab2 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Nathan Sobo d1e01ba625 WIP 2023-08-06 12:45:31 -06:00
Joseph T. Lyons ad2c456b9a Add more convert to case commands
ConvertToTitleCase
ConvertToSnakeCase
ConvertToKebabCase
ConvertToUpperCamelCase
ConvertToLowerCamelCase
2023-08-04 22:45:26 -04:00
Nathan Sobo 242765b6ad Merge branch 'main' into cells 2023-08-03 19:33:04 -06:00
Joseph T. Lyons 9d55727278 v0.99.x dev 2023-08-02 13:50:30 -04:00
Max Brunsfeld 076649aae1 Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
Nathan Sobo 96f0e2f23f WIP 2023-08-01 20:53:15 -06:00
KCaverly f0b15cc3e7 catchup with main 2023-08-01 10:40:38 -04:00
KCaverly e82851a1e3 add php support for semantic search 2023-07-31 16:36:09 -04:00
KCaverly b590fc72d7 add ruby support for semantic search 2023-07-31 10:54:30 -04:00
KCaverly ab8954ca3e add lua embedding query for semantic search 2023-07-31 10:02:28 -04:00
Mikayla Maki a5868e7658 Move channels panel into collab and rename to collab panel
remove contacts popover and add to collab panel
2023-07-28 13:24:42 -07:00
Mikayla Makiandnate 7593602273 Add channels panel with stubbed out information
co-authored-by: nate <nate@zed.dev>
2023-07-28 13:21:39 -07:00
Mikayla Maki 9636701e6c Add Nix language support (#2781)
This adds rudimentary language support for the Nix expression language,
through tree-sitter-nix.

I spent a little bit of time trying to add support for one of the Nix
language servers too, but wasn't able to get any of them running
reliably without crashing, and so I've opted to stick to just the
tree-sitter grammar for now.


![image](https://github.com/zed-industries/zed/assets/285821/c770f3d8-6fa0-4083-9bf3-239cc78ca307)
2023-07-27 18:35:52 -07:00
Mikayla Maki a4bc62865b update to dependency without symbol conflict 2023-07-27 17:41:13 -07:00
Mikayla MakiandAlex 626eed7659 Update elixir depedency
co-authored-by: Alex <alexviscreanu@gmail.com>
2023-07-27 17:36:09 -07:00