Commit Graph
39175 Commits
Author SHA1 Message Date
Nate Butler 63ac9de628 Add some text to clarify no api key state (#3462)
This PR is a quick-and-dirty approach to clarify what is happening when
a user doesn't have an API key so the assistant opens with the key
editor.

- Adds some text explaining how to close the panel
- Explains that other subscriptions don't cover the assistant, it needs
an api key.
- Helps people understand where to go to get an API key.

This is a Zed 1 change only, a bandaid. Zed 2 will have a better
solution: [Working
issue](https://github.com/zed-industries/zed/issues/3461)

Release Notes:

- N/A
2023-11-30 17:26:50 -05:00
Nate ButlerandJoseph T. Lyons c94d864067 Update feedback modal UI
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
2023-11-30 16:42:58 -05:00
8580f27eed Get feedback2 compiling
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
2023-11-30 16:07:54 -05:00
Marshall Bowers 70e0762838 Rework ListHeader to be more open (#3467)
This PR reworks the `ListHeader` component to be more open.

The `meta` method can now be used to append meta items of any element to
the `ListHeader`, and they will be rendered with the appropriate spacing
between them.

Release Notes:

- N/A
2023-11-30 15:55:31 -05:00
a2e46e99fd Add v_stack and h_stack to the UI prelude
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
2023-11-30 15:28:18 -05:00
b7b137759f init feedback2
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
2023-11-30 15:23:42 -05:00
Max Brunsfeld c3fa429b1d Reintroduce pane navigation history in zed2 2023-11-30 12:10:25 -08:00
Nate Butler 4a4298df17 Update collab_titlebar_item.rs 2023-11-30 14:55:59 -05:00
Nate Butler 0a836c7934 WIP update popover_menu 2023-11-30 14:54:44 -05:00
Max Brunsfeld 4ca67911a6 Bump Tree-sitter to fix another crash triggered by a markdown file (#3466)
Bumps Tree-sitter for
https://github.com/tree-sitter/tree-sitter/pull/2802

This fixes a regression introduced in the last Tree-sitter upgrade.

Release Notes:

- Fixed a crash that occurred when editing certain Markdown files.
2023-11-30 11:46:00 -08:00
Max Brunsfeld 2cb5a395e2 Bump Tree-sitter for a crash fix 2023-11-30 11:36:36 -08:00
Joseph T. LyonsandMikayla Maki 391e43f47f Fix bug preventing spaces from being used in filename (zed2)
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-11-30 14:24:00 -05:00
Mikayla 132385aee8 WIP: layout compiling 2023-11-30 11:01:36 -08:00
JuliaandConrad Irwin 8c4ba5a0ae Pane context menus & focus shenanigans
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-30 14:01:09 -05:00
Marshall Bowers a2d76644cd Implement Selectable for list components (#3465)
This PR implements the `Selectable` trait for the `ListItem` and
`ListHeader` components.

These components already had their own selectable behavior, but weren't
formally adhering to the interface defined by the trait.

Release Notes:

- N/A
2023-11-30 13:37:29 -05:00
Marshall Bowers b2f481567f Implement Selectable for ListItem and ListHeader 2023-11-30 13:26:12 -05:00
Marshall Bowers 53b923ce9d Remove unused GraphicSlot enum 2023-11-30 13:25:26 -05:00
Nate Butler 8d35aa34d4 Remove unused import 2023-11-30 13:13:22 -05:00
Nate Butler 98ed3b9a2f Clean up left side titlebar buttons 2023-11-30 13:11:20 -05:00
Mikayla Maki f825f085d2 Update main.rs 2023-11-30 10:06:08 -08:00
Nate ButlerandPiotr Osiewicz ba0753d410 Add render_project_name and render_project_branch
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
2023-11-30 12:51:55 -05:00
Nate ButlerandPiotr Osiewicz c8126846f6 Scaffold out render_project_owner
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
2023-11-30 12:41:17 -05:00
Julia 6f3b1eb3ca Missing return 2023-11-30 12:23:55 -05:00
Conrad Irwin 6da5ae12a0 Show cursor position in status bar 2023-11-30 10:16:24 -07:00
Marshall Bowers 16e5a3e4d5 Rename button-related enums (#3463)
This PR renames the `ButtonStyle2` and `ButtonSize2` enums to
`ButtonStyle` and `ButtonSize`, respectively.

Release Notes:

- N/A
2023-11-30 12:04:23 -05:00
Antonio Scandurra df8dcd42dc WIP 2023-11-30 18:00:41 +01:00
Julia e320627bd9 Merge branch 'main' into zed2-breadcrumbs 2023-11-30 11:38:29 -05:00
Nate ButlerandJoseph T. Lyons 1e92212052 Add some text to clarify no api key state
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
2023-11-30 11:20:51 -05:00
Antonio ScandurraandNathan Sobo 28698b6e48 Pass a WindowContext in request_measured_layout
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-30 17:12:40 +01:00
Julia b08fd35082 Start getting pane focus code ported 2023-11-30 10:47:28 -05:00
Antonio Scandurra 612200aa3d Lift Send and Sync restriction for measurements 2023-11-30 16:37:57 +01:00
Nate Butler 26f1630ff8 Update collab_titlebar_item.rs
[no ci]
2023-11-30 09:44:33 -05:00
Nate Butler a9d4e19650 Start plugging selected states into collab ui 2023-11-30 09:35:37 -05:00
Kirill Bulatov f9ad71c0cf Trim file_finder input queries (#3459)
Addresses a small bit of influencer's feedback

Release Notes:

- Fixed file finder query's whitespaces not being trimmed
2023-11-30 16:22:14 +02:00
Nate Butler 0953738f9d Update collab button styles 2023-11-30 09:12:39 -05:00
Kirill Bulatov 9e31380443 Exclude gitignored files' diagnostics from project panel and its indicator. (#3458)
Based on influencer's feedback.

The diagnostics are collected and available still, since that might
become a settings/UI toggle later.
Also, buffer diagnostics are still updated for gitignored files.

Release Notes:

- Excluded gitignored files' diagnostics from project panel and its
indicator.
2023-11-30 16:06:16 +02:00
Kirill Bulatov d23d643c68 Trim file_finder input queries 2023-11-30 16:05:45 +02:00
Kirill Bulatov afd3f85082 Port to gpui2 2023-11-30 15:46:35 +02:00
Kirill Bulatov cd5018d9cf Exclude gitignored files' diagnostics from project panel and its indicator.
The diagnostics are collected and available still, since that might become a settings/UI toggle later.
Also, buffer diagnostics are still updated for gitignored files.
2023-11-30 15:46:30 +02:00
Kirill Bulatov b80cb3910b Fix TypeScript diagnostics (#3457)
Deals with https://github.com/zed-industries/community/issues/2124

* sends more ClientCapabilities LSP data, diagnostics capabilities in
particular: those are now required by typescript-language-server LSP to
start publishing diagnostics
* sends more parameters during eslint workspace initialization, so it is
able to correctly look up project's typescript config
Presumably, it's not enough and some convoluted project set ups may
break still, but let's wait for examples and feedback.

Release Notes:

- Fixed typescript-language-server diagnostics not appearing for newer
server versions; fixed eslint diagnostics using wrong directory for
typescript config lookup
2023-11-30 13:25:25 +02:00
Antonio Scandurra 45b33ec6d4 Re-introduce screen-sharing in zed2 (#3456)
Release Notes:

- N/A
2023-11-30 12:14:11 +01:00
Antonio Scandurra 418a3e13d1 Fix errors in theme2 2023-11-30 12:08:00 +01:00
Kirill Bulatov b0c1c5c98e Port to gpui2 2023-11-30 13:07:47 +02:00
Antonio Scandurra 50dc4b4e68 Fix error in tests 2023-11-30 11:45:10 +01:00
Kirill Bulatov 910088ee36 Declare more supported client capabilities 2023-11-30 12:22:23 +02:00
Antonio Scandurra c948f8f221 Polish screen sharing 2023-11-30 11:22:01 +01:00
Antonio Scandurra dce8677ea7 Merge remote-tracking branch 'origin/main' into surfaces
# Conflicts:
#	crates/ui2/src/components/avatar.rs
2023-11-30 10:48:20 +01:00
Kirill Bulatov cc6109383d Fix eslint diagnostics by passing worktree root during workspace init 2023-11-30 11:38:16 +02:00
Conrad Irwin 4c694ad474 Collab panel2: Now with scrolling and keyboard (#3455)
Also introducing: .track_scroll() for non-uniform lists.

Release Notes:

- N/A
2023-11-30 00:13:52 -07:00
Conrad Irwin a359832abb Allow toggling subchannel visiblity without joining channel 2023-11-29 23:55:14 -07:00