yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
39175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio ScandurraNathan SoboMax Brunsfeld
 		c68407b1b5 Use a different frame arena for all elements 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-12-18 19:35:17 +01:00
Joseph T. LyonsandPiotr Osiewicz d5fb740b68 Add some rough ideas 
Co-Authored-By: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
 2023-12-18 13:35:07 -05:00
Marshall Bowers 56b32a92f9 Center text on welcome screen (#3699) 
This PR centers the text "Code at the speed of thought" on the welcome
screen.

Release Notes:

- N/A
 2023-12-18 13:35:05 -05:00
Marshall Bowers 0ddd053b54 Always show channel toggle when collapsed (#3698) 
This PR makes the channel toggle disclosure always visible when a
channel tree is collapsed, as opposed to just being visible on hover.

This makes it possible to visually identify collapsed channel trees
without having to hover over each entry.

Release Notes:

- N/A
 2023-12-18 13:27:47 -05:00
Nate Butler 0b2b794bdc Update collab panel signed out state (#3697) 
[[PR Description]]

Before: 

![CleanShot 2023-12-18 at 13 10
14@2x](https://github.com/zed-industries/zed/assets/1714999/a0e536c3-b5bf-45e2-893b-89b1ae7b4c47)

After:

![CleanShot 2023-12-18 at 13 10
36@2x](https://github.com/zed-industries/zed/assets/1714999/5d66a4a9-cc19-420d-82c7-58ec5cd264e4)

One known issue:

The "Sign in to enable collaboration" text below the button should be
centered, but it looks like label is reserving the full width. Need to
look in to that.

Release Notes:

- N/A
 2023-12-18 13:22:45 -05:00
Nate Butler 030098e40f Remove comment 2023-12-18 13:11:51 -05:00
Nate Butler 93cb0c5f2f Update collab panel signed out state 2023-12-18 13:09:46 -05:00
Antonio ScandurraMax BrunsfeldNathan Sobo
 		dfcd7967c6 Use a different frame arena for each window 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-12-18 18:58:40 +01:00
Nate Butler 7f3e724723 Add github icon 2023-12-18 12:56:57 -05:00
Nate Butler 2ddcf7fab0 Fix implementation of full_width and icon_position in button 2023-12-18 12:56:50 -05:00
Marshall Bowers 4b59ded300 Remove unimplemented toggling for project search entries (#3695) 
This PR removes the unimplemented toggling of search results in the
project search.

This is new functionality that didn't exist in Zed1, and it's likely
that we won't be adding it before launch, so removing it for now.

Release Notes:

-  N/A
 2023-12-18 12:53:08 -05:00
Nate Butler 93f9d06473 Style wrap guides (#3693) 
[[PR Description]]

This PR styles wrap guides. Wrap guides weren't being added to the theme
in the theme importer, and they were also missing from One Dark.

One Dark:

![CleanShot 2023-12-18 at 11 16
48@2x](https://github.com/zed-industries/zed/assets/1714999/5578127f-8d69-4f47-af60-c44de87331e0)

Gruvbox:

![CleanShot 2023-12-18 at 11 17
38@2x](https://github.com/zed-industries/zed/assets/1714999/a2ac5db9-e5bf-4452-9f9d-49f074231587)

Bad border (known importer issue):

![CleanShot 2023-12-18 at 11 17
49@2x](https://github.com/zed-industries/zed/assets/1714999/37d11e37-38b6-4001-aef0-19fc2d925425)

No border (known importer issue):

![CleanShot 2023-12-18 at 11 18
14@2x](https://github.com/zed-industries/zed/assets/1714999/3d74bd8c-514e-4e14-94db-425a39d057ab)


Release Notes:

- N/A
 2023-12-18 11:35:00 -05:00
Nate Butler 859f528faa Start on collab panel empty state 2023-12-18 11:33:37 -05:00
Julia aac92fa850 Revert accidental merge of old version of workspace2 render function (#3694) 
Something happened with my local diff and
https://github.com/zed-industries/zed/pull/3691 somehow contained an old
version of workspace2's render function. Perhaps I rebased at some point
and borked it? Not sure 🤷‍♀️

Release Notes:

- N/A
 2023-12-18 11:32:06 -05:00
Joseph T. Lyons 008441489e Add backtrace hash to collab server panic api (#3692) 
Release Notes:

- N/A
 2023-12-18 11:21:41 -05:00
Nate Butler 59edaae063 Style wrap guides for imported themes 2023-12-18 11:16:22 -05:00
Nate Butler 5e2e54f3f8 Style One Dark wrap guides 2023-12-18 11:16:00 -05:00
Joseph T. Lyons 3d97c51a53 Add backtrace hash to collab server panic api 2023-12-18 11:12:23 -05:00
Joseph T. Lyons ab224e1b96 Add release channel to zed2 collab server 2023-12-18 11:09:54 -05:00
Julia 09d81e83fe Unbork project search focus (#3691) 
I got a little too clever for my own good with these focus handles
originally lol

Release Notes:

- N/A
 2023-12-18 10:54:11 -05:00
Julia 6270cd8e10 Unbork project search focus 2023-12-18 10:44:34 -05:00
Kirill Bulatov f7f4dd2e32 Fix worktree panic for out-of-worktree files being opened (#3690) 
Fixes
https://zed-industries.slack.com/archives/C04S6T1T7TQ/p1702865855729989

Release Notes:

- Fixed certain files excluded from worktrees causing panics when being
opened
 2023-12-18 13:30:46 +02:00
Kirill Bulatov b7fab01c6e Do not panic on non-worktree file indexing 2023-12-18 13:10:26 +02:00
Antonio Scandurra 13f2ce26d9 Introduce an Arena to allocate and deallocate frame-related structs more cheaply (#3689) 
Picture worth a thousand words:


![before-after](https://github.com/zed-industries/zed/assets/482957/0aa92baf-f1cd-485e-a234-6d8f8b63a79a)

Note how having an area makes a substantial amount of frames between
0.5ms and 1ms faster (15-20% faster frames).

Release Notes:

- N/A
 2023-12-18 11:16:07 +01:00
Antonio Scandurra 2dd438dd5c Use a closure to allocate structs onto the Arena 
This is a trick borrowed from Bumpalo that helps LLVM understand
it should instantiate the object directly on the heap, as opposed to
doing so on the stack and then moving it.
 2023-12-18 10:56:37 +01:00
Max Brunsfeld b8a1441277 Fix following bugs (#3688) 
* Follow command didn't work, because follow task was dropped
* An extra div prevented titlebar facepiles from rendering correctly
 2023-12-15 16:34:08 -08:00
Max Brunsfeld 2b2fb8f6a8 Remove div around all avatars in titlebar facepile 2023-12-15 16:26:56 -08:00
Max Brunsfeld e8df9cc77b Fix accidental drop of following task. Add back FollowNextCollaborator 2023-12-15 16:15:31 -08:00
Marshall Bowers 9afdc91750 Only apply scroll correction in uniform_list when already scrolled (#3687) 
This PR fixes an issue where the scroll correction added to the uniform
list in 25572d835c was being applied even
if the list wasn't scrolled at all.

This manifested in the project panel starting with an incorrect scroll
offset that would disappear once scrolled.

It seems like we should only need to apply this scroll correction when
the list is already scrolled.

Release Notes:

- N/A
 2023-12-15 17:53:10 -05:00
Joseph T. Lyons e4db2e1145 Add notes 2023-12-15 17:18:52 -05:00
Marshall Bowers 91711830d9 Fix channel filter input (#3686) 
This PR fixes the channel filter in the collab panel not showing up.

Release Notes:

- N/A
 2023-12-15 17:03:59 -05:00
Max Brunsfeld 6208ff9106 Don't scroll List on scroll wheel events outside of its bounds (#3685) 2023-12-15 13:47:40 -08:00
Max Brunsfeld 67318b54e4 Don't scroll List on scroll wheel events outside of its bounds 2023-12-15 13:38:49 -08:00
Marshall Bowers 28f15c0ddd Add --release flag to script/zed-local (#3684) 
This PR adds support for the `--release` flag to `script/zed-local`.

This allows you to run a local build of Zed in release mode, which can
be useful when needing to profile things or do other performance work.

Release Notes:

- N/A
 2023-12-15 16:38:40 -05:00
Max Brunsfeld 3933762a6c Pane rendering fixes (#3683) 
* Fix a bug where a pane's leader info was not rendered if the pane was
part of a split
* Fix a crash when zooming a pane, due to duplicate render of that view.
 2023-12-15 13:34:34 -08:00
Marshall Bowers fbaac8857f Add support for --release flag to zed-local script 2023-12-15 16:28:23 -05:00
Marshall Bowers 908408901e Format zed-local script 2023-12-15 16:27:58 -05:00
Max Brunsfeld 997aa3154d Avoid duplicate render of a pane when it is zoomed 2023-12-15 13:26:48 -08:00
Max Brunsfeld 2829ad7286 Always render panes via pane_group::Member::render 
Remove distinct code path for rendering panes in a PaneAxis, as this dropped
the logic for rendering the leader border and info box.
 2023-12-15 13:26:36 -08:00
Max Brunsfeld a8918d85cc Enable zoom (#3668) 
* [x] zoom
* [x] pane tests
 2023-12-15 12:58:03 -08:00
Nate Butler dd03f4aaa0 Editor UI Cleanup (#3676) 
[[PR Description]]

TODO: 
- [x] Style fold marker
- [x] Editor - Code action icon too large, should use muted color,
should have tooltip
- [ ] Style inline assistant
    - Prompt text gets cut off veritcally
- [x] Line height on inline assist editor isn't tall enough
- Nate: This is my fault due to the line height (relative: 1) we are
setting on non-buffer editors. I'll look into this.
- [ ] Style diagnostic hover (right now it's an opaque box on some
themes)
    - Nate: This needs status tints, we are working on it
- [ ] Hovering over a symbol shows a dialogue that appears underneath
the scroll-bar

Release Notes:

- N/A
 2023-12-15 15:49:55 -05:00
Nate Butler 54e65e465a Style fold control 2023-12-15 15:41:53 -05:00
Conrad Irwin 714dfed0d5 fix theme selector gaps (#3682) 
- Don't scroll beyond end of uniform list
- Restore position of uniform_list padding

[[PR Description]]

Release Notes:

- N/A
 2023-12-15 13:27:17 -07:00
Nathan Sobo 6fca4b26d8 Merge branch 'main' into arena 2023-12-15 13:22:19 -07:00
Conrad Irwin f244d88993 Fix bug where vim commands were copied on each update_matches (#3680) 
In zed1, the array of commands was recalculated on every update_matches,
In zed2 it's cached before we change the focus.

Release Notes:

- N/A
 2023-12-15 13:20:10 -07:00
Conrad Irwin b3b1cb4a08 Restore position of uniform_list padding 
It should be inside the scrollable area.
 2023-12-15 13:18:51 -07:00
Max Brunsfeld 1e27d2c818 Enable pane tests 2023-12-15 12:00:58 -08:00
Conrad Irwin 25572d835c Don't scroll beyond end of uniform list 2023-12-15 12:54:12 -07:00
Max Brunsfeld f8258f04e4 When a dock is zoomed, don't render it in its normal place 2023-12-15 11:48:25 -08:00
Max Brunsfeld 0d19aa54a8 Fix logic for activating panel when re-docking it 2023-12-15 11:47:01 -08:00