Joseph T. Lyons 2a68a6171a Remove remnants from conflict resolution (#3528) ...

Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A

2023-12-06 23:44:49 -05:00

..

display_map

Get app menus basically working

2023-12-05 16:37:01 -07:00

scroll

Make inlay hint cache tests pass

2023-11-13 18:25:21 +02:00

test

Get diagnostics view almost building in the zed2 world

2023-11-17 16:32:35 -05:00

blink_manager.rs

Fix blinking behavior in editor when receiving/losing focus

2023-11-08 19:03:57 +01:00

display_map.rs

Use a better name for zed2 inlay style field

2023-12-06 22:06:30 +02:00

editor_settings.rs

Fix editor settings deserialization in editor2

2023-11-09 15:37:46 -08:00

editor_tests.rs

Document geometry module and replace zero method with default (#3515)

2023-12-06 12:52:41 -07:00

editor.rs

Remove remnants from conflict resolution (#3528)

2023-12-06 23:44:49 -05:00

element.rs

Merge branch 'main' into terminal-element

2023-12-06 15:20:04 -08:00

git.rs

Fix git test compilation

2023-12-04 17:57:43 +01:00

highlight_matching_bracket.rs

Fix highlight tests (and a quirky behaviour where the highlights were not dismissed when user clicks on something that's not a brace)

2023-12-05 10:17:27 +01:00

hover_popover.rs

Style hover popover

2023-11-29 14:56:23 -05:00

inlay_hint_cache.rs

Fix up the inlay_hint_cache proper (document the bug around inserting at inlay hint).

2023-12-05 14:10:10 +01:00

items.rs

Merge branch 'main' into terminal-element

2023-12-06 15:20:04 -08:00

link_go_to_definition.rs

Uncomment a bunch of tests in the editor

2023-12-01 18:11:27 +01:00

mouse_context_menu.rs

Editor2 tests (#3486)

2023-12-05 14:52:20 +01:00

movement.rs

Another batch of tests

2023-12-01 18:43:44 +01:00

persistence.rs

Get editor2 compiling with a ton of code commented out

2023-11-02 23:35:20 -06:00

scroll.rs

Merge branch 'main' into unborked-git-zed2-diagnostics-view

2023-11-17 16:32:35 -05:00

selections_collection.rs

Remove stray dbg statements

2023-12-01 11:49:25 +01:00

test.rs

Fix error in tests

2023-11-30 11:45:10 +01:00