Commit Graph
4885 Commits
Author SHA1 Message Date
Max Brunsfeld 9ca58625b8 v0.90.x dev 2023-05-31 14:44:48 -07:00
Mikayla MakiandJulia 3df36f560f 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 85e8064f05 Scrape email from feedback editor 2023-05-30 15:06:35 -04:00
Antonio Scandurra d987c468f8 Merge remote-tracking branch 'origin/main' into assistant-2 2023-05-30 15:11:06 +02:00
Antonio Scandurra 2a6a33c55b Show time in assistant messages 2023-05-29 16:23:16 +02:00
Kirill Bulatov 99509fc6ed Update LSP to the newest version 2023-05-28 21:55:08 +03:00
Nathan SoboandAntonio Scandurra 9e19d9cd3b 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
Antonio Scandurra c7e20b381a Add search bar to terminal panel 2023-05-25 14:46:10 +02:00
Nathan Sobo a30ba2765a Introduce the ability to talk to GPT-4 within buffers on preview and dev (#2524)
This adds basic ability to interact with OpenAI inside a buffer.

Release Notes:

* If`OPENAI_API_KEY` is defined in your environment, you can now run the
`ai: assist` command to pass the text of your current buffer to GPT-4.
If you're editing a file with a `.zmd` extension, you can also invoke
the model with `cmd-enter.` (preview-only)
2023-05-24 12:00:43 -06:00
Joseph Lyons 392e4b1c3f v0.89.x dev 2023-05-24 13:22:00 -04:00
Nathan Sobo 0d72a3bec6 Merge remote-tracking branch 'origin/main' into zmd 2023-05-24 11:04:07 -06:00
Nathan Sobo 60a74a9b3f WIP 2023-05-23 01:52:37 -06:00
Nathan Sobo cc2cac108a WIP 2023-05-23 01:23:01 -06:00
Antonio Scandurra dee6f22ca2 Merge remote-tracking branch 'origin/main' into panels 2023-05-23 08:24:28 +02:00
Nathan Sobo 2f2061db74 WIP 2023-05-22 23:11:27 -06:00
Mikayla Maki b9317166d5 Add initial project panel settings 2023-05-22 20:23:07 -07:00
Nathan Sobo 6fe2c44718 WIP: Stream in completions
Drop dependency on tokio introduced by async-openai and do it ourselves.

The approach I'm taking of replacing instead of appending is causing issues. Need to just append.
2023-05-22 20:28:22 -06:00
Antonio Scandurra 3b6f02b247 Persist project and terminal panel sizes 2023-05-22 15:55:44 +02:00
Antonio Scandurra 8f56c80d68 Merge branch 'main' into panels 2023-05-22 14:10:17 +02:00
Nathan Sobo 2e1780fc3e Parse markdown into an OpenAI chat completion request 2023-05-20 09:43:12 -06:00
Max Brunsfeld fbad8fc1e4 Replace remaining usages of glob crate with globset 2023-05-19 09:36:46 -07:00
Max Brunsfeld aa9891ee9e Optimize matching of multiple file-watch globs using the globset crate 2023-05-19 09:13:34 -07:00
Max Brunsfeld b2a5ea65d2 collab 0.12.4 2023-05-18 14:58:57 -07:00
Max Brunsfeld 39764dc5c1 Improve collab logging (#2487)
This adds some logging to the collab server, to help us identify the
source of the collaboration latency we're seeing in the 0.87 preview
version of zed.
2023-05-18 14:17:17 -07:00
Max Brunsfeld f19a84dfdf collab 0.12.3 2023-05-18 12:27:08 -07:00
Joseph Lyons 2edf8884d6 collab 0.12.2 2023-05-18 12:27:01 -07:00
Kirill BulatovandMax 5d30032cd1 Show navigation history in the file finder modal
co-authored-by: Max <max@zed.dev>
2023-05-18 21:50:38 +03:00
Max Brunsfeld 7fbdbffbbc Merge branch 'main' into setting-store 2023-05-17 14:56:35 -07:00
Max Brunsfeld c261a01c7f Define theme/ui text style settings in theme crate 2023-05-17 14:44:59 -07:00
Max Brunsfeld 460d6d652a Define base keymap setting in welcome crate 2023-05-17 11:23:09 -07:00
Julia 20f4908b3a Merge pull request #2481 from zed-industries/update-font-kit
Update font-kit to resolve panics when loading malformed fonts
2023-05-17 13:57:39 -04:00
Julia b636bab434 Update font-kit to resolve panics when loading malformed fonts 2023-05-17 13:38:54 -04:00
Max Brunsfeld ca02b558c8 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Joseph Lyons 609d65c5a8 v0.88.x dev 2023-05-17 12:39:08 -04:00
Max Brunsfeld 09f37a2fe9 Define workspace settings in workspace crate 2023-05-16 20:25:18 -07:00
Max Brunsfeld 2f05e3d502 Define project settings in project crate 2023-05-16 17:45:04 -07:00
Max Brunsfeld a802da9dae Define editor settings in editor crate 2023-05-16 17:30:29 -07:00
Max Brunsfeld 56f2ff64ed Define language settings in the language crate 2023-05-16 17:29:53 -07:00
Kirill Bulatov 0708442690 Unify path:row:column parsing, use it in CLI 2023-05-16 21:07:26 +03:00
Kirill BulatovandMax d378829d11 Test caret selection in file finder
co-authored-by: Max <max@zed.dev>
2023-05-16 21:07:26 +03:00
Mikayla Maki 8e263a30c6 Refactor out git status into FileName component
Integrate file name component into the editor's tab content
2023-05-13 02:26:45 -07:00
Mikayla Maki 4e408e7758 Added status trickle up 2023-05-11 12:01:42 -07:00
Max Brunsfeld 22a7b8e227 Define terminal settings in terminal crate 2023-05-10 17:43:10 -07:00
Mikayla Maki e920ede88c Revert "Convert git status calculation to use Entry IDs as the key instead of repo relative paths"
This reverts commit 728c6892c924ebeabb086e308ec4b5f56c4fd72a.
2023-05-10 17:37:36 -07:00
Mikayla Maki ea28af0c6a Convert git status calculation to use Entry IDs as the key instead of repo relative paths 2023-05-10 17:37:36 -07:00
Mikayla Maki 50e99845ca Added git status to the project panel, added worktree test 2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 94ec496577 Add git status to the file system abstraction
co-authored-by: petros <petros@zed.dev>
2023-05-10 17:37:36 -07:00
Joseph Lyons 9f1015be60 collab 0.12.1 2023-05-10 18:16:20 -04:00
Joseph Lyons d6e43c6160 v0.87.x dev 2023-05-10 16:47:09 -04:00
Max Brunsfeld 8abefb23c5 Define journal settings in journal crate 2023-05-10 12:59:24 -07:00