Commit Graph
53 Commits
Author SHA1 Message Date
Kirill Bulatov ab027aa72e Rework the way project panel auto reveals entries
* gitignored entries are never auto revealed
* `project_panel::auto_reveal_entries = true` settings entry was added,
setting it to `false` will disable the auto reveal
* `pane::RevealInProjectPanel` action was added that activates the project panel and reveals the entry it got triggered on (including the gitignored ones)
2023-12-12 11:38:51 +02:00
Marshall Bowers 53b76a6dd2 Fix inactive tab styles (the verbose way) (#3591)
This PR fixes the inactive tab style to properly show the label using
the muted text color.

I went about fixing this in the most direct way possible, but the
solution leaves a lot to be desired, IMO. I plan to explore some ideas
on how we can improve the state of styling the tab content without
having the same styles repeated all over the place and subsequently
out-of-sync.

Release Notes:

- N/A
2023-12-11 15:42:17 -05:00
Mikayla 8d491f7e44 Merge branch 'main' into terminal-element 2023-12-06 15:20:04 -08:00
Marshall Bowers 2191cb7f3b Factor out LabelLike to share common label styles (#3510)
This PR factors out a new `LabelLike` component to share common styles
between the `Label` and `HighlightedLabel` components.

Release Notes:

- N/A
2023-12-06 11:17:12 -05:00
Max Brunsfeld e903a96401 Implement following and more collaboration panel features in zed2 (#3504) 2023-12-05 13:59:15 -08:00
Max Brunsfeld d03a77bbf4 Get following working
Restore a single event type on Item trait, so that the workspace can
subscribe to it and handle following events.
2023-12-05 12:57:23 -08:00
Nate ButlerandMarshall Bowers ef129b5512 Update tabs rendering, fix tab spacing bug
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-05 14:04:12 -05:00
Mikayla b75765051a Merge branch 'main' into terminal-element 2023-12-01 16:21:38 -08:00
Antonio Scandurra 6effa83e31 Merge remote-tracking branch 'origin/main' into no-more-todos-in-editor
# Conflicts:
#	crates/editor2/src/items.rs
2023-12-01 12:40:48 +01:00
Antonio Scandurra 603181a09c Remove all todos in Editor's Item implementation 2023-12-01 12:32:30 +01:00
Conrad Irwin f5df100bff Show cursor position in status bar (#3464)
Passes the compiler so it must work!

(though it doesn't show up until we fix pane focus)

Release Notes:

- N/A
2023-11-30 16:40:42 -07:00
Max Brunsfeld c3fa429b1d Reintroduce pane navigation history in zed2 2023-11-30 12:10:25 -08:00
Mikayla 132385aee8 WIP: layout compiling 2023-11-30 11:01:36 -08:00
Conrad Irwin 6da5ae12a0 Show cursor position in status bar 2023-11-30 10:16:24 -07:00
Nate Butler 374d4b9557 TextColor -> Color 2023-11-21 01:05:29 -05:00
Piotr Osiewicz b05280f8cb Merge remote-tracking branch 'origin/callback-handles' into search2 2023-11-21 00:40:20 +01:00
42dfefd738 WIP
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
2023-11-20 14:46:01 -08:00
Piotr Osiewicz 7629099e79 Merge branch 'main' into search2 2023-11-20 19:23:35 +01:00
Piotr Osiewicz 9fc3540a43 Merge branch 'main' into search2 2023-11-20 18:37:41 +01:00
Conrad Irwin 16cca67638 Merge branch 'main' into derive-element-redux 2023-11-20 09:15:38 -07:00
Nathan Sobo d2d1f1a1ff Element refinement passing on ui2 2023-11-18 20:05:47 -07:00
Julia 9a986fc6ab Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
JuliaandNathan Sobo 77947a8b50 Get diagnostics view almost building in the zed2 world
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-17 16:32:35 -05:00
Piotr Osiewicz 9cd550e2b7 Merge branch 'main' into search2 2023-11-17 13:22:30 +01:00
Mikayla 5a3ab9b226 Restore a bunch of random workspace stuff 2023-11-16 23:05:28 -08:00
Piotr Osiewicz 7315c187bf Merge branch 'main' into search2 2023-11-16 17:16:15 +01:00
Mikayla e63864a9d5 Add focusable view and restore workspace deserialization. Partially restore split and tab functions 2023-11-15 16:36:43 -08:00
Piotr Osiewicz 07d6ce8db4 Merge branch 'main' into search2 2023-11-15 12:54:26 +01:00
Conrad Irwin 8f1a3dd175 Merge branch 'main' into element-types 2023-11-14 12:10:26 -07:00
Marshall Bowers beae52db00 Combine LabelColor and IconColor into TextColor 2023-11-14 13:48:01 -05:00
Piotr OsiewiczandNate 8da3ab8d82 WIP styling
Co-authored-by: Nate <nate@zed.dev>
2023-11-14 17:59:53 +01:00
Piotr Osiewicz e7e3ffe749 WIP 2023-11-14 16:56:31 +01:00
Nathan Sobo 7d1a6a81df Merge remote-tracking branch 'origin/main' into element-types 2023-11-14 01:55:58 -07:00
Nathan Sobo 14d5584205 Checkpoint 2023-11-14 01:15:48 -07:00
Nate Butler 98916f54d2 WIP 2023-11-13 17:38:44 -05:00
Piotr Osiewicz e722fa2ddf WIP: start search2 2023-11-13 20:38:37 +01:00
Max Brunsfeld c9bd5548ae Add a setting for when to seed the search query from the text under the cursor 2023-11-09 14:03:14 -08:00
Max Brunsfeld 34cf021595 Avoid suggesting search query if cursor is not on a word 2023-11-09 12:33:30 -08:00
Mikayla e9267a7495 Update editor to use new event emitter 2023-11-08 19:52:43 -08:00
Marshall Bowers a9db13e190 Rename ThemeVariant to Theme (#3252)
This PR renames the `ThemeVariant` type to `Theme`.

This better reflects its purpose, as well as matches the same name as we
had before, which should make porting crates slightly easier.

Release Notes:

- N/A
2023-11-07 10:41:36 -05:00
Antonio Scandurra 103ec87630 Remove focused field and use FocusHandle instead in Editor 2023-11-07 12:46:31 +01:00
Conrad Irwin 5032e61f73 Fix tab text colors 2023-11-03 09:12:12 -06:00
Antonio Scandurra 78393c3e21 Make tab bar visible 2023-11-03 15:51:33 +01:00
Antonio Scandurra c4c9ce9be2 Remove more todos 2023-11-03 14:42:26 +01:00
Antonio Scandurra 82306268bf WIP 2023-11-03 12:10:15 +01:00
Antonio Scandurra 0de4fb1925 Expose a focus handle from workspace::Item 2023-11-03 11:00:57 +01:00
Nathan Sobo 0e80125a44 Get editor2 compiling with a ton of code commented out 2023-11-02 23:35:20 -06:00
Nathan Sobo b7dfb4eeb4 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo 7c2b802283 WIP 2023-11-02 21:03:29 -06:00
Conrad Irwin 6091480720 Into the woods 2023-11-02 18:52:08 -06:00