Commit Graph
84 Commits
Author SHA1 Message Date
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
Antonio Scandurra 08dfcba68a Fix panic when painting blocks 2023-11-15 20:02:35 +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 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 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
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
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 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
Nathan Sobo 044d9679ab Checkpoint 2023-11-13 21:40:02 -07:00
Nathan Sobo 922bb3195b WIP 2023-11-13 18:58:42 -07:00
Nathan Sobo 76754c559c WIP 2023-11-13 18:18:25 -07: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
Antonio Scandurra a6c95ad331 Fix panic when querying available actions 2023-11-13 18:29:18 +01:00
Antonio Scandurra c8fb8e2859 💄 2023-11-13 15:20:43 +01:00
Antonio ScandurraandThorsten 9c18253863 Register key and action listeners using Interactive::initialize
Co-Authored-By: Thorsten <mrnugget@gmail.com>
2023-11-13 11:37:57 +01:00
Nathan Sobo 7eaba8fabc WIP 2023-11-10 14:47:45 -07:00
Nathan SoboandAntonio Scandurra 74a0d9316a Add a DispatchTree which will replace the existing key dispatch strategy
Instead of freezing a stack, we will record the entire dispatch tree so we can
change focus.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-11-10 11:56:14 -07:00
Antonio Scandurra fb450e35f7 Wire up keyboard interaction in code actions menu 2023-11-10 16:41:21 +01:00
Antonio Scandurra a30b47aa5f Show a very basic code actions menu 2023-11-10 12:26:35 +01:00
b029083441 Start on rendering context menu in editor2
Co-Authored-By: Nathan <nathan@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>
2023-11-09 19:03:10 +01:00
Antonio ScandurraandNathan 5d15886675 Render code actions indicator
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-09 18:43:26 +01:00
Nathan Sobo 9a022671a2 Simplify IME support 2023-11-08 21:06:00 -07:00
Max Brunsfeld 86865431b9 Assign gutter widht on editor view when painting element 2023-11-08 17:01:50 -08:00
Max BrunsfeldandMarshall 1a37d9edc6 Register text input handlers via new element hook
Provide element bounds to the input handler's `bounds_for_rect` method.

Co-authored-by: Marshall <marshall@zed.dev>
2023-11-08 15:48:55 -08:00
Marshall Bowers fe28d8faea Merge branch 'main' into picker 2023-11-08 11:18:54 -05:00
Antonio Scandurra 55dca1e3e1 💄 2023-11-08 15:33:11 +01:00
Antonio Scandurra 15d40d6df5 Determine whether the gutter was hovered 2023-11-08 15:30:41 +01:00
Antonio Scandurra dfc536b4f5 Handle MouseUpEvent in editor2 2023-11-08 15:17:30 +01:00
Antonio Scandurra e500c05880 Move building of key listeners outside of EditorElement::initialize 2023-11-08 15:12:54 +01:00
Antonio ScandurraandPiotr bef3b80bd4 Clear hover background highlights
Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-08 15:08:54 +01:00