yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,023 Commits 5 Branches 0 Tags
ea579ebcb71bfbcd2a5a1eda4fa00aab29439a5c
Commit Graph
128 Commits
Author SHA1 Message Date
Kirill Bulatov f104a3a48a Add prettier workspace resolution test 2023-11-03 11:02:50 +02:00
Conrad Irwin a1fb3523d3 Merge branch 'main' into zed2 2023-10-27 10:55:15 +02:00
Conrad Irwin 20aba94a6b Clearer error on importing both gpui and gpui2 2023-10-26 10:39:52 +02:00
Piotr OsiewiczandJulia Risley e6a7c8ad89 util: Improve error message for failing requests to GH. (#3159) 
Release notes:
- N/A

Co-authored-by: Julia Risley <julia@zed.dev>
 2023-10-26 10:39:45 +02:00
Mikayla be7e30fbb1 Change from try (reserved keyword) to maybe 2023-10-25 07:10:21 -07:00
Mikayla Maki 2a04fb7b34 Rename IIFE to try 
Too good of an idea to forget
 2023-10-24 21:13:22 +02:00
Antonio Scandurra 3908eb1c4a Checkpoint 2023-10-20 11:44:19 +02:00
Piotr Osiewicz 5c749a5db2 Piotr/z 651 vue support (#3123) 
Release Notes:

- Added Vue language support.
 2023-10-13 18:58:59 +02:00
Marshall Bowers 65db5f3d09 Merge branch 'main' into gpui2 2023-10-12 17:43:05 -04:00
Antonio Scandurra 36ad020380 Merge branch 'main' into gpui2 2023-10-12 10:55:17 +02:00
Kirill Bulatov a7f42aa29e Slightly better prettier settings and discovery 2023-10-11 12:56:29 +03:00
Nathan Sobo b580a6afca WIP 2023-10-10 22:49:47 -06:00
Conrad Irwin 36c95ae516 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Kirill Bulatov 0aca36ab63 Detect file paths that end with : 
New rustc messages look like

```
thread 'tests::test_history_items_vs_very_good_external_match' panicked at crates/file_finder/src/file_finder.rs:1902:13:
assertion `left == right` failed: Only one history item contains collab_ui, it should be present and others should be filtered out
  left: 0
 right: 1
```

now and we fail to parse that `13:` bit properly, fix that.
 2023-10-09 23:55:58 +03:00
Marshall Bowers f403508188 Merge branch 'main' into gpui2 2023-10-07 10:50:05 -04:00
Conrad Irwin f867bbf5c4 More progress and some debug logs to remove 2023-10-06 16:48:29 -06:00
Conrad Irwin 1bad574967 TEMP 2023-10-06 13:47:35 -06:00
Conrad Irwin 9da086cfce Code to allow opening zed:/channel/1234 
Refactored a bit how url arguments are handled to avoid adding too much
extra complexity to main.
 2023-10-05 14:57:45 -07:00
Conrad Irwin 533a921627 Add url schemes to Zed 2023-10-05 14:55:39 -07:00
Antonio Scandurra 0d367cf3ae Checkpoint: render SVGs 2023-10-04 10:51:47 +02:00
Piotr Osiewicz d8ad341bf1 workspace: Improve save prompt. (#3025) 
Add buffer path to the prompt.

Z-2903

Release Notes:
- Added a "Save all/Discard all" prompt when closing a pane with
multiple edited buffers.
 2023-09-25 16:15:29 +02:00
KCaverly 4c41833cfb move git2 to workspace dependency globally 2023-09-19 16:13:47 -04:00
Nathan Sobo 9cc4ef000f Checkpoint 2023-09-14 18:51:03 -06:00
Nathan Sobo 563e18712c Merge branch 'main' into storybook 2023-09-07 07:56:57 -06:00
Nathan Sobo df33a3b609 Add support for fetching/rendering images 2023-09-06 17:13:43 -06:00
Nathan Sobo 501c4c5782 Checkpoint 2023-09-06 15:22:35 -06:00
KCaverlyandMax cdba603eaf move queuing to embedding_queue functionality and update embedding provider to include trait items for max tokens per batch" 
Co-authored-by: Max <max@zed.dev>
 2023-08-30 16:01:28 -04:00
Joseph T. Lyons 9024511498 Fix code that identifies language via extension 2023-08-08 21:35:11 -04:00
Joseph T. Lyons 71e10d21a5 Fix test name 2023-08-07 17:07:01 -04:00
Joseph T. Lyons 6cd508c88b Add PathExt trait (#2823) 
This PR adds a `PathExt` trait. It pulls in our existing `compact()`
function, as a method, and then adds a method, and testing, for
`icon_suffix()`. A test was added to fix:

- https://github.com/zed-industries/community/issues/1877

Release Notes:

- Fixed a bug where file icons would not be registered for files with
with `.` characters in their name
([#1877](https://github.com/zed-industries/community/issues/1877)).
 2023-08-03 18:57:43 -04:00
KCaverly c57fb5fd33 Merge branch 'main' of github.com:zed-industries/zed into vector_store 2023-06-30 09:58:13 -04:00
KCaverly 5e4c3bb185 updated vector_store db to leverage EMBEDDINGS_DIR path 2023-06-29 15:18:32 -04:00
Julia e9e3bd616f Merge branch 'main' into fix-broken-lsp-installations 2023-06-28 16:46:06 -04:00
Nathan Sobo 1584d656ff Save conversations to ~/.config/zed/conversations 
Still need to implement loading / listing.
I'd really be rather write operations to a database. Maybe we
should be auto-saving? Integrating with panes? I just did
the simple thing for now.
 2023-06-16 16:15:07 -06:00
Julia 7353151a33 Many steps toward validating and reinstalling server after failure 2023-06-15 12:18:34 -04:00
Mikayla Maki 35ef109e8d Merge branch 'main' into stream-git-statuses 2023-06-07 14:12:58 -07:00
Max Brunsfeld b6a053f0d0 Eliminate assets crate 2023-06-06 11:46:46 -07:00
Mikayla Maki 066e23ec4e Add file and line number information to logs 2023-06-05 12:53:37 -07:00
Mikayla Maki 619cfe3cec Track git status changes with the changed_paths system 2023-06-05 11:50:23 -07:00
Max Brunsfeld fb4c174fd1 Start work on respecting project-specific settings 2023-05-29 14:25:49 -07:00
Nathan Sobo 0d72a3bec6 Merge remote-tracking branch 'origin/main' into zmd 2023-05-24 11:04:07 -06:00
Nathan Sobo 6999aaefca WIP 2023-05-24 09:21:50 -06: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
Max Brunsfeld ca02b558c8 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Kirill Bulatov 01d344aaf4 Unit test file:row:column parsing 2023-05-16 21:07:48 +03:00
Kirill Bulatov 1508c39e5f Do not break Zed & Zed CLI compatibility 2023-05-16 21:07:47 +03:00
Kirill Bulatov a9d441ae5f Attempt to open rows and columns from CLI input 2023-05-16 21:07:26 +03:00
Kirill Bulatov 0708442690 Unify path:row:column parsing, use it in CLI 2023-05-16 21:07:26 +03:00
Mikayla Maki 4e408e7758 Added status trickle up 2023-05-11 12:01:42 -07:00
Max Brunsfeld 054ad5aeb6 Create proof-of-concept SettingStore struct 2023-05-10 12:59:22 -07:00