Commit Graph
6372 Commits
Author SHA1 Message Date
Mikayla Maki 2eeea32cb0 Fixed cursor color being black 2022-10-18 22:26:14 -07:00
K Simmons 061a82a267 Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
Mikayla Maki 8c42dcf15d Merge pull request #1765 from zed-industries/fix-terminal-hyperlinks
Open hyperlinks on up, not down, and disable them when dragging.
2022-10-17 15:41:40 -07:00
Julia a2e05e3a47 Merge pull request #1768 from zed-industries/git-gutter-meets-code-folding
Git gutter meets code folding (and word wrap fixes)
2022-10-17 14:51:47 -04:00
Julia 5d60592d49 Cleanup 2022-10-17 14:41:16 -04:00
Julia bc4eb620c4 Inclusively check for hunk in fold range 2022-10-17 13:11:11 -04:00
Julia 4298ebd940 Deduplicate identical hunk layouts 2022-10-17 12:41:20 -04:00
Julia 0514ed1976 More concrete usage of display map to handle diff hunk gutter layout 2022-10-17 12:28:44 -04:00
Antonio Scandurra 94785bf538 Merge pull request #1767 from zed-industries/notify-on-auto-update
Notify `ActivityIndicator` when `AutoUpdater` changes
2022-10-17 09:10:57 +01:00
Antonio Scandurra 29291604a6 Notify ActivityIndicator when AutoUpdater changes
This fixes a bug that caused the status bar to not update when the
auto-update system changed its status.
2022-10-17 10:05:38 +02:00
Mikayla Maki 94aae51143 Rearranged mouse handling 2022-10-16 17:31:19 -07:00
Joseph T. Lyons a48136cd77 Merge pull request #1666 from zed-industries/settings-for-journal
Settings for journal
2022-10-16 19:55:27 -04:00
Joseph T Lyons b3c92b828c Derive Serialize on HourFormat 2022-10-16 12:51:48 -04:00
Joseph T Lyons 2f7b78263c Do not derive Default on JournalSettings 2022-10-16 12:51:34 -04:00
Joseph T Lyons 34bc185fcb Merge branch 'main' into settings-for-journal 2022-10-16 12:42:18 -04:00
Nathan Sobo 3e27b81d17 Merge pull request #1762 from zed-industries/less-click-and-hover-invalidation
Reduce unnecessary view invalidations related to mouse events
2022-10-16 10:23:54 -06:00
Nathan Sobo d2431d9540 Merge pull request #1761 from zed-industries/mouse-region-view-invalidation
Remove unconditional invalidation when calling mouse region handlers
2022-10-14 18:31:23 -06:00
Nathan SoboandMax Brunsfeld f80f306ad8 Avoid re-rendering editor on mouse move
Only notify editor when clearing highlights if there were highlights to
begin with.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-14 18:27:55 -06:00
Nathan SoboandMax Brunsfeld 4aff034ff5 Only invalidate parent view on click/hover if we read that state when rendering
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-14 18:09:15 -06:00
Max Brunsfeld f2f6cbb57b Merge pull request #1760 from zed-industries/invite-unknown-platform
Include waitlist entries w/ unknown platform when summarizing and sending invites
2022-10-14 16:24:48 -07:00
Max Brunsfeld a841af67c3 Revert unnecessary logic for fetching invites' platform_unknown flag 2022-10-14 16:13:38 -07:00
Nathan Sobo 5c0f9e5c51 Remove unconditional invalidation when calling mouse region handlers
We want invalidation to opt-in as much as possible.
If you want a view to re-render, you need to call `cx.notify`.
2022-10-14 17:06:46 -06:00
Max Brunsfeld f03687bfcd Include waitlist entries w/ unknown platform when summarizing and sending invites 2022-10-14 15:20:23 -07:00
JuliaandKay Simmons 1eaeba3fc8 WIP
Co-Authored-By: Kay Simmons <kay@zed.dev>
2022-10-14 17:14:33 -04:00
Mikayla Maki 420bd22225 Merge pull request #1759 from zed-industries/move-page-up-down
Move page up / down
2022-10-14 14:02:27 -07:00
Mikayla Maki 7ae0ac843a Finished implementing vscode, emacs, and mac style pageup/down. Added keybindings ctrl-v, alt-v for emacs up/down and shift-pageup, shift-pagedown for vscode style. Also improved incorporated pageup/down into context menus 2022-10-14 13:52:30 -07:00
Max Brunsfeld 669898eef8 v0.60.4 2022-10-14 12:44:22 -07:00
Max BrunsfeldandMikayla Maki 7c96e0d6e6 Add MovePageUp and MovePageDown editor commands
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2022-10-14 12:36:46 -07:00
Max BrunsfeldandMikayla Maki db9bd61f0d Enable auto-scroll when moving cursors in Editor::handle_input
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2022-10-14 11:32:22 -07:00
Max Brunsfeld 299f18a971 Merge pull request #1758 from zed-industries/editor-paint-panic
Consolidate calculation of editor's visible row range
2022-10-14 10:47:16 -07:00
Max Brunsfeld 023bd6ee8f Merge pull request #1757 from zed-industries/detect-unshare
Clear project's shared state upon every disconnection
2022-10-14 10:44:35 -07:00
Max BrunsfeldandNathan Sobo eb0c82b733 Consolidate calculation of editor's visible row range
We think this will fix a panic that was occuring in `paint_highlighted_range`
due to an out-of-bounds read into the line layouts. We think doing essentially the same
calculation in two different ways with floating point numbers might have
caused a different end row to be calculated in 2 different code paths.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-10-14 10:37:44 -07:00
b8f6ec852b Clear project's shared state upon every disconnection
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <as-cii@zed.dev>
2022-10-14 10:17:59 -07:00
Max Brunsfeld 93419ef049 0.60.3 2022-10-14 09:35:57 -07:00
Max Brunsfeld 971c74dc28 Merge pull request #1756 from zed-industries/autoclose-wrong-closing-bracket
Avoid skipping over a different closing bracket in autoclose
2022-10-14 09:34:33 -07:00
Max Brunsfeld e5d18be301 Avoid skipping over a different closing bracket in autoclose 2022-10-14 09:30:30 -07:00
Nathan Sobo 069acfbcfb 0.60.2 2022-10-13 16:26:26 -06:00
Nathan Sobo 6b9221502c Merge pull request #1754 from zed-industries/fix-list-scroll
Pass the current view id when painting List's mouse region instead of 10
2022-10-13 16:24:55 -06:00
Nathan Sobo 58e309df78 Pass the current view id value when painting List's mouse region
Previously, a dummy value was being passed. I think this slipped in accidentally.
2022-10-13 15:57:19 -06:00
JuliaandMax Brunsfeld 5fdc498e61 Quick cut of using display point conversion to layout hunks
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-13 16:34:34 -04:00
Julia 5504e57503 Clean 2022-10-13 15:23:41 -04:00
Julia 26088bede5 Expand diff gutter indicator to cover all of a wrapped line 2022-10-13 14:05:57 -04:00
Julia 7abe6bfd4a Use correct range to get diff hunks in the presence of wrapped lines 2022-10-13 13:52:44 -04:00
Max Brunsfeld eb66efff1e v0.60.1 2022-10-13 10:00:07 -07:00
Antonio Scandurra b1554b147e Merge pull request #1752 from zed-industries/allow-inviting-users-to-another-guest-project
Allow inviting users to a project that was shared by someone else
2022-10-13 17:58:22 +01:00
7165bc1606 Allow inviting users to a project that was shared by someone else
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-13 18:48:14 +02:00
Antonio Scandurra cf03032b14 Merge pull request #1749 from zed-industries/child-view-panic
Prevent `ChildView` from retaining an otherwise dropped view
2022-10-13 15:45:53 +01:00
Antonio ScandurraandNathan Sobo 542480da5b Improve error message when rendering a child view for a dropped view
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-13 16:40:52 +02:00
Antonio Scandurra e80af89a1c Add unit test for ChildView 2022-10-13 15:59:52 +02:00
Antonio Scandurra 42e2594058 Log view name alongside error in ChildView 2022-10-13 15:44:01 +02:00