Commit Graph
6271 Commits
Author SHA1 Message Date
Antonio Scandurra b5e00a45e8 Merge pull request #1745 from zed-industries/contact-popover-focus
Fix some issues with contact popover focus
2022-10-13 08:37:14 +01:00
Antonio Scandurra bfe97fbc6a Merge pull request #1746 from zed-industries/maintain-buffer-identity-across-renames
Preserve buffer identity when underlying entry temporarily disappears
2022-10-13 08:36:21 +01:00
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
Max BrunsfeldandNathan Sobo c78d3dbd17 Dismiss contacts popover when clicking outside, even w/o focus change
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-10-12 17:55:11 -07:00
Max BrunsfeldandNathan Sobo 9432d9e110 Remove spurious focus of contact popover when opening it
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-10-12 17:39:44 -07: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 1a05611aa6 Merge pull request #1742 from zed-industries/deps-fixes
Re-export basic text types from text and language crates, remove unused deps from collab
2022-10-12 15:56:55 -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
K Simmons 4535c88e85 fix lock merge error 2022-10-12 15:39:04 -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 3c6bd24051 Update Dockerfiles to use Rust 1.64 2022-10-12 14:25:40 -07:00
Max Brunsfeld 5e75674f90 v0.60.0 2022-10-12 14:18:40 -07:00
Max Brunsfeld d62b7d4186 Merge pull request #1739 from zed-industries/collab-menu-key-binding
Allow toggling collaboration menu from the keyboard
2022-10-12 14:17:51 -07:00
Max Brunsfeld 3c75538be9 Allow toggling collaboration menu from the keyboard 2022-10-12 14:14:03 -07:00
Max Brunsfeld a8a82d3f26 Merge pull request #1738 from zed-industries/out-of-sync-diagnostics
Fix bugs that caused guests to see different diagnostics than host
2022-10-12 14:13:16 -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 5bf61ece89 Merge pull request #1729 from zed-industries/connection-timeout
Introduce client-side timeout when trying to connect
2022-10-12 14:43:35 +01: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 483dc27221 Merge pull request #1728 from zed-industries/plain-text-leaks
Clear auto-indent requests if they couldn't be computed
2022-10-12 10:38:44 +01:00
Antonio Scandurra ff0f0c94f3 Clear auto-indent requests if they couldn't be computed 2022-10-12 10:53:44 +02:00
Antonio Scandurra bb486bcd3d Merge pull request #1726 from zed-industries/rejoining-projects
Fix opening a buffer after leaving and joining the same project
2022-10-12 09:37:50 +01: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 903a27d4ef Merge pull request #1723 from zed-industries/test-branch
Writing settings
2022-10-11 20:33:03 -07: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 90d6099ac0 Merge pull request #1721 from zed-industries/scrollbar-fix
Fix scrollbar's range of motion in large files
2022-10-11 19:14:49 -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
Joseph T Lyons a5145a45dc Use tag_name for Discord release message 2022-10-11 18:31:17 -04:00
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Joseph T. LyonsandMax Brunsfeld 83fd5c704b Add amplitude release (#1720)
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
2022-10-11 18:25:36 -04:00