bcf0e3f
Merge branch 'pre-merge' into clean-up-doc-elements
Nathan Sobo created
bcf0e3f
Merge branch 'pre-merge' into clean-up-doc-elements
Nathan Sobo created
81b03d3
Rearrange to hopefully make merging easier
Nathan Sobo created
c6ae885
Add more docs
Nathan Sobo created
219999c
theme2: Move stories to RPITIT for Render
Piotr Osiewicz created
6027962
fixup! Work around lifetime woes by turning the element in language_tools2 into any element
Piotr Osiewicz created
fa0d507
Work around lifetime woes by turning the element in language_tools2 into any element
Piotr Osiewicz created
51d1d92
Attempt to return impl Element from render. 3 errors.
Nathan Sobo created
83923fd
Clean up Element API and start on docs
Nathan Sobo created
5f2bb82
Use `ghost_element_background` for avatar background color (#3819)
Also add a couple todo!()s on top of the comments Release Notes: - N/A
Kirill Bulatov created
1c13c3a
Use `ghost_element_background` for avatar background color
Also add a couple todo!()s on top of the comments
Kirill Bulatov created
21f0409
Fix anti-aliasing artifacts in borders
Previously, we changed borders to be drawn after content, so they are no longer part of the same quads as the background. In our change, we gave the background quad a transparent black border and the border quads transparent black backgrounds. However, this caused the other channels to blend toward that black color before becoming fully transparent, causing them to become darker. In this PR, I source the "placeholder" color by duplicating the values for the other channels and only adjust the alpha down to zero.
Nathan Sobo created
4e9fb26
Adjust terminal and popover colors to better match original styling (#3816)
This may have made something else worse, but overall brings us more into harmony. Release Notes: - N/A
Nathan Sobo created
ebd4b53
Remove `async_trait` from the only trait that allows it now (#3817)
* `EmbeddingProvider`, `NodeRuntime`, `Fs`,
`live_kit_server::api::Client` produce messages similar to
```
error[E0038]: the trait `EmbeddingProvider` cannot be made into an object
--> crates/semantic_index/src/semantic_index_tests.rs:1096:51
|
1096 | let mut retriever = CodeContextRetriever::new(embedding_provider);
| ^^^^^^^^^^^^^^^^^^ `EmbeddingProvider` cannot be made into an object
|
note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
--> /Users/someonetoignore/work/zed/zed/crates/ai/src/embedding.rs:73:14
|
73 | async fn embed_batch(&self, spans: Vec<String>) -> Result<Vec<Embedding>>;
| ^^^^^^^^^^^ the trait cannot be made into an object because method `embed_batch` is `async`
= help: the following types implement the trait, consider defining an enum where each variant holds one of these types, implementing `EmbeddingProvider` for this new enum and using it instead:
ai::providers::open_ai::OpenAIEmbeddingProvider
ai::test::FakeEmbeddingProvider
```
* `LspAdapter` produces something even more obscure:
```
error[E0391]: cycle detected when checking effective visibilities
|
note: ...which requires computing type of `<impl at crates/language2/src/language2.rs:122:1: 122:22>::new::{opaque#0}`...
--> crates/language2/src/language2.rs:123:5
|
123 | pub async fn new(adapter: Arc<dyn LspAdapter>) -> Arc<Self> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: ...which requires type-checking `<impl at crates/language2/src/language2.rs:122:1: 122:22>::new`...
--> crates/language2/src/language2.rs:123:5
|
123 | pub async fn new(adapter: Arc<dyn LspAdapter>) -> Arc<Self> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: ...which again requires checking effective visibilities, completing the cycle
note: cycle used when checking that `CachedLspAdapter` is well-formed
--> crates/language2/src/language2.rs:111:1
|
111 | pub struct CachedLspAdapter {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information
```
Release Notes:
- N/A
Kirill Bulatov created
ce8cc50
Remove `async_trait` from the only trait that allows it now
Kirill Bulatov created
e932f4c
Bump Rust to 1.75 (#3815)
**This PR also bumps wasmtime version from 0.38 to 2.0 as 0.38 does not build with Rust 1.75**. I did not test the plugin runtime as (AFAIK) we intend to deprecate it; also, wasmtime's most recent version is 16.0, so it'd make sense to bump the version at some point anyways. I did not bump the version to 16.0 straight away as that'd require code changes in `plugin_runtime`. Release Notes: - N/A
Piotr Osiewicz created
02f7e68
Import elevated surface color from hover popover
Nathan Sobo created
a2b0f14
Rename size to dimensions for consistency
Nathan Sobo created
ddd6f08
Render cursor text with the terminal's background color
Nathan Sobo created
5cfd4b0
Use correct terminal background color
Nathan Sobo created
772429c
More zed2 fixes (#3814)
Kirill Bulatov created
937f237
Add breadcrumbs to the multibuffer editor
The breadcrumbs are not being open on the fisrt time, for some reason.
Kirill Bulatov created
f27c63b
Fix color-related terminal todo!
Kirill Bulatov created
af6f467
Avoid trailing separators in file finder
Kirill Bulatov created
1662659
Remove allow unused from gpui2, vim2 tests and terminal_view2 (#3813)
Release Notes: - N/A
Piotr Osiewicz created
41fb29b
Tidy up main (#3812)
Release Notes: - N/A
Joseph T. Lyons created
ee57658
Fix up superfluous mod declaration
Piotr Osiewicz created
12fe64b
Fix more warnings
Joseph T. Lyons created
9043582
Remove #[allow(unused)] annotations in zed2 crates (#3798)
Release Notes: - N/A
Piotr Osiewicz created
8f3ea6c
Remove silencing of warnings and fix warnings
Joseph T. Lyons created
ada1da4
Remove already-implemented comment
Joseph T. Lyons created
6c21683
Wire up journal (#3811)
Release Notes: - N/A
Joseph T. Lyons created
88d05fd
Wire up journal
Joseph T. Lyons created
11d3526
Migrate from device_id to installation_id key (#3810)
This PR is just a quick house-cleaning PR that I've been meaning to do for awhile. In the past, `installation_id` was called `device_id`. But this name never reflected what it actually was - so we renamed it to `installation_id`, but we kept the name as `device_id` in the `kv_store`. I'm wanting to use the `device_id` key in the future, so to keep things clearly labeled, I'm doing the key rename now. Release Notes: - N/A
Joseph T. Lyons created
81ed861
Migrate from device_id to installation_id key
Joseph T. Lyons created
bab3b23
Remove telemetry debounce time in zed 2 (#3809)
Remove the event send timer in Zed 2 telemetry in effort to continue reducing the amount of stress the vercel endpoint receives. This allows the queues to fill up entirely before sending them off. I'm leaving the timer in for Zed 1 because we don't force the events queue to clear on app close in Zed 1, so it feels best to leave it in there, as it might catch some unsent events before closing. Release Notes: - N/A
Joseph T. Lyons created
58c5720
Remove telemetry debounce time in zed 2
Joseph T. Lyons created
894a033
Add a horizontal separator between history and query file finder matches (#3808)
To avoid confusion with the way file results are matched, add a separator between history and query matches in file finders. Release Notes: - N/A
Kirill Bulatov created
1096eef
Add a horizontal separator between history and query file finder matches
Kirill Bulatov created
1f603af
Hide pane tab bar buttons in certain contexts (#3807)
* entirely remove history navigation buttons in the terminal pane that allows terminal elements only * hide the entire tab bar if no active item is in pane (as in zed1) * hide +/split/zoom buttons when the pane is not in focus (as in zed1) Release Notes: - N/A
Kirill Bulatov created
a249375
Do not show nav history buttons in terminal pane
Kirill Bulatov created
e839dc5
Hide pane tab bar for 0 items, hide its end buttons for no focus
Kirill Bulatov created
698460e
Style inlay hints (#3806)
This PR styles the inlay hints after the changes to the themes. Release Notes: - N/A
Marshall Bowers created
e5148b4
Assign player colors from the theme (#3805)
This PR updates the `theme_importer` to pull in the player colors so that we can assign them based on the current theme. Release Notes: - N/A
Marshall Bowers created
5a910aa
Refine ported Zed1 themes (#3804)
This PR applies another round of refinements to the ported Zed1 themes. Most of this was focused around the coloration of UI text to better match Zed1. Release Notes: - N/A
Marshall Bowers created
14ed4a4
Render project panel entries as muted, unless selected
Marshall Bowers created
446c947
Render breadcrumb using muted colors
Marshall Bowers created
04d2635
Adjust muted text colors
Marshall Bowers created
bdb89d4
Render tab bar tools as muted
Marshall Bowers created
9cb6132
Adjust border colors
Marshall Bowers created
e8a14b1
Adjust color used for text
Marshall Bowers created