Commit Graph
10642 Commits
Author SHA1 Message Date
Mikayla Maki ef1a32ee92 Done updating rendering performance for now. Further changes would require more fundamental work, I'm still not really happy with it as is though. Will probably take a few hours to clean the code though. 2022-07-20 10:04:08 -07:00
Mikayla Maki 005e2cb2be Compiling again... finally 2022-07-20 10:04:08 -07:00
Mikayla Maki 4f7b6b8b22 Finally finished merging this massive ball of changes 2022-07-20 10:04:08 -07:00
Mikayla Maki 150d2ff53f Attempting to continue rebase 2022-07-20 10:04:08 -07:00
Mikayla Maki 4a483618be Finished graceful terminal failure 2022-07-20 10:04:08 -07:00
Mikayla Maki 40d30a898b Rebasing continues 2022-07-20 10:04:08 -07:00
Mikayla Maki 9d063ae6d8 Switched to hybrid iterator and while loop grid processor. Still hairy but much more managable. Not finished compiling yet. 2022-07-20 10:04:08 -07:00
Mikayla Maki c9584a9d0c Continuing rebases on other work 2022-07-20 10:04:08 -07:00
Mikayla Maki a4ca11ba17 Finished design touchups 2022-07-20 10:04:08 -07:00
Mikayla Maki c19956373a Finished bel, moving on to title 2022-07-20 10:04:06 -07:00
Max BrunsfeldandAntonio Scandurra <antonio@zed.dev 1b0e93b153 Change interpretation of marked_text and edit when handling input
Co-authored-by: Antonio Scandurra <antonio@zed.dev
2022-07-20 09:53:49 -07:00
Antonio Scandurra 42ac4bf9fc WIP 2022-07-20 18:06:29 +02:00
Nate Butler d76cdb01be Merge pull request #1380 from zed-industries/theme-improvements
Theme improvements
2022-07-20 10:40:09 -04:00
Antonio Scandurra 2ea0b89e7c WIP 2022-07-20 15:07:09 +02:00
K Simmons a77cf914ec Fix failing test re mode switch in buffer search 2022-07-19 17:18:17 -07:00
K Simmons 1cfaac1bc5 Fix clipping when dragging the mouse with vim-mode enabled and adjust single line editor selections 2022-07-19 17:18:17 -07:00
Nate Butler 55dee53e80 Regenerate package-lock.json 2022-07-19 20:12:50 -04:00
Nate Butler bcc554a3db Merge branch 'main' into theme-improvements 2022-07-19 20:12:02 -04:00
Nate Butler df0023ad65 Update package-lock.json 2022-07-19 20:09:28 -04:00
Keith Simmons c2868a39e8 Merge pull request #1388 from zed-industries/mouse-region-refactor
Mouse Region Refactor
2022-07-19 16:50:12 -07:00
Nate Butler 5bf9db2e21 Fix incorrectly named icons 2022-07-19 17:13:40 -04:00
Nate Butler 9beeef6385 Update some contact panel styling 2022-07-19 17:11:26 -04:00
Nate Butler 46384e71b7 Add icon sets for sizes 8, 12 and 16, remove old icons 2022-07-19 17:11:15 -04:00
Antonio Scandurra 7757fbe241 Implement NSTextInputClient protocol on window using no-ops 2022-07-19 14:52:02 +02:00
Antonio Scandurra 456a390166 Add character palette menu item 2022-07-19 14:51:57 +02:00
Max Brunsfeld e5602b0ad4 0.48.1 2022-07-18 19:11:12 -07:00
Max Brunsfeld 815ce22fb7 Revert "Merge pull request #1359 from zed-industries/plugin-json-enable"
This reverts commit 94b443a704, reversing
changes made to 285832e810.
2022-07-18 19:04:49 -07:00
Max Brunsfeld 142a019ada 0.48.0 2022-07-18 16:24:57 -07:00
Max Brunsfeld 1a1ec1b81a Merge pull request #1391 from zed-industries/dismiss-project-panel-rename
Dismiss project panel's rename editor when it loses focus
2022-07-18 16:23:15 -07:00
Max Brunsfeld c1dfb6294b Dismiss project panel's rename editor when it loses focus 2022-07-18 16:10:09 -07:00
Max Brunsfeld 2ab732efdb Merge pull request #1390 from zed-industries/fix-fs-watch-leak
Ensure that FS watchers are dropped when dropping their event stream
2022-07-18 15:16:41 -07:00
Max Brunsfeld b4392ec11c Merge pull request #1389 from zed-industries/no-gpu
Avoid panic when unable to access a GPU
2022-07-18 15:08:58 -07:00
Max Brunsfeld 43613fe2ac Ensure that fs watches are dropped when dropping the event stream 2022-07-18 14:55:24 -07:00
Max BrunsfeldandNathan Sobo 7998771d9f Avoid panic when unable to access a GPU
This will remove noise from our panic logs.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-07-18 14:13:12 -07:00
K Simmons deeefed7eb Change mouse_event_handler to use HandlerSet 2022-07-18 10:08:14 -07:00
K Simmons ec25fa9260 Extract handler set from MouseRegion 2022-07-18 09:54:48 -07:00
Nate Butler bb91492098 Fix missing red color in sandcastle theme 2022-07-18 12:33:09 -04:00
Nate Butler aafaee7463 Fix missing red/incorrect hex colors in one-light 2022-07-18 12:05:27 -04:00
Antonio Scandurra 59366a5c44 Merge pull request #1386 from zed-industries/symlink-cycles
Detect cycles when scanning a directory
2022-07-18 17:58:18 +02:00
Antonio Scandurra 11ef6bfbae Avoid unnecessarily emitting fake fs events for dirs that exist 2022-07-18 17:36:40 +02:00
Antonio Scandurra f9df5fe595 Detect cycles also when processing events 2022-07-18 17:31:09 +02:00
Antonio Scandurra b3218641cd Create intermediate directories in FakeFs::create_dir 2022-07-18 16:38:26 +02:00
Antonio Scandurra b48118830f Detect cycles when scanning a directory 2022-07-18 13:47:15 +02:00
Antonio Scandurra df33556693 Introduce a new TreeSet struct in sum_tree
This is just a special case of `TreeMap<K, V>` where `V = ()`.
2022-07-18 13:40:30 +02:00
Max Brunsfeld f9a5ed3a85 Start work on a test for a worktree with symlink cycles 2022-07-18 12:23:07 +02:00
Max Brunsfeld f6c1393dfd Restructure FakeFs to let it model symlinks
Instead of storing paths, model the FS more directly
as nodes
2022-07-18 12:23:07 +02:00
Antonio Scandurra 0aafc78eb7 Merge pull request #1385 from zed-industries/fix-lifetime-error
Fix spurious borrow checker error
2022-07-18 12:22:54 +02:00
Antonio Scandurra 51c40f4136 Merge pull request #1384 from zed-industries/expose-collaboration-metrics
Expose collaboration metrics
2022-07-18 10:44:29 +02:00
Antonio Scandurra 316a534a16 Allow querying active user counts for people that have collaborated 2022-07-18 10:29:10 +02:00
Isaac Clayton c326a20193 Merge pull request #1367 from zed-industries/plugin-opaque
Guide to Opaque Types and Callbacks in Plugins
2022-07-18 09:20:10 +02:00