Commit Graph
1079 Commits
Author SHA1 Message Date
Mikayla Maki 63747c8fee made git stuff slightly more themable 2022-09-29 13:16:02 -04:00
Nate Butler 1456445f2a wip 2022-09-29 13:16:02 -04:00
Nate Butler 22b1d0eae9 WIP Git gutter styling 2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 1da2b63b97 Move git related things into specialized git crate
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 51d8a04748 WIP Notifying buffers of head text change
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
8f5a2a7a4f Pull git indicator colors out of theme
Co-Authored-By: Kay Simmons <kay@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Julia 3eadb80c9a Fully qualify outside git-related code when a diff is a git diff 2022-09-29 13:16:02 -04:00
Julia 6d23cbedc2 Properly invalidate when async git diff completes 2022-09-29 13:16:02 -04:00
Julia 8c17183c5a Changed diffs to be async and dropped git delay 2022-09-29 13:16:02 -04:00
Julia 203d0b2770 Track buffer row divergence while iterating through diff lines
This allows for offsetting head row index of deleted lines to normalize
into buffer row space
2022-09-29 13:16:02 -04:00
Julia 984f7052b2 Handle deletions more robustly and correctly 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 26464ad25b Update git gutter status after debounced delay
Co-authored-by: Max Brunsfeld <max@zed.com>
2022-09-29 13:16:02 -04:00
Julia f116340818 Render deletion gutter markers 2022-09-29 13:16:02 -04:00
Julia d05e7a0b5b Correct start/end of git diff hunks 2022-09-29 13:16:02 -04:00
Julia a23c5ded3a Correct git gutter indicator scroll position & add rounded corner 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 745b30e6e9 Start painting some sort of hunk info, it's wrong but it's close
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-09-29 13:16:01 -04:00
Julia 2da503a3d9 Start asking Editors to update git after a debounced delay 2022-09-29 13:16:01 -04:00
Max Brunsfeld ec18564a71 Merge branch 'main' into new-signup-flow 2022-09-27 15:35:05 -07:00
Nathan SoboandMax Brunsfeld 76f5e0a317 Report editor open and save events to Amplitude
Co-authored-by: Max Brunsfeld <max@zed.dev>
2022-09-26 18:18:34 -06:00
Julia 77caf6c127 Test manual buffer format trigger 2022-09-23 12:15:24 -04:00
Julia 018a737961 Add editor action to manually invoke buffer format 2022-09-22 18:21:05 -04:00
Mikayla Maki f91893df59 Fixed autoscroll jump on 4-click 2022-09-19 17:05:10 -07:00
Antonio Scandurra a4f2fa0d27 Merge branch 'main' into capture 2022-09-15 12:02:07 +02:00
Antonio Scandurra fe728a9eb8 Refresh windows when OS appearance changes 2022-09-14 11:47:43 +02:00
K Simmons 631ddb228d Add tests for the dock 2022-09-13 19:18:05 -07:00
K SimmonsandMikayla Maki 1e0064fd95 Fix hovering over hover popovers in the editor
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-13 13:35:06 -07:00
K SimmonsandMikayla Maki 7816d96dc1 Permanent fix to repeat MouseRegion Tag failure in Workspace
Polish tab bar buttons

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-11 15:34:10 -07:00
K SimmonsandMikayla Maki 017f7b75cf DOCK WORKING!
Update editor element to use mouse regions instead of dispatch event for mouse events
Fix bug in presenter where mouse region handlers were stored on click and called instead of more up to date handlers from subsequent renders
Changed MouseRegion to require discriminants in all cases
Add scroll wheel event to MouseRegion
Polished a bunch of dock inconsistencies

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-11 15:32:20 -07:00
K Simmons d87b6d68cf WIP dock split button and default item 2022-09-11 15:31:44 -07:00
K SimmonsandMikayla Maki a8473e2186 Introduced ItemEvent and to_item_events function to Item trait which converts the Item's events into a standard ItemEvent similar to how SearchableItems work.
Add breadcrumb_location and breadcrumbs functions to item trait which handles rendering of the breadcrumb elements
Change breadcrumb toolbar to use these new functions rather than having hard coded breadcrumb logic
Add breadcrumb support to the terminal tabs

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-06 16:05:36 -07:00
K Simmons 0f810877d4 WIP pull breadcrumb rendering out into item trait 2022-09-06 14:39:58 -07:00
Mikayla Maki 77dd14da38 Merge pull request #1587 from zed-industries/alac-search
Terminal Search
2022-09-01 13:49:48 -07:00
Mikayla Maki 4e3db12e8e Finished terminal search 2022-09-01 13:45:46 -07:00
Mikayla Maki 978104acfd Actually added all files this time 2022-08-31 20:37:04 -07:00
Mikayla Maki 45da742ada Terminal implements important half of search protocol 2022-08-31 17:41:53 -07:00
K Simmons 529bf68aa0 Add match associated type and fix failing test 2022-08-30 21:53:49 -07:00
K Simmons a13b9e2f71 SearchableItem trait is completed and editor searches appear to be working 2022-08-30 15:37:54 -07:00
Nathan Sobo 128302019d Merge pull request #1557 from zed-industries/operations-hang
Prevent guest disconnection when opening buffers with many operations
2022-08-24 08:47:39 -06:00
Antonio Scandurra 89b54e5272 Move operation serialization off the main thread 2022-08-23 16:34:25 +02:00
Antonio Scandurra ce4bb4e715 Stream buffer ops in the background when creating buffer for peers 2022-08-23 16:05:56 +02:00
Mikayla Maki e08054ac3e Added scroll-to-edge. 2022-08-22 18:24:58 -07:00
ForLoveOfCats 2edfde8e01 Only extend selection with shift without other modifiers 2022-08-21 13:23:48 -04:00
Mikayla Maki 608e599cd3 Merge pull request #1522 from zed-industries/terminal-mouse
Terminal mouse mode
2022-08-19 15:19:27 -07:00
ForLoveOfCats 7c29c3a20d Include empty selections in updating link logic on cmd/shift changed
Prevents an issue where pressing cmd while the mouse button is down
would create a link which would fire on mouse up if the selection was
still empty
2022-08-19 17:25:35 -04:00
Mikayla Maki 001a8931fa Merge branch 'terminal-mouse' of github.com:zed-industries/zed into terminal-mouse 2022-08-19 13:04:34 -07:00
Mikayla Maki b174efaf44 Added modifiers to scroll wheel eevent 2022-08-19 12:10:12 -07:00
Julia ec787357a1 Merge pull request #1537 from zed-industries/fix-goto-links-with-selections
Fix goto links with selections
2022-08-18 18:49:21 -04:00
ForLoveOfCatsandMax Brunsfeld ca94553ba1 Add test for pending selection influence on go-to links
Co-authored-by: Max Brunsfeld <max@zed.dev>
2022-08-18 18:34:01 -04:00
ForLoveOfCatsandAntonio Scandurra 6a14b75286 Avoid triggering goto-definition links while with a pending selection
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2022-08-18 18:34:01 -04:00
Mikayla Maki 7e6729b082 Finished IME for now 2022-08-18 12:57:19 -07:00