mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 18:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
8828 commits 773 branches 798 tags 274 MiB
Commit graph

8828 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max Brunsfeld
abdccf7393 Use a workspace dependency for the futures crate 2023-04-24 09:43:31 -07:00
Mikayla Maki
d82cc49f79
Merge pull request #2408 from zed-industries/change-copilot-wording 
Change copilot wording to be more explicit
 2023-04-25 04:28:23 +12:00
Mikayla Maki
c12e2ac3fb fix formatting 2023-04-24 09:25:04 -07:00
Mikayla Maki
c7874cf169
Update copilot_button.rs 2023-04-24 09:03:54 -07:00
Mikayla Maki
455d383d08 Change copilot wording to be more explicit 2023-04-21 21:42:23 -07:00
Mikayla Maki
f10de10915
Merge pull request #2406 from zed-industries/fix-nondeterministic-terminal-test 
Fix minor terminal bugs
 2023-04-22 12:42:20 +12:00
Mikayla Maki
fa7f4974a0 Remove unused import 2023-04-21 17:26:45 -07:00
Mikayla Maki
733abc9ed2 Revert previous change 2023-04-21 17:24:20 -07:00
Mikayla Maki
616188c541 Fix a bug where the character under a cursor could not reliably be selected 2023-04-21 17:15:29 -07:00
Mikayla Maki
8e0d359c63
Merge branch 'main' into fix-nondeterministic-terminal-test 2023-04-22 11:17:06 +12:00
Mikayla Maki
d841c3729b Wire through the gutter, rather than implicitly adding it 2023-04-21 16:12:33 -07:00
Mikayla Maki
23932b7e6c Fixed non-deterministic test failure and made mouse to cell conversion work correctly 2023-04-21 16:06:07 -07:00
Max Brunsfeld
06cb388beb
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
e6604d1641 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
bce51c521a
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
993dbf86cb Merge remote-tracking branch 'origin/main' into into-element 2023-04-21 14:27:25 -06:00
Nathan Sobo
09111b65d8
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
caf3d5c163 Fix more formatting 2023-04-21 14:25:49 -06:00
Nathan Sobo
c1810e8ec9 Fix formatting 2023-04-21 13:09:36 -06:00
Nathan Sobo
fe492eacbf Refine naming of element-related types and traits 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-04-21 13:06:37 -06:00
Antonio Scandurra
03619dfa55 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
69273648b3
Merge pull request #2402 from zed-industries/fix-panics 
Fix panic in pane.rs
 2023-04-22 05:53:48 +12:00
Mikayla Maki
b8fd6435d7 Fix test covering this case 2023-04-21 10:48:34 -07:00
Mikayla Maki
aa2af53f56 Align return of close_active_item to match original format 2023-04-21 10:44:27 -07:00
Mikayla Maki
39512655aa 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
6ee0d104d6 Fix panic in remove active item 2023-04-21 10:08:52 -07:00
Petros Amoiridis
c9048b54c1
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 Scandurra
4ac894ffbe Remove unnecessary lifetime parameter from WindowContext 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-21 18:06:53 +02:00
Antonio Scandurra
a4fbcbf160
Merge pull request #2400 from zed-industries/fix-breadcrumbs-signature 
Fix `ProjectDiagnosticsEditor::breadcrumbs` signature
 2023-04-21 18:06:22 +02:00
Antonio Scandurra
4d433663bd Fix ProjectDiagnosticsEditor::breadcrumbs signature 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-21 17:54:26 +02:00
Antonio Scandurra
238ebafa48
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
88406045f5
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
3992e95109
Add newline shortcuts for popular editors 2023-04-21 18:29:35 +03:00
Antonio Scandurra
f54a289b6f Remove handle to view from TerminalElement 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-21 16:56:06 +02:00
Antonio Scandurra
a860a6cd62 Make App::notify_view private 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-21 16:50:57 +02:00
Antonio Scandurra
8c7f821d14 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
c3231047ad
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 Scandurra
f12746c4b7 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 Scandurra
31e906d068 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
65c5605e68
Look for the main display always 2023-04-21 17:18:01 +03:00
Petros Amoiridis
3c54b14c5b
Remove debugging information 2023-04-21 17:17:04 +03:00
Antonio Scandurra
5b40641fde Take a target view when marking an element as draggable 2023-04-21 15:52:05 +02:00
Antonio Scandurra
b0cbd13e7a Remove stray push_layer from EditorElement::paint 2023-04-21 11:46:13 +02:00
Antonio Scandurra
e5192a4853 Use update_default_global to filter command palette items for copilot 2023-04-21 11:07:36 +02:00
Antonio Scandurra
c76b9794e4 Merge branch 'main' into window_context_2 2023-04-21 10:58:08 +02:00
Antonio Scandurra
d32a7218cd Remove stray dbg! statements 2023-04-21 10:49:47 +02:00
Julia
c7cc5bca02 Render breadcrumbs for diagnostics multi-buffer 2023-04-20 23:39:45 -04:00
Mikayla Maki
8e4cc549dc
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
1fa52adabd Fix warning 2023-04-20 17:34:47 -07:00
Mikayla Maki
c72b70d4ae Fixed silly custom settings parsing 2023-04-20 17:33:06 -07:00