 Julia
|
a464a7da2a
|
Merge branch 'main' into unborked-git-zed2-diagnostics-view
|
2023-11-17 16:32:35 -05:00 |
|
|
JuliaandNathan Sobo
|
f4eb219c75
|
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 |
|
|
Conrad Irwin
|
0a51784dd0
|
Leaky, but better, test abstraction
|
2023-11-15 14:01:10 -07:00 |
|
|
Antonio Scandurra
|
08dfcba68a
|
Fix panic when painting blocks
|
2023-11-15 20:02:35 +01:00 |
|
|
Antonio ScandurraandNathan Sobo
|
c7b7f7dfd5
|
Move render_view into View::render_with
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
|
2023-11-15 18:50:09 +01:00 |
|
|
Antonio ScandurraandNathan Sobo
|
9ff238921f
|
Fix clicking on code action and fold indicators
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
|
2023-11-15 18:29:53 +01:00 |
|
|
Antonio ScandurraandNathan Sobo
|
17b8e4a684
|
Handle clicking folded ranges
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
|
2023-11-15 18:19:26 +01:00 |
|
|
Antonio ScandurraandNathan Sobo
|
3ff8c78b58
|
Return a Fold struct when querying the FoldMap
This contains a new `id` field that lets us distinguish among folds.
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
|
2023-11-15 17:09:59 +01:00 |
|
|
Antonio Scandurra
|
851a60a68e
|
Render fold indicators in the gutter
|
2023-11-15 14:07:37 +01:00 |
|
|
Antonio Scandurra
|
45381e566c
|
Fix focus management on editor when renaming
|
2023-11-15 11:05:09 +01:00 |
|
|
Antonio Scandurra
|
003e4bc241
|
Extract out a register_actions function
|
2023-11-15 09:53:32 +01:00 |
|
|
Antonio Scandurra
|
feeb44c122
|
Merge remote-tracking branch 'origin/main' into editor2-rename
# Conflicts:
# crates/editor2/src/editor.rs
# crates/editor2/src/element.rs
# crates/gpui2/src/style.rs
|
2023-11-15 09:51:33 +01:00 |
|
|
Antonio Scandurra
|
c3094b7c3d
|
Introduce gpui::render_view
|
2023-11-15 09:45:23 +01:00 |
|
|
Antonio Scandurra
|
1def355d44
|
Don't return Result from TextStyle::highlight
|
2023-11-15 09:10:46 +01:00 |
|
|
Mikayla
|
b81b96f353
|
Merge branch 'element-types' of github.com:zed-industries/zed into element-types
|
2023-11-14 15:55:53 -08:00 |
|
|
Mikayla
|
7f72df6dcf
|
Merge branch 'main' into element-types
|
2023-11-14 15:49:10 -08: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
|
1109cd11c8
|
Abandon ship
|
2023-11-14 16:17:24 -07:00 |
|
|
Nathan SoboandJulia
|
bef4df5df9
|
Return an id from Element::element_id instead of calling cx.with_element_id
Co-Authored-By: Julia <julia@zed.dev>
|
2023-11-14 16:05:28 -07:00 |
|
|
Max Brunsfeld
|
ca63a99736
|
Enable tests in project panel 2 (#3325)
|
2023-11-14 15:02:51 -08: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 |
|
|
Max Brunsfeld
|
123faed5b0
|
Re-enable all project panel tests
Some are still failing.
|
2023-11-14 12:45:46 -08:00 |
|
|
Conrad Irwin
|
37d0b8424c
|
Merge branch 'main' into element-types
|
2023-11-14 12:10:26 -07:00 |
|
|
Marshall Bowers
|
76c15229c1
|
Combine LabelColor and IconColor into TextColor
|
2023-11-14 13:48:01 -05:00 |
|
|
Conrad Irwin
|
5dda105182
|
Merge branch 'main' into element-types
|
2023-11-14 11:45:19 -07:00 |
|
|
Antonio Scandurra
|
48b3a90fbf
|
WIP
|
2023-11-14 19:42:07 +01:00 |
|
|
Nathan Sobo
|
bb584cc7c4
|
WIP
|
2023-11-14 11:00:52 -07:00 |
|
|
Antonio Scandurra
|
428be43710
|
Wire up rename editor
|
2023-11-14 18:50:02 +01:00 |
|
|
Antonio Scandurra
|
7f5014b34a
|
Add red background to blocks that need styling
|
2023-11-14 17:15:33 +01:00 |
|
|
Antonio ScandurraandJulia
|
b6914bf0fd
|
Re-enable find all references
Co-Authored-By: Julia <julia@zed.dev>
|
2023-11-14 16:09:29 +01:00 |
|
|
Antonio ScandurraandJulia
|
f9b9b7549f
|
Render block elements
Co-Authored-By: Julia <julia@zed.dev>
|
2023-11-14 16:03:06 +01:00 |
|
|
Antonio Scandurra
|
fc5ec47cc8
|
WIP
|
2023-11-14 14:48:59 +01:00 |
|
|
Nathan Sobo
|
364e3e7de5
|
Merge remote-tracking branch 'origin/main' into element-types
|
2023-11-14 01:55:58 -07:00 |
|
|
Nathan Sobo
|
27fb381cca
|
Checkpoint
|
2023-11-14 01:15:48 -07:00 |
|
|
Nathan Sobo
|
4a3a1ad0c3
|
Checkpoint
|
2023-11-13 22:42:19 -07:00 |
|
|
Conrad Irwin
|
e0416e9d2a
|
Fix SingleLine editor font size
|
2023-11-13 21:41:41 -07:00 |
|
|
Nathan Sobo
|
044d9679ab
|
Checkpoint
|
2023-11-13 21:40:02 -07:00 |
|
|
Nathan Sobo
|
922bb3195b
|
WIP
|
2023-11-13 18:58:42 -07:00 |
|
|
Conrad Irwin
|
06f3c60be8
|
Fix action dispatching...
|
2023-11-13 18:56:59 -07:00 |
|
|
Nathan Sobo
|
76754c559c
|
WIP
|
2023-11-13 18:18:25 -07:00 |
|
|
Mikayla
|
d197660d3b
|
Fix broken tests and comment out remaining tests
|
2023-11-13 16:46:06 -08:00 |
|
|
Mikayla
|
7d1593b90c
|
Merge branch 'main' into editor-tests
|
2023-11-13 15:53:22 -08:00 |
|
|
Mikaylaandconrad
|
a4e9fea133
|
WIP
co-authored-by: conrad <conrad.irwin@zed.dev>
|
2023-11-13 15:53:04 -08:00 |
|
|
Marshall Bowers
|
53117eb5e5
|
Merge branch 'main' into one-themes
|
2023-11-13 18:16:45 -05:00 |
|
|
Nate Butler
|
dd434588ee
|
WIP
|
2023-11-13 17:38:44 -05:00 |
|
|
Conrad Irwin
|
f464d69ff8
|
Merge branch 'main' into dispatch-tree
|
2023-11-13 13:21:57 -07:00 |
|
|
Mikayla
|
0e3fd92bd0
|
Get editor tests compiling
|
2023-11-13 12:10:14 -08:00 |
|
|
Mikayla
|
4c5d5105f3
|
Merge branch 'main' into editor-tests
|
2023-11-13 09:54:02 -08:00 |
|
|
Antonio Scandurra
|
a6c95ad331
|
Fix panic when querying available actions
|
2023-11-13 18:29:18 +01:00 |
|