Commit Graph
415 Commits
Author SHA1 Message Date
Antonio ScandurraandNathan Sobo bef24626c8 Don't use Mutex or Arc now that app state is not Send
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-15 18:50:34 +01:00
Antonio ScandurraandNathan Sobo 356b0f81d9 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 7499613cd9 Handle clicking folded ranges
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-15 18:19:26 +01:00
Antonio ScandurraandNathan Sobo ab975210e3 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 b68d2d2484 Fix formatting 2023-11-15 11:07:32 +01:00
Antonio Scandurra 4cec3b821e 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 23b886b429 Introduce gpui::render_view 2023-11-15 09:45:23 +01:00
Antonio Scandurra b086285a00 Don't return Result from TextStyle::highlight 2023-11-15 09:10:46 +01:00
Nathan Sobo ac0bae0e5e Fix click events by notifying when we assign pending_mouse_down 2023-11-14 19:22:41 -07:00
7ecd51e1ae Fix uncached raster_bounds computation and font selection
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-11-14 17:19:10 -08:00
Mikayla 7d62f43366 Merge branch 'main' into element-types 2023-11-14 15:49:10 -08:00
Mikayla Maki 6f46f73f98 Not working yet file-finder2 (#3321)
Porting file_finder

Release Notes:

- N/A
2023-11-14 15:22:59 -08:00
Conrad Irwin 37b4e9f922 Abandon ship 2023-11-14 16:17:24 -07:00
Max Brunsfeld 3b59f4c242 Enable tests in project panel 2 (#3325) 2023-11-14 15:02:51 -08:00
Max Brunsfeld 540ee65438 Implement simulated prompts in TestPlatform 2023-11-14 14:56:50 -08:00
Mikayla 2f92e4ff1b WIP 2023-11-14 14:48:34 -08:00
Conrad Irwin 07e3bcb6b2 In the middle of stuff 2023-11-14 14:38:23 -07:00
Max Brunsfeld 991eff1b36 Re-enable all project panel tests
Some are still failing.
2023-11-14 12:45:46 -08:00
Mikayla 92c4cb8e03 Remove unnescessary unimplemented 2023-11-14 12:12:02 -08:00
Mikayla 787221d9b8 Fix several shutdown related bugs 2023-11-14 11:42:58 -08:00
Conrad Irwin 8f1a3dd175 Merge branch 'main' into element-types 2023-11-14 12:10:26 -07:00
Conrad Irwin 56c202d66a Merge branch 'main' into element-types 2023-11-14 11:45:19 -07:00
Mikayla d9bb871ff2 Restore quit action 2023-11-14 10:31:55 -08:00
Conrad Irwin 1a79b76549 Fix panicking unwrap() 2023-11-14 11:27:52 -07:00
Mikayla e34d1ac975 Merge branch 'main' into core-actions 2023-11-14 10:11:39 -08:00
Nathan Sobo 5fcd29f74d WIP 2023-11-14 11:00:52 -07:00
Max Brunsfeld 8a5d22df92 Start work on creating gpui2 version of project panel (#3299)
I'm gonna land what I have, even though some features aren't ported yet,
since we're working on all of this code so actively.

* [x] get the basic structure compiling
* [x] get the panel laying out correctly
* [ ] rename / new file editor
* [ ] enable the tests
* [ ] drag and drop
* [ ] context menu
2023-11-14 09:56:46 -08:00
Max Brunsfeld 9722d725c8 Merge branch 'main' into project-panel2 2023-11-14 09:33:48 -08:00
Nathan Sobo cb7f087439 Remove commented field 2023-11-14 09:33:28 -07:00
Antonio ScandurraandJulia db02124a74 Return the line length when x is past the last glyph
Co-Authored-By: Julia <julia@zed.dev>
2023-11-14 17:06:18 +01:00
Antonio ScandurraandJulia 05a555e2ef Honor cmd-w to close active item
Co-Authored-By: Julia <julia@zed.dev>
2023-11-14 16:38:20 +01:00
Nathan Sobo 7d1a6a81df Merge remote-tracking branch 'origin/main' into element-types 2023-11-14 01:55:58 -07:00
Nathan Sobo 4df524687e Rename back to div 2023-11-14 01:41:55 -07:00
Nathan Sobo 1e11a7d172 Remove unnecessary with_element_id calls 2023-11-14 01:38:13 -07:00
Nathan Sobo b7a62fdbc6 Remove div module 2023-11-14 01:25:10 -07:00
Nathan Sobo 20a4aa3a9a No compile errors or warnings 2023-11-14 01:23:09 -07:00
Nathan Sobo 14d5584205 Checkpoint 2023-11-14 01:15:48 -07:00
Mikayla f966568f8c Implement most core actions 2023-11-14 00:06:33 -08:00
Nathan Sobo d2724a88e4 Checkpoint 2023-11-13 23:15:45 -07:00
Nathan Sobo 2a1537855b Checkpoint 2023-11-13 23:03:14 -07:00
Nathan Sobo e70336c4e4 Checkpoint 2023-11-13 22:51:44 -07:00
Nathan Sobo e39081c034 Checkpoint 2023-11-13 22:42:19 -07:00
Nathan Sobo a84bddd24c Checkpoint 2023-11-13 22:28:33 -07:00
Nathan Sobo f59207d5b5 Checkpoint 2023-11-13 22:22:09 -07:00
Nathan Sobo 3637cfd097 Checkpoint 2023-11-13 22:02:05 -07:00
Conrad Irwin 0bbd5b0775 Allow clicking on commands in the command palette 2023-11-13 21:42:27 -07:00
Nathan Sobo 08263e156a Checkpoint 2023-11-13 21:40:02 -07:00
Conrad Irwin bb2477eb42 Add Text::styled() and use it in command palette
Prevents jumping while typing
2023-11-13 19:53:55 -07:00
Nathan Sobo 298e4b6e7e Checkpoint 2023-11-13 19:23:07 -07:00
Nathan Sobo 2abcae44a1 WIP 2023-11-13 18:58:42 -07:00