Commit Graph
39175 Commits
Author SHA1 Message Date
Mikayla Maki b543f3cd78 Remove unused import 2023-04-21 17:26:45 -07:00
Mikayla Maki d1c34e5867 Revert previous change 2023-04-21 17:24:20 -07:00
Mikayla Maki ec2d62aa57 Fix a bug where the character under a cursor could not reliably be selected 2023-04-21 17:15:29 -07:00
Mikayla Maki 3ef8e04779 Merge branch 'main' into fix-nondeterministic-terminal-test 2023-04-22 11:17:06 +12:00
Mikayla Maki 1c0cfe626a Wire through the gutter, rather than implicitly adding it 2023-04-21 16:12:33 -07:00
Mikayla Maki 5059d4a89b Fixed non-deterministic test failure and made mouse to cell conversion work correctly 2023-04-21 16:06:07 -07:00
Max Brunsfeld 6b0422268f Merge pull request #2404 from zed-industries/fix-command-palette
Stopgap: Fix missing actions in the command palette
2023-04-21 15:16:45 -07:00
Nathan Sobo 4fa5c54c0e Fix missing actions in the command palette
Previously, the workspace view was on the stack when we were computing the
available actions, which excluded it. This is a stopgap. We should find a
better solution ASAP.
2023-04-21 15:59:29 -06:00
Nathan Sobo 6f70efbc86 WIP 2023-04-21 15:36:52 -06:00
Nathan Sobo b1d3a39a5b Eliminate ReadModel trait 2023-04-21 15:05:19 -06:00
Nathan Sobo 42366e2e5f Eliminate ReadView trait 2023-04-21 15:03:57 -06:00
Nathan Sobo 89d6292fab Merge pull request #2403 from zed-industries/into-element
Rename Element to AnyElement, Drawable to Element, and make containers generic over any Element type
2023-04-21 14:44:22 -06:00
Nathan Sobo 1e2bec9c25 Merge remote-tracking branch 'origin/main' into into-element 2023-04-21 14:27:25 -06:00
Nathan Sobo b930041e7e Merge pull request #2401 from zed-industries/simplify-context-lifetimes
Remove unnecessary lifetime parameter from WindowContext
2023-04-21 14:26:26 -06:00
Nathan Sobo 7a981d1019 Fix more formatting 2023-04-21 14:25:49 -06:00
Nathan Sobo e0e12ef862 Fix formatting 2023-04-21 13:09:36 -06:00
Nathan SoboandMax Brunsfeld 52d4cc5349 Refine naming of element-related types and traits
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-04-21 13:06:37 -06:00
2bd56ab6f0 Rename Drawable::boxed to into_element and make containers generic
Multi-element are now generic over any drawable child, which can be converted
into an element.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-04-21 12:43:19 -06:00
Mikayla Maki 1f01055a9d Merge pull request #2402 from zed-industries/fix-panics
Fix panic in pane.rs
2023-04-22 05:53:48 +12:00
Mikayla Maki d74f30753a Fix test covering this case 2023-04-21 10:48:34 -07:00
Mikayla Maki 246a4e0a89 Align return of close_active_item to match original format 2023-04-21 10:44:27 -07:00
Mikayla Maki 8d8440ace2 Remove unused cyclic dependency from copilot crate
Move notification handling earlier so that there are less copilot messages in the log
2023-04-21 10:38:36 -07:00
Mikayla Maki 72d0782400 Fix panic in remove active item 2023-04-21 10:08:52 -07:00
Petros Amoiridis 66c519461e Merge pull request #2399 from zed-industries/petros/z-827-copy-the-newline-shortcuts-to-zed
Add newline shortcuts for popular editors
2023-04-21 19:09:10 +03:00
Antonio ScandurraandNathan Sobo a614b9528b Remove unnecessary lifetime parameter from WindowContext
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-04-21 18:06:53 +02:00
Antonio Scandurra 959e1b3cee Merge pull request #2400 from zed-industries/fix-breadcrumbs-signature
Fix `ProjectDiagnosticsEditor::breadcrumbs` signature
2023-04-21 18:06:22 +02:00
Antonio ScandurraandNathan Sobo 2c9147d2df Fix ProjectDiagnosticsEditor::breadcrumbs signature
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-04-21 17:54:26 +02:00
Antonio Scandurra b9b4f7d61f Merge pull request #2372 from zed-industries/window_context_2
Give elements access to their parent views and simplify contexts
2023-04-21 17:32:14 +02:00
Julia 05e37191cd Merge pull request #2398 from zed-industries/fix-diagnostics-breadcrumbs
Render breadcrumbs for diagnostics multi-buffer
2023-04-21 11:31:35 -04:00
Petros Amoiridis 812c3bd193 Add newline shortcuts for popular editors 2023-04-21 18:29:35 +03:00
Antonio ScandurraandNathan Sobo 68332f6149 Remove handle to view from TerminalElement
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-04-21 16:56:06 +02:00
Antonio ScandurraandNathan Sobo c8bb19eb92 Make App::notify_view private
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-04-21 16:50:57 +02:00
Antonio ScandurraandNathan Sobo ae5f3c235e Introduce a new WindowContext::remove_window API
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-04-21 16:39:53 +02:00
Petros Amoiridis 3a76392cb0 Merge pull request #2396 from zed-industries/petros/z-77-the-start-local-collaboration-script-no
Fix script/start-local-collaboration
2023-04-21 17:36:22 +03:00
Antonio ScandurraandNathan Sobo a640adb743 Avoid double borrow of view in ProjectPanel drag and drop
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-04-21 16:23:47 +02:00
Antonio ScandurraandNathan Sobo 61417a32f5 Avoid double borrow of views on up and up_out in DragAndDrop
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-04-21 16:19:51 +02:00
Petros Amoiridis da04cdb944 Look for the main display always 2023-04-21 17:18:01 +03:00
Petros Amoiridis c7494a1eaf Remove debugging information 2023-04-21 17:17:04 +03:00
Antonio Scandurra 64ef8b76d3 Take a target view when marking an element as draggable 2023-04-21 15:52:05 +02:00
Antonio Scandurra 0912090a50 Remove stray push_layer from EditorElement::paint 2023-04-21 11:46:13 +02:00
Antonio Scandurra d232656bed Use update_default_global to filter command palette items for copilot 2023-04-21 11:07:36 +02:00
Antonio Scandurra d2930f462c Merge branch 'main' into window_context_2 2023-04-21 10:58:08 +02:00
Antonio Scandurra b8e92e6d6a Remove stray dbg! statements 2023-04-21 10:49:47 +02:00
Julia e6de8aa698 Render breadcrumbs for diagnostics multi-buffer 2023-04-20 23:39:45 -04:00
Mikayla Maki 21b98c8d81 Merge pull request #2397 from zed-industries/finally-fix-terminal-line-height
Create a new setting to adjust the line height in the terminal
2023-04-21 12:39:49 +12:00
Mikayla Maki a62f4b054f Fix warning 2023-04-20 17:34:47 -07:00
Mikayla Maki 2d2449ac9d Fixed silly custom settings parsing 2023-04-20 17:33:06 -07:00
Mikayla Maki 46d53c02db Merge branch 'main' into finally-fix-terminal-line-height 2023-04-21 12:26:32 +12:00
Mikayla Maki f732210e2b Create a new setting to adjust the line height in the terminal 2023-04-20 17:24:27 -07:00
Nathan Sobo 49dd95e72e Remove unnecessary replace 2023-04-20 15:26:48 -06:00