Commit Graph
3960 Commits
Author SHA1 Message Date
Antonio Scandurra a5303a0517 Use fake file system for buffer identity test 2022-10-13 09:33:55 +02:00
Antonio Scandurra 8ce65dc16a Preserve buffer identity when underlying entry temporarily disappears 2022-10-13 09:10:10 +02:00
Antonio Scandurra 32acc49762 Add test to ensure buffer identity is kept across Project::rename 2022-10-13 08:17:35 +02:00
Mikayla Maki aa370ab924 Merge pull request #1743 from zed-industries/new-settings-writing
Improved settings writing to be strongly typed and based on settings file content diffs
2022-10-12 17:18:48 -07:00
Mikayla Maki db9c72232f Fixed settings 2022-10-12 17:11:47 -07:00
Mikayla Makiand d6b49291d9 Improved settings writing to be strongly typed and based on settings file content diffs
Co-Authored-By: kay@zed.dev
2022-10-12 17:05:23 -07:00
Kay Simmons f2eeab02cd Merge pull request #1740 from zed-industries/fix-dock-focus-issues
Fix Dock infinite loop
2022-10-12 16:19:09 -07:00
K Simmons d861198c16 Update gpui focus test to match the new removal of intermediate focus filtering 2022-10-12 15:57:29 -07:00
Max Brunsfeld a2c9a67558 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
Kay Simmons 2039df032f Merge branch 'main' into fix-dock-focus-issues 2022-10-12 15:18:28 -07:00
K SimmonsandMikayla Maki 0dce131b26 Remove focus filtering from gpui so all focus events result in focus-in and focus-out calls
Remove pane focused event in favor of focus_in at the workspace level
Added is_child to ViewContext to determine if a given view is a child of the current view
Fix issue where dock would get in a infinite loop when activated after dragging an item out of it
Fix issue where the last focused view in an item was not correctly refocused when a pane is focused after switching active tabs

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-12 15:10:00 -07:00
Max Brunsfeld 5e75674f90 v0.60.0 2022-10-12 14:18:40 -07:00
Max Brunsfeld 3c75538be9 Allow toggling collaboration menu from the keyboard 2022-10-12 14:14:03 -07:00
Max BrunsfeldandAntonio Scandurra 27dbced348 Send guests DiskBasedDiagnosticsFinished messages when they join a project
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2022-10-12 13:49:09 -07:00
Max BrunsfeldandAntonio Scandurra b64916817b Avoid sending stale diagnostics after sharing a worktree
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2022-10-12 11:33:19 -07:00
Max Brunsfeld 11a4fb97bc Merge pull request #1734 from zed-industries/fix-layout-crash
Fix rounding error in computing editor's row range during layout
2022-10-12 09:38:47 -07:00
Mikayla Maki fd1d9c6636 Merge pull request #1736 from zed-industries/fix-terminal-bold
Fix a bug in how I parse alacritty's styles
2022-10-12 09:38:27 -07:00
Mikayla Maki 6aeb9cd139 Merge pull request #1735 from zed-industries/rollback-dock-anchor-setting
Stops the dock anchor from being written to settings
2022-10-12 09:34:27 -07:00
Mikayla Maki 0342f7f950 Fix a bug in how I parse alacritty's styles 2022-10-12 09:34:17 -07:00
Mikayla Maki f50a692c63 Stops the dock anchor from being written to settings 2022-10-12 09:28:55 -07:00
2b192ff9b3 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
Antonio Scandurra 05c76a5e2c 💄 2022-10-12 15:35:28 +02:00
Antonio Scandurra f7de77de3c Remove unnecessary async from Peer::add_connection 2022-10-12 15:32:39 +02:00
Antonio Scandurra c691474fac Introduce client-side timeout when trying to connect 2022-10-12 15:32:30 +02:00
Antonio Scandurra ff0f0c94f3 Clear auto-indent requests if they couldn't be computed 2022-10-12 10:53:44 +02:00
Antonio Scandurra 748fd9acc6 Fix opening a buffer after leaving and joining the same project
This bug existed prior to #1700 and was caused by not clearing the
buffers that were already shared with a peer that left and opened
a project using the same connection. When such peer would re-join
the project and open a buffer that it had opened previously, the
host assumed the peer had already seen that buffer and wouldn't bother
sending it again.
2022-10-12 10:31:06 +02:00
Mikayla Maki 7a600eabfc Updated new vim tests with new rope crate 2022-10-11 20:25:39 -07:00
Mikayla Maki fa862550fd Merge branch 'main' into test-branch 2022-10-11 19:55:32 -07:00
Mikayla Maki ddb1066075 Added theme and dock anchor saving :D 2022-10-11 19:18:29 -07:00
Max Brunsfeld 7a82fb7aaf 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 394517dbc6 Merge pull request #1685 from zed-industries/vim-text-objects
Vim Text Objects and Numeric Repitions
2022-10-11 16:36:19 -07:00
K Simmons 4d285aee6f Add count argument to motion functions and add ability to jump to a given line 2022-10-11 16:27:54 -07:00
Mikayla Maki a2a958ccdc Moved settings_file.rs into settings crate. Should be ready to start now :D 2022-10-11 16:03:38 -07:00
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
K Simmons edc2c90c3e working quote and bracket text objects 2022-10-11 15:17:29 -07:00
Max Brunsfeld 245db0b084 Merge pull request #1715 from zed-industries/scrollbars
Add scrollbars
2022-10-11 13:34:15 -07:00
Max Brunsfeld bf110bce35 Impose a minimum height on the scrollbar 2022-10-11 13:18:33 -07:00
Mikayla Maki 9bdb8d31c0 Moved fs to it's own crate, build failing due to cyclic dependency on rope 2022-10-11 13:03:36 -07:00
Mikayla Maki 5b7fb3f6e8 Undid change to paths variables and cleaned up leftovers 2022-10-11 12:48:30 -07:00
Mikayla Maki 4bd2c2b11a Added notes from working with Nathan 2022-10-11 12:48:30 -07:00
Mikayla Maki ffba611591 Added theme writing code, really bad race condition 2022-10-11 12:48:30 -07:00
Max Brunsfeld ee41be8836 Allow opening other local projects via contacts list 2022-10-11 12:37:00 -07:00
Max Brunsfeld bd45d1ac65 Wait for project sharing to complete in LSP status integration test 2022-10-11 12:15:54 -07:00
Max BrunsfeldandAntonio Scandurra d9418811af Proceed with share while project state uploads
Co-authored-by: Antonio Scandurra <as-cii@zed.dev>
2022-10-11 10:17:20 -07:00
Antonio Scandurra 8be22e9b6f Merge pull request #1700 from zed-industries/room
Introduce call-based collaboration
2022-10-11 17:40:44 +01:00
Antonio Scandurra 514f3807e3 💄 2022-10-11 18:34:04 +02:00
Max Brunsfeld 71f4ef2e82 Refresh scrollbar auto-hide setting when opening a new editor 2022-10-11 09:28:17 -07:00
Max Brunsfeld 1a042ca098 Hide the scrollbar track, not just the thumb 2022-10-11 09:26:19 -07:00
Antonio Scandurra e288ca28c8 Always show invite link in contacts popover 2022-10-11 18:22:00 +02:00
Max Brunsfeld 4c9e2492a0 Enable/disable scrollbar auto-hide based on OS setting 2022-10-11 09:13:34 -07:00