bf39968
Return `TextRun`s in `combine_syntax_and_fuzzy_match_highlights`
Antonio Scandurra created
bf39968
Return `TextRun`s in `combine_syntax_and_fuzzy_match_highlights`
Antonio Scandurra created
7001684
Avoid binary target name conflicts (#3401)
Fixes binary build warnings such as https://github.com/zed-industries/zed/actions/runs/6980107733/job/18994693722#step:5:9 ``` warning: output filename collision. The bin target `dotenv` in package `collab2 v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab2)` has the same output filename as the bin target `dotenv` in package `collab v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab)`. Colliding filename is: /Users/administrator/actions-runner-1/_work/zed/zed/target/debug/dotenv The targets should have unique names. Consider changing their names to be unique or compiling them separately. This may become a hard error in the future; see <https://github.com/rust-lang/cargo/issues/6313>. warning: output filename collision. The bin target `dotenv` in package `collab2 v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab2)` has the same output filename as the bin target `dotenv` in package `collab v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab)`. Colliding filename is: /Users/administrator/actions-runner-1/_work/zed/zed/target/debug/dotenv.dSYM The targets should have unique names. Consider changing their names to be unique or compiling them separately. This may become a hard error in the future; see <https://github.com/rust-lang/cargo/issues/6313>. warning: output filename collision. The bin target `seed` in package `collab2 v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab2)` has the same output filename as the bin target `seed` in package `collab v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab)`. Colliding filename is: /Users/administrator/actions-runner-1/_work/zed/zed/target/debug/seed The targets should have unique names. Consider changing their names to be unique or compiling them separately. This may become a hard error in the future; see <https://github.com/rust-lang/cargo/issues/6313>. warning: output filename collision. The bin target `seed` in package `collab2 v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab2)` has the same output filename as the bin target `seed` in package `collab v0.28.0 (/Users/administrator/actions-runner-1/_work/zed/zed/crates/collab)`. Colliding filename is: /Users/administrator/actions-runner-1/_work/zed/zed/target/debug/seed.dSYM The targets should have unique names. Consider changing their names to be unique or compiling them separately. This may become a hard error in the future; see <https://github.com/rust-lang/cargo/issues/6313>. ``` by suffixing the collab2 binaries with `2`. Release Notes: - N/A
Kirill Bulatov created
e19860d
Avoid binary target name conflicts
Kirill Bulatov created
bc2dfcf
Ignore excluded entries' children FS events (#3400)
Deals with https://github.com/zed-industries/community/issues/2295 and https://github.com/zed-industries/community/issues/2296 Release Notes: - Fixed excluded .git files appearing in worktree after FS events
Kirill Bulatov created
879a069
Port to gpui2
Kirill Bulatov created
31a4acf
Fix collab tests
Kirill Bulatov created
95a4138
Properly ignore FS events of excluded files
Kirill Bulatov created
4a060db
Add a test
Kirill Bulatov created
22e6803
Add app close events (#3399)
Release Notes: - N/A
Joseph T. Lyons created
18d3b1c
Add app close events
Joseph T. Lyons created
f2b62c3
Start emitting notifications for calls
Piotr Osiewicz created
510320b
Introduce `InteractiveText` (#3397)
This new element will let us react to click events on arbitrary ranges
of some rendered text, e.g.:
```rs
InteractiveText::new(
"element-id",
StyledText::new("Hello world, how is it going?").with_runs(vec![
cx.text_style().to_run(6),
TextRun {
background_color: Some(green()),
..cx.text_style().to_run(5)
},
cx.text_style().to_run(18),
]),
)
.on_click(vec![2..4, 1..3, 7..9], |range_ix, cx| {
println!("Clicked range {range_ix}");
})
```
As part of this, I also added the ability to give text runs a background
color.
Release Notes:
- N/A
Antonio Scandurra created
7eeb807
Allow setting text background color via `TextStyle`
Antonio Scandurra created
1ad2223
Allow providing a background color in a `TextRun`
Antonio Scandurra created
df7b89b
Allow to include gitignored files into project search (#3394)
Kirill Bulatov created
204218b
chore: Use "limited" debug info (#3396)
This one does not contain variable-level debug info; since we mostly rely on backtraces though, this should be fine. It also improves compile times a bunch for both incremental and clean scenarios. Release Notes: - N/A
Piotr Osiewicz created
56d043f
Allow finding which ranges were clicked on an `InteractiveText`
Antonio Scandurra created
41b7acc
chore: Use "limited" debug info
This one does not contain variable-level debug info; since we mostly rely on backtraces though, this should be fine. It also improves compile times a bunch for both incremental and clean scenarios.
Piotr Osiewicz created
e754c66
Allow calling an user, render contacts in collab panel
Piotr Osiewicz created
2a2b3b5
Authenticate on app startup
Piotr Osiewicz created
b463454
Remove redundant comment
Piotr Osiewicz created
390ecb5
Merge branch 'main' into collab_ui-zed2
Piotr Osiewicz created
c191943
Add basic call/user UI in top-right corner.
Allow ui::Avatar to take custom data instead of always relying on URI resolution
Piotr Osiewicz created
72a1ada
Add scripts for running Zed2 collab environment (#3395)
./script/zed-local now looks for "--zed2" flag in its args and runs Zed2 binaries instead of zed1. 'foreman start' can be launched with '-f Procfile.zed2" argument to launch zed2 collab server. Release Notes: - N/A
Piotr Osiewicz created
0b67983
Add scripts for running Zed2 collab environment
./script/zed-local now looks for "--zed2" flag in its args and runs Zed2 binaries instead of zed1. 'foreman start' can be launched with '-f Procfile.zed2" argument to launch zed2 collab server.
Piotr Osiewicz created
2cc1df9
Rename element-related traits (#3390)
@as-cii I think this naming makes more sense. If you like it, can you push forward? Release Notes: - N/A
Antonio Scandurra created
3b918bf
Merge branch 'main' into rename-element-traits
# Conflicts: # crates/gpui2/src/elements/uniform_list.rs # crates/ui2/src/components/context_menu.rs # crates/ui2/src/components/list.rs
Antonio Scandurra created
cee6fd8
Port to gpui2
Kirill Bulatov created
eee6383
Exclude more ignored/worktree-less/project-less buffers from inlay hint requests
Kirill Bulatov created
c2751c7
Parallelize ignored entries for search lookup
Kirill Bulatov created
f33c0e8
Add app events (#3372)
Adds app events (`first open` and `open`). For the time being, I'm abandonding trying to add `close`, after running into many issues trying. The code is in place for me to continue on that work, but at the moment, we require having the telemetry settings in hand when calling any of the methods that log an event, so we can honor the user's preference for sending telemetry or not, but when running the `on_app_close` method, to send off an app `close` event, the settings are no longer available (probably the order of teardown?), which causes some tests to end up failing. I'm not sure how to solve this. Maybe we keep the settings on the telemetry struct and update it each time any event is logged, then, on app shutdown, when logging the app `close` event, we can use the stored version (idk). Release Notes: - N/A
Joseph T. Lyons created
35f35dd
Remove unused import
Joseph T. Lyons created
575ab81
Disable app close event
Joseph T. Lyons created
a876b6f
Remove comments
Joseph T. Lyons created
88af458
zed2(ish) Cancel completion resolution when new list (#3391)
Release Notes: - N/A
Julia created
f01a04a
Fix pane splitting panic (#3381)
Also opens the window on startup. Release Notes: -
Mikayla Maki created
ebeb0fd
ci: Add ci-config.toml in .cargo folder. (#3392)
Release Notes: - N/A
Piotr Osiewicz created
6e84d8f
Merge branch 'main' into panic-hunting
Mikayla created
eb74ad7
Fix failing test
Mikayla created
6da57cb
Decouple workspace from call (#3380)
This PR decouples `call2` from `workspace2` in order to improve our compile times. Why pick such a small, innocent crate as `call`? It depends on `live_kit_client`, which is not-so-innocent and is in fact stalling our clean builds. In this PR, `call2` depends on `workspace2`; workspace crate defines a `CallHandler` trait for which the implementation resides in `call`; it it then all tied together in `zed`, which passes a factory of `Box<dyn CallHandler>` into workspace's `AppState`. Clean debug build before this change: ~1m45s Clean debug build after this change: ~1m25s Clean release build before this change: ~6m30s Clean release build after this change: ~4m30s ~Gonna follow up with release timings where I expect the change to be more impactful (as this allows 2/3 of the infamous trio of "project-workspace-editor" long pole to proceed quicker, without being blocked on live-kit-client build script)~. This should have little effect (if any) in incremental scenarios, where live_kit_client is already built. [release timings.zip](https://github.com/zed-industries/zed/files/13431121/release.timings.zip) Release Notes: - N/A
Piotr Osiewicz created
37e3cc1
zed2(ish) Cancel completion resolution when new list
Julia created
0def2bc
Remove dbg
Joseph T. Lyons created
c04f123
ci: Add ci-config.toml in .cargo folder.
Piotr Osiewicz created
ee2b683
Revert "Convert telemetry into a model"
This reverts commit 6e4268a471749449fff232fab5d65fe38bab57b2.
Joseph T. Lyons created
c86e999
Merge branch 'main' into add-app-events
Joseph T. Lyons created
6e4268a
Convert telemetry into a model
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
Joseph T. Lyons and Julia created
62b1843
zed1: Cancel completion resolution when new list (#3389)
Release Notes: - Fixed a bug where Zed would continue to request documentation for completion lists which were stale or no longer visible.
Julia created
f0c7b3e
Update copilot when we are the last task
Julia created
2611b5d
Fix positioning editor2's context menu when scrolling up/down (#3388)
Release Notes: - N/A
Antonio Scandurra created
b45234e
Fix warnings in unimplemented function
Piotr Osiewicz created