Mikayla Maki
5ef5147780
Merge branch 'main' into gpui-events
2022-10-17 15:43:41 -07:00
Julia
2149c17a0a
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
1716aff969
Cleanup
2022-10-17 14:41:16 -04:00
Julia
2a5d7ea2de
Inclusively check for hunk in fold range
2022-10-17 13:11:11 -04:00
Julia
be34c50c72
Deduplicate identical hunk layouts
2022-10-17 12:41:20 -04:00
Julia
50ae3e03f7
More concrete usage of display map to handle diff hunk gutter layout
2022-10-17 12:28:44 -04:00
Nathan Sobo
12eab6551f
Remove dispatch_event from Element trait
2022-10-16 13:08:25 -06:00
Nathan Sobo
b9308ad80d
Move handling of modifier changes to new View hook
2022-10-16 12:47:48 -06:00
Julia and Kay Simmons
b3eb5f7cdf
WIP
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-10-14 17:14:33 -04:00
Max Brunsfeld and Nathan Sobo
864020463f
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
Julia and Max Brunsfeld
dde3dfdbf6
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
8d609959f1
Clean
2022-10-13 15:23:41 -04:00
Julia
16f854b636
Expand diff gutter indicator to cover all of a wrapped line
2022-10-13 14:05:57 -04:00
Julia
9c47325c25
Use correct range to get diff hunks in the presence of wrapped lines
2022-10-13 13:52:44 -04:00
Julia
a6a7e85894
Misc fixes, still broken soft wrap
2022-10-13 02:02:29 -04:00
Julia
e75dcc853b
Include deletion hunks in fold regardless of end
2022-10-13 00:42:53 -04:00
Max Brunsfeld
6cdf4e98fc
Re-export basic text types from text and language crates
...
Also avoid production dependencies on fs and rope in collab
2022-10-12 15:48:19 -07:00
Julia
e744520d90
Correctly offset diff hunk layouts
2022-10-12 16:40:19 -04:00
1179f8f7be
Fix rounding error in computing editor's row range during layout
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-10-12 09:19:29 -07:00
Julia
a6910584b6
Something's happening, nothing correct, but something
2022-10-12 00:39:56 -04:00
Mikayla Maki
41590ef64b
Merge branch 'main' into test-branch
2022-10-11 19:55:32 -07:00
Max Brunsfeld
7eceff1d7b
Impose min scrollbar height in a way that doesn't impede scrollbar's movement
...
Also, fix the editor's scroll max so that you can scroll to the last
display row.
2022-10-11 18:50:04 -07:00
Kay Simmons
81a3a22379
Merge pull request #1685 from zed-industries/vim-text-objects
...
Vim Text Objects and Numeric Repitions
2022-10-11 16:36:19 -07:00
Mikayla Maki
0beb97547e
Finished refactoring out fs and rope
2022-10-11 15:25:54 -07:00
Max Brunsfeld
638e9f9477
Merge pull request #1715 from zed-industries/scrollbars
...
Add scrollbars
2022-10-11 13:34:15 -07:00
Max Brunsfeld
acc85ad03c
Impose a minimum height on the scrollbar
2022-10-11 13:18:33 -07:00
Antonio Scandurra
a656047c15
Merge pull request #1700 from zed-industries/room
...
Introduce call-based collaboration
2022-10-11 17:40:44 +01:00
Max Brunsfeld
67a32de7d4
Hide the scrollbar track, not just the thumb
2022-10-11 09:26:19 -07:00
Antonio Scandurra and Nathan Sobo
45d118f96f
Decide whether to clip to visible bounds on a per-element basis
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-11 17:05:13 +02:00
Max Brunsfeld
7b084199be
Auto-hide scrollbars
2022-10-10 17:54:29 -07:00
Max Brunsfeld
6dcf638322
Represent scrollbar range with f32s
2022-10-10 17:06:48 -07:00
Max Brunsfeld
eedcc585af
Add scrollbars to editors
2022-10-10 16:20:47 -07:00
Mikayla Maki
1d2495d57b
Re-arrange how lines are set
2022-10-10 11:38:28 -07:00
Mikayla Maki
1af4b263b2
Implemented page up and page down for the editor
2022-10-09 19:19:40 -07:00
K Simmons
b82db3a254
Adds word and sentence text objects along with a new vim testing system which uses cached neovim data to verify our test accuracy
2022-10-08 21:51:49 -07:00
Julia
771215d254
Reload git index on file events to catch new contents
2022-10-06 12:01:21 -04:00
Julia and Joseph Lyons
2bd947d4d0
Use correct start row for hunk retrieval & correct paint offset
...
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
2022-10-04 15:04:42 -04:00
Mikayla Maki
499e95d16a
Removed debugs, simplified settings
2022-10-03 17:43:05 -07:00
Mikayla Maki
5769cdc354
made git diff rendering respect line wrap
2022-10-02 18:00:13 -07:00
Mikayla Maki
9fe6a5e83e
made git stuff slightly more themable
2022-09-29 13:16:02 -04:00
Nate Butler
b395fbb3f2
wip
2022-09-29 13:16:02 -04:00
Nate Butler
8a2430090b
WIP Git gutter styling
2022-09-29 13:16:02 -04:00
Julia and Mikayla Maki
d5fd531743
Move git related things into specialized git crate
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
8d2de1074b
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
b18dd8fcff
Fully qualify outside git-related code when a diff is a git diff
2022-09-29 13:16:02 -04:00
Julia
b9d84df127
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
c1249a3d84
Handle deletions more robustly and correctly
2022-09-29 13:16:02 -04:00
Julia
5157c71fa9
Render deletion gutter markers
2022-09-29 13:16:02 -04:00
Julia
fdda2abb78
Correct start/end of git diff hunks
2022-09-29 13:16:02 -04:00
Julia
641daf0a6e
Correct git gutter indicator scroll position & add rounded corner
2022-09-29 13:16:02 -04:00
Mikayla Maki
Julia
Julia
Nathan Sobo
Max BrunsfeldandNathan Sobo
Kay Simmons
Mikayla Maki
Antonio Scandurra
Nate Butler