Commit Graph
16665 Commits
Author SHA1 Message Date
Marshall Bowers 84dd2c6954 Rename IconElement to just Icon (#3974)
This PR renames the `IconElement` component to just `Icon`.

This better matches the rest of our components, as `IconElement` was the
only one using this naming convention.

The `Icon` enum has been renamed to `IconName` to free up the name.

I was trying to come up with a way that would allow rendering an
`Icon::Zed` directly (and thus make the `IconElement` a hidden part of
the API), but I couldn't come up with a way to do this cleanly.

Release Notes:

- N/A
2024-01-09 10:11:20 -05:00
Piotr Osiewicz 57eb962929 Add a missing default value to docs (#3973)
Release Notes:

- N/A
2024-01-09 12:20:52 +01:00
Kirill Bulatov 0f6af99423 Remove some todo!'s from the code (#3972)
Release Notes:

- N/A
2024-01-09 11:45:09 +02:00
Kirill Bulatov f83721fd05 Remove some todo!'s 2024-01-09 11:36:36 +02:00
Kirill Bulatov 1885228457 Remove dbg! usage from tests 2024-01-09 10:08:27 +02:00
Marshall Bowers 438c13747a Add stories for collab notifications (#3967)
This PR adds some basic stories for collab notifications to make them
easier to work on:

<img width="1076" alt="Screenshot 2024-01-08 at 9 43 39 PM"
src="https://github.com/zed-industries/zed/assets/1486634/4a0adcfa-1134-49c2-b589-74ac1d52af4c">

I factored out a `CollabNotification` component that defines the general
structure for one of these notifications, and this is the component that
we use in the stories, with representative values passed to it to
simulate the different instances of the notification.

We can't use the actual notification components in the stories due to
their data dependencies.

Release Notes:

- N/A
2024-01-08 21:54:59 -05:00
Marshall Bowers 47741c956c Stop propagation when deploying the context menu for a project panel entry (#3965)
This PR fixes an issue where right-click on any project panel entry
would cause the context menu on the root of the project panel
(introduced in #3954) to deploy.

We need to stop propagation in the handler on the inner project panel
list items so that the click event doesn't bubble up the tree.

Release Notes:

- Fixed an issue where the project panel was always deploying the root
context menu rather than on the clicked item.
2024-01-08 20:51:14 -05:00
Mikayla Maki f4b81e69cc Fix off by 1 error when computing available key bindings (#3964)
Fixes https://github.com/zed-industries/community/issues/2379

Release Notes:

- Fixed issue where keybindings in some context menus would not show
reliably.
2024-01-08 17:40:43 -08:00
Mikayla 9284bc64f0 Fix off by 1 error when computing available key bindings 2024-01-08 17:30:24 -08:00
Mikayla Maki e86debfe99 Restore the terminal cursor settings (#3963)
As it says on the tin

Release Notes:

- Restored the terminal cursor's I-beam and pointing hand settings
2024-01-08 16:07:08 -08:00
Mikayla 97a6c4153d Restore the terminal cursor settings 2024-01-08 16:02:39 -08:00
Mikayla Maki 0378bd8ca4 Restore the active pane magnification feature (#3961)
As it says on the tin

Release Notes:

- Restored the active pane magnification setting.
2024-01-08 15:58:57 -08:00
Conrad Irwin 45ebeeaf8e Fix assets build (#3962)
Release Notes:

- N/A
2024-01-08 16:57:36 -07:00
Conrad Irwin 6b3c8d0e83 Fix assets build 2024-01-08 16:53:01 -07:00
Mikayla 799181b636 Restore the active pane magnification feature 2024-01-08 15:48:31 -08:00
Marshall Bowers 8a91419ec2 Tighten up feedback modal design (#3960)
This PR tightens up the design of the feedback dialog:

<img width="680" alt="Screenshot 2024-01-08 at 6 20 50 PM"
src="https://github.com/zed-industries/zed/assets/1486634/8dc0e687-2459-4ab3-b69f-b610ce067ef1">

<img width="682" alt="Screenshot 2024-01-08 at 6 21 24 PM"
src="https://github.com/zed-industries/zed/assets/1486634/f0730710-16e0-4d61-a919-60874442186a">

Release Notes:

- Improved the design of the feedback dialog.
2024-01-08 18:28:37 -05:00
Conrad Irwin 90b8f8ac56 Push branch before tag 2024-01-08 15:49:03 -07:00
Conrad Irwin f9e2d8940b collab 0.35.0 2024-01-08 15:47:59 -07:00
Marshall Bowers 792115ee59 Fix error border color for email input in feedback dialog (#3959)
This PR fixes the border color used when the email input in the feedback
dialog is invalid.

Previously this was hardcoded just to `red` instead of using the
appropriate color from the theme.

<img width="653" alt="Screenshot 2024-01-08 at 5 40 07 PM"
src="https://github.com/zed-industries/zed/assets/1486634/ea01cd76-d661-4512-b668-c82b8d00d84e">

Release Notes:

- Fixed the border color used for the email input in the feedback dialog
when an invalid email is entered.
2024-01-08 17:46:25 -05:00
Conrad Irwin 32f85b5bc6 guest acls (#3958)
- First pass of real access control
- Check user is host for host-broadcasted project messages
- Only allow read-write users to update buffers

[[PR Description]]

Release Notes:

- (Added|Fixed|Improved) ...
([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
2024-01-08 15:45:21 -07:00
Conrad Irwin bcf30f19d6 Disallow creating files with '..' (#3156)
Release Notes:

- Fixed a crash that could occur when creating files with '..' in the
path
2024-01-08 15:43:57 -07:00
Conrad Irwin c069f7bd61 Only allow read-write users to update buffers 2024-01-08 15:39:24 -07:00
Conrad IrwinandMax b8dbdb65f9 Fix relative path opening from project symbols
Co-Authored-By: Max <max@zed.dev>
2024-01-08 15:12:22 -07:00
Piotr Osiewicz f327de6674 chore: Extract assets module out of zed crate. (#3957)
This essentially shaves off about 10% off of an incremental build after
project change and potentially more if you're changing stuff like
`welcome` that's very close to the `zed` crate in the dep graph. That's
because macro expansion takes place even in incremental builds it seems?
And zed (lib) + zed (bin) could take up to 4 seconds out of an
incremental build, which is a *lot* in a 10s build. In reality though it
shaves 1 second off of 5 seconds incremental 'welcome'/ 1s off of 10s
'project' builds.

Note that we had `assets` crate in the past (removed in #2575 /cc
@maxbrunsfeld), but this is a bit different, because `assets` is a
dependency of *just* zed and nothing else. We essentially cache macro
expansion results ourselves.

Release Notes:

- N/A
2024-01-08 22:49:14 +01:00
Marshall Bowers 04b99f3173 Style the chat panel message input (#3956)
This PR styles the message input in the chat panel.

<img width="242" alt="Screenshot 2024-01-08 at 4 28 33 PM"
src="https://github.com/zed-industries/zed/assets/1486634/48e83692-878e-4891-8e40-8738cdeb23a8">

Release Notes:

- Improved the styling of the message editor in the chat panel.
2024-01-08 16:45:18 -05:00
Conrad Irwin ef1612105b Fix prevention of cross-channel joins (#3949)
Co-Authored-By: Max <max@zed.dev>

[[PR Description]]

Release Notes:

- (Added|Fixed|Improved) ...
([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
2024-01-08 14:17:44 -07:00
Conrad Irwin da2a7bd1b2 Use "test" consistently 2024-01-08 14:07:18 -07:00
Marshall Bowers ae18a84698 Improve chat panel empty states (#3955)
This PR improves the empty states for the chat panel:

- The signed-out state has been updated to match our other signed-out
panel states.
- A new state has been added to account for the case where a user is
signed in but doesn't have an active chat.

Release Notes:

- Improved the design of empty states in the chat panel.
2024-01-08 15:56:52 -05:00
Conrad IrwinandMax 0ea79a377f Fix prevention of cross-channel joins
Co-Authored-By: Max <max@zed.dev>
2024-01-08 13:47:27 -07:00
Conrad Irwin b62b45c6e5 No .. paths... 2024-01-08 13:46:08 -07:00
Kirill Bulatov 375db94542 Show context menu on project panel empty space right click (#3954)
Deals with https://github.com/zed-industries/community/issues/2383

Release Notes:

- Fixed context menu not shown when right clicking empty project panel
space
2024-01-08 22:16:18 +02:00
Kirill Bulatov c32d27591c Show context menu on project panel empty space right click 2024-01-08 22:12:40 +02:00
Max Brunsfeld 86f3d1efa1 Check user is host for host-broadcasted project messages 2024-01-08 12:04:59 -08:00
Kirill Bulatov 03bc794c3a Clean up outline selections when its modal gets closed (#3953)
Release Notes:

- Fixed outline selections not being cleared on certain modal dismiss
actions
2024-01-08 22:02:22 +02:00
Kirill Bulatov eb823974c8 Clean up outline selections when its modal gets closed 2024-01-08 21:52:03 +02:00
Piotr Osiewicz a932c156d3 chore: Fix spurious rebuilds of Zed library and binary (#3952)
Currently when one runs `cargo build` twice without changing anything,
zed lib and binary are gonna get rebuilt every time. I checked out cargo
logs and it turns out we were querying wrong path to `.git/logs/HEAD` in
our build.rs, causing it to rerun on every build and thus marking zed
lib as dirty.

See logs (`CARGO_LOG=cargo::core::compiler::fingerprint=trace cargo
build`):
```
0.501173792s  INFO cargo::core::compiler:🫆 fingerprint dirty for zed v0.120.0 (/Users/hiro/Projects/zed/crates/zed)/RunCustomBuild/TargetInner { ..: custom_build_target("build-script-build", "/Users/hiro/Projects/zed/crates/zed/build.rs", Edition2021) }
0.501180417s  INFO cargo::core::compiler:🫆     dirty: FsStatusOutdated(StaleItem(MissingFile("/Users/hiro/Projects/zed/crates/zed/.git/logs/HEAD")))
```
The path to .git directory is relative to crates/zed and not to the
workspace's root.

/cc @maxbrunsfeld 

Release Notes:
- N/A
2024-01-08 20:46:35 +01:00
Marshall Bowers 5e2bb9cf25 Fix inconsistent sizing between the buffer search and the project search (#3951)
This PR fixes the inconsistent sizing between the buffer search and the
project search when both elements have both a primary and secondary item
shown in the toolbar.

Release Notes:

- Fixed some inconsistent sizing in the buffer search and project search
when both have two rows of tools in the toolbar.
2024-01-08 14:40:48 -05:00
Conrad IrwinandMax 39c49bb1e3 First pass of real access control
Co-Authored-By: Max<max@zed.dev>
2024-01-08 12:23:40 -07:00
Marshall Bowers 0800789caf theme: Removed commented-out ActiveTheme impl (#3950)
This PR removes a commented-out implementation for the `ActiveTheme`
trait on the `WindowContext`.

We don't need this implementation as we can go through the
`AppContext`'s implementation.

Release Notes:

- N/A
2024-01-08 13:51:18 -05:00
Marshall Bowers d712afe954 terminal: Remove resolved TODO (#3948)
This PR removes a resolved TODO in the `terminal` crate.

Release Notes:

- N/A
2024-01-08 13:39:56 -05:00
Marshall Bowers 5b84226b41 terminal: Clean up doc comment for rgb_for_index (#3947)
This PR cleans up the doc comment for the `rgb_for_index` function.

Release Notes:

- N/A
2024-01-08 13:33:41 -05:00
Nate Butler 2e13a98923 Update Copilot UI (#3904)
Updates Zed2 Copilot UI

- Introduces the `Headline` component for rendering large text
- Styles the 3 Copilot prompt states

![CleanShot 2024-01-08 at 13 19
09@2x](https://github.com/zed-industries/zed/assets/1714999/4b58b85f-23aa-4c22-9ca6-d0abd232cf18)
![CleanShot 2024-01-08 at 13 18
55@2x](https://github.com/zed-industries/zed/assets/1714999/0bf71e1d-63b5-4fbb-8672-e42f8602516d)


Release Notes:

- Updated the connect Copilot modal UI.
2024-01-08 13:33:30 -05:00
Piotr OsiewiczandMarshall Bowers f90b05b716 Display setting documentation in settings.json (#3936)
Let this screenshot of settings.json speak for itself: 

![image](https://github.com/zed-industries/zed/assets/24362066/fca60383-1788-43f9-803b-00f083394c8a)

Release Notes:
- Added code completion & on-hover documentation to Zed's settings.json
file.

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
2024-01-08 19:30:18 +01:00
Marshall Bowers 72f1a40b40 Fix layout shift when renaming a channel (#3946)
This PR fixes the layout shift that would occur in the channel list when
opening a rename editor for a channel.

Release Notes:

- Fixed layout shift when opening a rename editor for a channel.
2024-01-08 13:28:21 -05:00
Marshall Bowers 00dbc45ed3 Adjust spacing of extra call participant count indicator (#3945)
This PR adjusts the spacing of the indicator showing the number of extra
call participants that appears after the facepile:

<img width="242" alt="Screenshot 2024-01-08 at 1 09 39 PM"
src="https://github.com/zed-industries/zed/assets/1486634/6d9cbefa-3b4e-4501-ab11-51026dfb5b6c">

Release Notes:

- Added more space between the call participant facepile and the number
indicating additional call participants.
2024-01-08 13:24:56 -05:00
Nate Butler c8713d7d5b Update copilot ui 2024-01-08 13:21:45 -05:00
Marshall Bowers bea331758a Remove resolved TODO (#3943)
This PR removes a resolved TODO in drawing diff hunk status.

Release Notes:

- N/A
2024-01-08 13:08:44 -05:00
Piotr Osiewicz 7654571a80 Fix flaky open_paths_action test (#3944)
I've missed a single run_until_parked call. mb

Release Notes:

- N/A
2024-01-08 19:08:09 +01:00
Marshall Bowers ca29d5421d Use correct color for folded diff indicator (#3942)
This PR updates the indicator for changes within a fold to use the
correct color from the theme:

<img width="380" alt="Screenshot 2024-01-08 at 12 52 56 PM"
src="https://github.com/zed-industries/zed/assets/1486634/b8bf6bf3-6acc-43a4-8c4b-a02c975c7f02">

Release Notes:

- Updated the color of the indicator for a fold containing modified
lines.
2024-01-08 12:58:04 -05:00
Marshall Bowers b6c9a62276 Improve styling of tree branches in collab panel (#3941)
This PR updates the styling of the tree branches in the current call
section of the collab panel:

- Fixed the gap between the notes and chat items.
- We now overdraw the tree branch on the notes item so it fills the gap.
- The tree branch lines are now thinner.

<img width="231" alt="Screenshot 2024-01-08 at 12 35 35 PM"
src="https://github.com/zed-industries/zed/assets/1486634/844c9e18-c2de-4163-9384-41d1577e23a0">

Note: I think the signature for `render_tree_branch` could use some
improvement. I don't like having the multiple `bool` parameters, but any
change I could think of was going to be a bit more invasive than I
wanted to take on in this PR.

Release Notes:

- Improved the style of the tree branches in current call details in the
collab panel.
2024-01-08 12:40:34 -05:00