Kirill Bulatov
89e44d4901
Remove binary target collisions between zed & zed2
2023-11-17 09:56:28 +02:00
Mikayla
4de2c0f7ef
Re-implement actions as derive macros instead of blanket impls
2023-11-16 17:32:02 -08: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
Kirill Bulatov
ab0a3f19ab
Add an actual context menu into terminal-2
...
(click the text, not the pane!)
Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-16 16:36:44 +02:00
Kirill Bulatov
f638d4ce1d
Add basic context menu element
2023-11-16 14:35:13 +02:00
Kirill Bulatov
fd61683c46
WIP
2023-11-16 10:40:02 +02:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Mikayla
c70c0f9ae9
Remove initialize_workspace
2023-11-15 23:11:31 -08:00
Conrad Irwin
7f70712dac
Uncomment enough to register the panel
2023-11-15 16:44:21 -07:00
Conrad Irwin
793fa6e3a4
Move placeholder titlebar render to collab_ui
2023-11-15 16:09:21 -07:00
Conrad Irwin
84bcbf1128
Add collab_ui2
2023-11-15 16:08:03 -07:00
Mikayla Maki
df64a3c701
Not working yet file-finder2 ( #3321 )
...
Porting file_finder
Release Notes:
- N/A
2023-11-14 15:22:59 -08:00
Conrad Irwin
80b7f75d24
Merge branch 'main' into file_finder
2023-11-14 13:34:25 -07:00
Mikayla
3419aaf17e
Fix several shutdown related bugs
2023-11-14 11:42:58 -08:00
Mikayla
27574524b8
Restore quit action
2023-11-14 10:31:55 -08:00
Mikayla
caa0bae04f
Merge branch 'main' into core-actions
2023-11-14 10:11:39 -08:00
Max Brunsfeld
b893ac2a02
Merge branch 'main' into project-panel2
2023-11-14 09:33:48 -08:00
Conrad Irwin
7d94d8940c
Not working yet file-finder2
2023-11-14 09:28:18 -07:00
Mikayla
8aa076692e
Add missing global
2023-11-14 00:09:42 -08:00
Mikayla
ee4957dd47
Implement most core actions
2023-11-14 00:06:33 -08:00
Mikayla
ec16e70336
Sketch in core zed actions code
2023-11-13 22:13:07 -08:00
Mikayla Maki
ca3341f066
Improve actions macros ( #3292 )
...
- `actions!` now uses `#[action]` on each struct to reduce duplication.
- The `#[action]` macro now works on unit structs.
- Renamed `menu::unused` to `menu::init` and added more explanation in
comments.
Release Notes:
- N/A
2023-11-13 17:14:56 -08:00
Mikayla
a4e9fea133
WIP
...
co-authored-by: conrad <conrad.irwin@zed.dev>
2023-11-13 15:53:04 -08:00
Max Brunsfeld
1968becf94
Merge branch 'main' into project-panel2
2023-11-13 11:26:51 -08:00
Mikayla
4c5d5105f3
Merge branch 'main' into editor-tests
2023-11-13 09:54:02 -08:00
Conrad Irwin
a73265ace4
Merge branch 'main' into command_palette2
2023-11-09 20:58:54 -07:00
Max Brunsfeld
b9e098ead8
Start work on creating gpui2 version of project panel
2023-11-09 16:51:03 -08:00
Nathan Sobo
408a495aaf
Call init
2023-11-09 13:14:11 -07:00
Max Brunsfeld
c6b76d908f
Use normal JS comments within JSX tags and JSX expression blocks ( #3290 )
...
This fix only required changing the `overrides` queries for JavaScript
and TSX. I've made the fix in both the `zed2` and `zed` crates.
Release Notes:
- Fixed an issue in JavaScript and TSX files, where the 'toggle
comments' command used the wrong comment syntax inside of JSX tags and
expressions within JSX.
2023-11-09 11:15:08 -08:00
Max Brunsfeld
4c89b2885e
Use normal JS comments within JSX tags and JSX expression blocks
...
Co-authored-by: Kirill <kirill@zed.dev>
2023-11-09 10:58:33 -08:00
Nathan Sobo
f5f9d881d7
Polish actions macros
2023-11-09 11:57:13 -07:00
Piotr Osiewicz
d184e0d426
Start working on command_palette2
2023-11-09 17:54:05 +01:00
Julia
9cb14c189b
zed2: Get tsserver running again
2023-11-09 11:43:40 -05:00
Mikayla
f569628088
Merge branch 'more-gpui2-apis' into editor-tests
2023-11-08 22:19:11 -08:00
Mikayla
86630bbe59
Add extra clone
2023-11-08 22:16:08 -08:00
Mikayla
269c3ea244
Uncomment tests
2023-11-08 22:11:51 -08:00
Mikayla Maki
8330fb5f10
port rope2 to zed2 ( #3224 )
...
port rope2 to zed2
Release Notes:
- NA
2023-11-08 20:19:05 -08:00
Conrad Irwin
cbdd4aca89
Merge branch 'main' into go-to-line2
2023-11-08 14:46:52 -07:00
Mikayla
097efdebc5
WIP
2023-11-08 12:49:09 -08:00
Marshall Bowers
acf37804eb
Use a fork of ctor to silence warnings generated by macro ( #3275 )
...
This PR switches us over to a fork of `ctor` that contains the fixes
from https://github.com/mmastrac/rust-ctor/pull/295 , backported to our
current version of `ctor` (v0.1.20).
Once 1) the `ctor` maintainer publishes a new version with that change
and 2) we're ready to upgrade to the latest version of `ctor` we can
switch back to the mainline version.
Release Notes:
- N/A
2023-11-08 15:05:19 -05:00
Marshall Bowers
fe28d8faea
Merge branch 'main' into picker
2023-11-08 11:18:54 -05:00
Nathan Sobo
814e62050c
Register actions globally before main
2023-11-07 20:58:37 -07:00
Max Brunsfeld
d690fb038d
Merge branch 'main' into picker
2023-11-07 11:27:14 -08:00
Antonio Scandurra
4bf3a4e3d4
Implement movement in editor2 ( #3256 )
...
Release Notes:
- N/A
2023-11-07 19:12:09 +01:00
Max Brunsfeld
69eb49a2ed
Merge branch 'main' into picker
2023-11-07 09:34:57 -08:00
Antonio Scandurra
82a018996b
WIP
2023-11-07 17:54:14 +01:00
Conrad Irwin
a2a28af052
Add Modals
...
P.S. this is all completely different now
Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Julia <julia@zed.dev>
2023-11-07 09:18:34 -07:00
Antonio Scandurra
bdf6e8bcc7
Merge remote-tracking branch 'origin/main' into editor2-paint
2023-11-07 13:09:48 +01:00
Antonio Scandurra
a866370dc1
Paint lines
2023-11-07 12:25:33 +01:00
Mikayla
85000eba81
wip: picker
...
co-authored-by: nathan <nathan@zed.dev>
co-authored-by: max <max@zed.dev>
2023-11-06 17:09:38 -08:00
