Conrad Irwin
f86480ba5d
Merge followup mess
2023-11-20 09:58:05 -07:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Nathan Sobo
33cd6f520a
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Nathan Sobo
adc355a1e6
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Mikayla
149b9d1aa6
Merge branch 'main' into managed-view-adjustment
2023-11-17 12:40:44 -08:00
Mikayla
17d53d0e38
Rename again, add fun cx APIs using new traits
2023-11-17 10:06:41 -08:00
Mikayla
01d9d53f4a
Adjust the type arrangement on ManagedViews
2023-11-17 09:51:11 -08:00
Conrad Irwin
2d1d75f482
+ManagedView
...
And some games with rust traits
2023-11-16 23:02:10 -07:00
Marshall Bowers
b559bfd80f
Parameterize theme2::init
to allow loading just the base theme ( #3345 )
...
This PR adds a parameter to the `theme2::init` method to indicate what
the theme-loading behavior should be.
This allows us to indicate when we want to load all of the additional
built-in user themes (like in the Zed binary and in the storybook), and
when we don't want to load the user themes (like in tests).
We're using an enum over just a `bool` here for clarity at the call
site.
Release Notes:
- N/A
2023-11-16 13:03:30 -05:00
Conrad Irwin
0a51784dd0
Leaky, but better, test abstraction
2023-11-15 14:01:10 -07:00
Conrad Irwin
cebc8428c8
FileFinder tests
2023-11-15 13:16:28 -07:00
Mikayla
817c6dd49c
remove dbg
2023-11-14 15:57:23 -08:00
Mikayla
7f72df6dcf
Merge branch 'main' into element-types
2023-11-14 15:49:10 -08:00
Conrad Irwin
1109cd11c8
Abandon ship
2023-11-14 16:17:24 -07:00
Mikayla
6b25841e2a
WIP
2023-11-14 14:48:34 -08:00
Conrad Irwin
3b01a032ba
In the middle of stuff
2023-11-14 14:38:23 -07:00
Conrad Irwin
3a4c5aa440
Implement FileFinder
2023-11-14 13:34:14 -07:00
Conrad Irwin
f4ccff7b72
TEMP
2023-11-14 11:03:55 -07:00
Conrad Irwin
7d94d8940c
Not working yet file-finder2
2023-11-14 09:28:18 -07:00