Commit Graph
25009 Commits
Author SHA1 Message Date
Kirill Bulatov 92ef346b08 Properly increment installation attempts 2023-11-29 10:58:22 +02:00
Kirill Bulatov 0045a11847 Ignore initialized LSP request in prettier wrapper 2023-11-29 10:58:22 +02:00
Kirill Bulatov 0ffa9494e3 Always install default prettier 2023-11-29 10:58:22 +02:00
Kirill Bulatov 485cb153c9 Do not attempt to run default prettier if it's not installed yet 2023-11-29 10:58:22 +02:00
Kirill Bulatov b41312e584 Always write prettier server file 2023-11-29 10:58:22 +02:00
Kirill Bulatov f10d658e95 Split prettier code off to a separate module 2023-11-29 10:58:22 +02:00
Kirill Bulatov 98c44570ee Limit prettier installation and start attempts 2023-11-29 10:58:22 +02:00
Kirill Bulatov 9ec39fc4fa Use enum variants for prettier installation and startup phases 2023-11-29 10:58:22 +02:00
Kirill Bulatov 0abf3269e4 Exctract the common code 2023-11-29 10:58:22 +02:00
Conrad Irwin efd1bc5be0 Inviting/Responding/Creating Channels... etc. 2023-11-28 22:47:04 -07:00
Conrad Irwin 5cfefd7d39 use the right click event for buttons (#3432)
Previously we used mouse down

Release Notes:

- N/A
2023-11-28 21:27:42 -07:00
Conrad Irwin d21311b5bc use the right click event for buttons 2023-11-28 21:14:48 -07:00
Marshall Bowers 9bdfd34961 Remove ID hack in ListItem (#3431)
This PR removes the ID hack in `ListItem`, since the underlying issue
was fixed in #3430.

Release Notes:

- N/A
2023-11-28 23:11:29 -05:00
Conrad Irwin 15e353b291 Fix stateful elements in Components (#3430)
No more wrapper divs for buttons

Release Notes:

- N/A
2023-11-28 20:59:58 -07:00
Conrad Irwin c68936fda8 Remove useless method
We need to move state from layout to paint in any case
2023-11-28 20:53:46 -07:00
Conrad Irwin 816425c971 Fix stateful elements in Components
Previously a component assumed its element was stateless, this was
incorrect!
2023-11-28 20:47:11 -07:00
Max BrunsfeldandMarshall 621bb446e2 Right-align key bindings in context menus
Remove extra div in `List` that prevented list items from
filling the available space.

Co-authored-by: Marshall <marshall@zed.dev>
2023-11-28 17:23:49 -08:00
Mikayla Maki f727523d4a Restore welcome page (#3429)
Also restores the theme selector and base keymap selector. This does not
include a UI port.

Release Notes:

- N/A
2023-11-28 16:34:41 -08:00
Max Brunsfeld 8990ccbc48 Show action key bindings in context menus 2023-11-28 16:07:42 -08:00
Conrad Irwin 1439a10965 Channel joining (#3428)
- Remove debugging
- Basic channel joining!

[[PR Description]]

Release Notes:

- N/A
2023-11-28 17:00:21 -07:00
Conrad Irwin 3949976c78 Togglable channels, the greatest since sliced bread 2023-11-28 16:52:12 -07:00
Mikayla d6a5f8a3aa Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Mikayla 330de46cf4 Restore welcome page and several pickers 2023-11-28 15:25:28 -08:00
Conrad Irwin 3d4ac1ffbf Fix tests, notify errors 2023-11-28 16:20:54 -07:00
Mikayla 4f97c7c98c Implement all but the UI 2023-11-28 15:18:19 -08:00
Max Brunsfeld 053f3b646a Add a basic context menu to the project panel 2023-11-28 15:12:46 -08:00
Conrad Irwin 49c75817ea Basic channel joining! 2023-11-28 16:10:18 -07:00
Conrad Irwin 0e2bb68b2c Fix mouse events when element is occluded (#3417)
This commit adds a depth map to the frame so we can find the "top most"
opaque layer by stacking order for a given point.

This lets us determine whether the element being hovered was part of the
given layer in the previous frame, which fixes the hover issue.

Still to do:
* [ ] Fix up mouse events too (I tried this, but it's not working yet,
and I want to understand why)

Release Notes:

- N/A
2023-11-28 15:57:22 -07:00
Conrad Irwin d948375d10 Remove debugging 2023-11-28 15:33:44 -07:00
Conrad Irwin 71efd42208 More progress on collab panel (#3426)
Release Notes:

- n/a
2023-11-28 15:30:51 -07:00
Marshall Bowers ab89e5c686 Merge branch 'main' into collab-panel2 2023-11-28 17:07:40 -05:00
Marshall Bowers 644a341bc5 Fix tooltips not showing on IconButtons (#3427)
This PR fixes tooltips not showing on `IconButton`s.

The "fix" here is the same hack that we used to fix `on_click` handlers
for `ListItem`s, where we introduce another layer of wrapping with an
element with an ID set.

This PR also adds a story for the `IconButton` so this issue can be
tested/observed in isolation.

Release Notes:

- N/A
2023-11-28 17:01:53 -05:00
Conrad Irwin 13e847107d More progress on collab panel 2023-11-28 14:40:32 -07:00
Marshall Bowers 5871b0a75c storybook2: Unsuppress and fix warnings (#3425)
This PR unsupresses the warnings in `storybook2` and summarily fixes
them.

Release Notes:

- N/A
2023-11-28 15:43:43 -05:00
Marshall Bowers 1c9eb27757 ui2: Reference theme2 and settings2 crates without the 2 (#3424)
This PR updates the `ui2` crate to reference the `theme2` and
`settings2` crates without the `2` the way we do in our other crates.

Release Notes:

- N/A
2023-11-28 15:30:29 -05:00
Nate Butler 5d0e7270ff Refine keybindings (#3368)
[[PR Description]]

Refine the `Keybinding` component.

Still some issues:

![CleanShot 2023-11-28 at 15 15
38@2x](https://github.com/zed-industries/zed/assets/1714999/4fc1dde4-fe65-4e1d-acf5-6faefa12f053)

Lots of things moving so want to get this in.

Changes:

- use icons for some keys & modifiers
- updates some icons
- updates some state colors

Release Notes:

- N/A

Zed 2 Release Notes:

- Keybindings now use icons for common keys and modifiers
2023-11-28 15:22:38 -05:00
Nate Butler db67d14e46 Unused imports 2023-11-28 15:17:09 -05:00
Nate Butler 2b8514d5fc Fix missing arrows 2023-11-28 15:15:49 -05:00
Nate Butler 6399784932 Update keybinding.rs 2023-11-28 15:12:40 -05:00
Nate Butler f0d5f155e1 Merge branch 'main' into refine-keybindings 2023-11-28 15:12:22 -05:00
Nate Butler 161cb70aca Update command_palette.rs 2023-11-28 15:06:37 -05:00
Marshall Bowers da5cfb3f5a ui2: Unsuppress and fix warnings (#3423)
This PR unsupresses the warnings in `ui2` and summarily fixes them.

Release Notes:

- N/A
2023-11-28 14:44:19 -05:00
Nate Butler 858a30fbeb Update keybinding.rs 2023-11-28 14:40:26 -05:00
Marshall Bowers b8bd5826c2 Add inset variant to ListItem (#3422)
This PR adds an inset variant to the `ListItem` component.

We're now using this inset variant for the `ListItem`s we render in
pickers.

Release Notes:

- N/A
2023-11-28 14:27:19 -05:00
Nate Butler f28e252e50 Merge branch 'main' into refine-keybindings 2023-11-28 14:00:09 -05:00
Conrad Irwin bf773dc6b3 Add logged out collab panel (#3412)
Release Notes:

- N/A
2023-11-28 11:49:09 -07:00
Conrad Irwin 77cf299566 Merge branch 'main' into collab-panel2 2023-11-28 11:40:58 -07:00
Marshall Bowers 3483114c19 Use ListItems in the project panel (#3421)
This PR reworks the project panel to render its items using the
`ListItem` component.

There are a few hacks in here in order to get click handlers working for
the `ListItem`, but we'll want to get these fixed in GPUI.

Release Notes:

- N/A
2023-11-28 13:11:43 -05:00
Kirill Bulatov 4e6941bb90 Use proper npm arguments and clean its inherited env vars (#3419)
Previously, `npm i` command could take too much time to download
dependencies, which was caused by wrong flags used.

Since we run `node` and `npm` processes ourselves and try to isolate
them from potentially "bad" user configs, it seems safer to remove any
ways to re-configure the tools via env vars, so strip off those too.

Release Notes:

- N/A
2023-11-28 19:14:10 +02:00
Conrad Irwin 5b5206ab64 More mouse occlusion work 2023-11-28 09:59:58 -07:00