Commit Graph
928 Commits
Author SHA1 Message Date
Piotr Osiewicz 625814d30a Merge branch 'main' into collab-titlebar-2 2023-06-27 15:40:43 +02:00
Antonio Scandurra 6f0efec146 Merge remote-tracking branch 'origin/main' into save-conversations 2023-06-23 09:09:42 +02:00
Piotr Osiewicz af252888c4 Merge branch 'main' into sergey/z-2308-create-a-proof-of-concept-of-exporting-a-type-from-rust-and 2023-06-22 17:58:56 +02:00
Piotr Osiewicz 76366422a6 Merge branch 'main' into collab-titlebar-2 2023-06-22 13:48:16 +02:00
Nate Butler 6ab0143469 Split Interactive into Interactive and Toggleable (#2628)
This is a part of the intensity driven theme rewrite. 

It introduces the `toggle` and `interactive` helper functions to build
Toggle<T> and Interactive<T> styles for interactive elements in the
theme.

This PR also removes the `theme_testbench` crate and related actions.

Huge thanks to @osiewicz and @mikayla-maki for pushing this forward 🙏🏽

Release Notes:

- Updated the style of many interactive elements.
2023-06-21 15:03:08 -04:00
Joseph T. Lyons cc027dc626 v0.93.x dev 2023-06-21 13:59:07 -04:00
Piotr Osiewicz 86506a89ab Remove theme_testbench 2023-06-21 19:11:55 +02:00
Piotr Osiewicz d3a333b873 Tidy up xtask 2023-06-21 19:06:34 +02:00
Piotr Osiewicz 9aa7a50951 Use xtask for theme generation 2023-06-21 18:48:09 +02:00
Nathan SoboandJulia Risley 23bc11f8b3 Remove the nested Pane from the assistant
Since we don't want tabs, I think it would be better to render the toolbar
for ourselves directly and handle switching between conversations.

Co-Authored-By: Julia Risley <julia@zed.dev>
2023-06-20 18:52:48 -06:00
Nathan SoboandKyle Caverly 230b4d237e Add SavedConversation::list() method
Co-Authored-By: Kyle Caverly <kyle@zed.dev>
2023-06-20 13:29:34 -06:00
Antonio Scandurra 6ed86781b2 Instruct the assistant to reply to a specific message (#2631)
Closes
https://linear.app/zed-industries/issue/Z-2384/hitting-cmd-enter-in-a-user-or-system-message-should-generate-a

Release Notes:

- Introduced the ability to generate assistant messages for any
user/system message, as well as generating multiple assists at the same
time, one for each cursor. (preview-only)
2023-06-20 18:16:23 +02:00
Antonio Scandurra 8673b0b75b Avoid including pending or errored messages on assist 2023-06-20 11:59:51 +02:00
Piotr Osiewicz 2a3c660d1f settings: accept trailing commas (#2606)
Z-2357

I've found a crate that handles both comments and trailing commas in
JSON. It is a fork of `serde_json`, but it is maintained & up-to-date.
Sadly RawValue seems to not play nicely with it; I've ran into
deserialisation issues around use of RawValue. For this PR I've migrated
to `Value` API.

Obviously this is just a point of discussion, not something I'd merge
straight away. There may be better solutions to this particular problem.

I've also noticed that `serde_json_lenient` does not handle trailing
commas after bindings array. I'm not sure how big of an issue that is.

Release Notes:
- Improved handling of trailing commas in settings files.
[#1322](https://github.com/zed-industries/community/issues/1322)
2023-06-19 18:29:03 +02:00
Sergey Onufrienko ac42522987 chore: remove ts-rs 2023-06-16 21:45:37 +02:00
Piotr Osiewicz 092cf93dae Move zed actions to zed-actions 2023-06-15 22:05:43 -07:00
Piotr Osiewicz 4b87ce8952 add zed-actions crate 2023-06-15 22:05:43 -07:00
Piotr Osiewicz 0fe65b945f Remove user avatar from dropdown menu
Add new options in context menu
2023-06-15 22:05:43 -07:00
Joseph Lyons 2e723cac62 v0.92.x dev 2023-06-14 13:27:36 -04:00
Max Brunsfeld df76ab98cf Add Heex language 2023-06-12 17:32:20 -07:00
Max Brunsfeld 594b9def20 Upgrade Tree-sitter 2023-06-12 15:31:59 -07:00
Max Brunsfeld 086cfe57c5 Start work on a syntax tree view 2023-06-12 15:14:56 -07:00
Sergey Onufrienko b494b43496 chore: add ts-rs 2023-06-12 22:12:24 +02:00
Max Brunsfeld c1f1ee6b05 collab 0.14.2 2023-06-09 11:50:35 -07:00
Max Brunsfeld 097632467d collab 0.14.1 2023-06-09 11:37:47 -07:00
Max Brunsfeld 9cbb63d374 collab 0.14.0 2023-06-09 11:12:45 -07:00
Max Brunsfeld afaff7f9a9 Merge branch 'main' into lsp-log-messages 2023-06-08 08:49:08 -07:00
Max Brunsfeld 817644eb20 Style new lsp log menu, add a test for it 2023-06-08 08:43:25 -07:00
Mikayla Maki 28ba27c9c5 Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Max Brunsfeld 11ab1a8cc6 collab 0.13.1 2023-06-07 10:54:27 -07:00
Max Brunsfeld be8d268eb9 Bump tree-sitter-yaml submodule to avoid broken child submodule 2023-06-07 10:50:03 -07:00
Max Brunsfeld 6067575e38 collab 0.13.0 2023-06-07 09:29:58 -07:00
Joseph Lyons 8882b22c9c v0.91.x dev 2023-06-07 11:57:41 -04:00
Antonio Scandurra 0dae8f2dd8 Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-07 09:34:16 +02:00
Max Brunsfeld 8dc679e74e Upgrade tree-sitter-elixir 2023-06-06 16:06:16 -07:00
Max Brunsfeld dbbd0558c3 Eliminate assets crate 2023-06-06 11:46:46 -07:00
Antonio Scandurra 7a78e64831 Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-06 19:18:22 +02:00
Julia 5790d6993e Update rust-bindgen dev-dependencies 2023-06-04 23:34:22 -04:00
Antonio Scandurra f00f16fe37 Show remaining tokens 2023-06-02 17:27:21 +02:00
Antonio Scandurra a81d164ea6 Allow saving the OpenAI API key in the assistant panel 2023-06-02 11:38:02 +02:00
Antonio Scandurra d0aff65b1c Allow moving the assistant panel to other docks 2023-06-02 10:55:19 +02:00
Antonio Scandurra 20e65a533c Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-02 09:32:11 +02:00
Max Brunsfeld ae7606ce21 collab 0.12.5 2023-05-31 15:38:26 -07:00
Max Brunsfeld 38078b93cc v0.90.x dev 2023-05-31 14:44:48 -07:00
Mikayla MakiandJulia 22e4086658 WIP: Move statuses to be on their associated file entries in worktree
co-authored-by: Julia <julia@zed.dev>
2023-05-31 11:03:11 -07:00
Joseph Lyons 501f9ab2c6 Scrape email from feedback editor 2023-05-30 15:06:35 -04:00
Antonio Scandurra dc365472a6 Merge remote-tracking branch 'origin/main' into assistant-2 2023-05-30 15:11:06 +02:00
Antonio Scandurra 890c42a75a Show time in assistant messages 2023-05-29 16:23:16 +02:00
Kirill Bulatov fdad1adaf6 Update LSP to the newest version 2023-05-28 21:55:08 +03:00
Nathan SoboandAntonio Scandurra 80080a43e4 Start on an assistant panel based on multi-buffers
Each message is represented as a multibuffer excerpt to allow for
fluid editing of the conversation transcript.

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-05-26 10:09:55 -06:00