yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,017 Commits 5 Branches 0 Tags
7d40150cbf69e46dbedc4d731c2f3df6bdfdde8a
Commit Graph
15017 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marshall Bowers 7d40150cbf Remove unneeded wrapping divs in ListItem left content (#3438) 
This PR removes some unneeded wrapping `div`s around the left content in
`ListItem`s.

Release Notes:

- N/A
 2023-11-29 12:40:35 -05:00
Marshall Bowers 426d457c80 Remove unneeded .clones 2023-11-29 12:35:39 -05:00
Marshall Bowers b0a9686c6c Remove unneeded wrapping divs in ListItem left content 2023-11-29 12:29:48 -05:00
Nate ButlerandMarshall Bowers dfb60c6d1d Button2 – Part1 (#3420) 
## TODO

- [x] Remove `InteractionState`
- [ ] `Selectable` should use `Selection` instead of a boolean
- [x] Clean out ui2 prelude
- [ ] Build out button2 button types
- [ ] Port old buttons

Release Notes:

- N/A

---------

Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-29 12:23:09 -05:00
Conrad Irwin dbd826405e Inviting/Responding/Creating Channels... etc. (#3433) 
Release Notes:

- n/a
 2023-11-29 09:29:25 -07:00
Joseph T. Lyons 99ff94db62 v0.116.x dev 2023-11-29 11:08:32 -05:00
Kirill Bulatov a8a8ebd12d Make prettier more robust to offline work and errors (#3434) 
Refactors prettier support:

* moves away prettier-related code into a separate module, makes
prettier installation & start phases more type-restricted
* ensures prettier installation and start attempts are capped with a
fixed attempts amount: after it's exceeded, no further attempts to
install and/or start prettier area made
* improves default prettier management, by correctly preserving its
plugin set between (re) installations and always installing the prettier
server part
* slightly improves prettier logging 

Release Notes:

- N/A
 2023-11-29 14:02:31 +02:00
Kirill Bulatov 5de10092a8 Log prettier installation start & success 2023-11-29 13:44:19 +02:00
Kirill Bulatov 9dd5a5a249 Fix the tests 2023-11-29 12:10:41 +02:00
Kirill Bulatov c65b9272c1 Port to gpui2 2023-11-29 11:52:26 +02:00
Kirill Bulatov c48e72db4c Style fixes 2023-11-29 11:33:29 +02:00
Kirill Bulatov 5fe4027db7 Simplify default prettier installation function 2023-11-29 10:58:22 +02:00
Kirill Bulatov 33d9b2de06 Clear failed installation task when error threshold gets exceeded 2023-11-29 10:58:22 +02:00
Kirill Bulatov 89224f18dd Properly determine default prettier plugins to install 2023-11-29 10:58:22 +02:00
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
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
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
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