K Simmons
2ff6ffff58
fix lock merge error
2022-10-12 15:39:04 -07:00
Kay Simmons
27a87c3d9e
Merge branch 'main' into fix-dock-focus-issues
2022-10-12 15:18:28 -07:00
K Simmons
1d8717f4de
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
fedec68d39
Update Dockerfiles to use Rust 1.64
2022-10-12 14:25:40 -07:00
Max Brunsfeld
490a608663
v0.60.0
2022-10-12 14:18:40 -07:00
Max Brunsfeld
94a5bbc0ab
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
89f05ada0b
Allow toggling collaboration menu from the keyboard
2022-10-12 14:14:03 -07:00
Max Brunsfeld
3bb1f0097f
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 Brunsfeld
69dcfbb423
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
Julia
e744520d90
Correctly offset diff hunk layouts
2022-10-12 16:40:19 -04:00
Max Brunsfeld
3c3671a193
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
cbf31e6d27
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
b3567a7240
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
296656570e
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
aac24938f5
Fix a bug in how I parse alacritty's styles
2022-10-12 09:34:17 -07:00
Mikayla Maki
47332f97c7
Stops the dock anchor from being written to settings
2022-10-12 09:28:55 -07:00
Max Brunsfeld
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
Antonio Scandurra
bd146306c6
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
c4dde0f4e2
💄
2022-10-12 15:35:28 +02:00
Antonio Scandurra
ec19f0f8e9
Remove unnecessary async from Peer::add_connection
2022-10-12 15:32:39 +02:00
Antonio Scandurra
cc56fa9ea6
Introduce client-side timeout when trying to connect
2022-10-12 15:32:30 +02:00
Antonio Scandurra
a19783919c
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
83d3fad80d
Clear auto-indent requests if they couldn't be computed
2022-10-12 10:53:44 +02:00
Antonio Scandurra
202950aa98
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
9adbab5d99
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
Julia
a6910584b6
Something's happening, nothing correct, but something
2022-10-12 00:39:56 -04:00
Mikayla Maki
e24a69b838
Merge pull request #1723 from zed-industries/test-branch
...
Writing settings
2022-10-11 20:33:03 -07:00
Mikayla Maki
b1f64d9550
Updated new vim tests with new rope crate
2022-10-11 20:25:39 -07:00
Mikayla Maki
41590ef64b
Merge branch 'main' into test-branch
2022-10-11 19:55:32 -07:00
Mikayla Maki
e7b6d1befe
Added theme and dock anchor saving :D
2022-10-11 19:18:29 -07:00
Max Brunsfeld
76a86b7e5e
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
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
K Simmons
d1f1eb9a29
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
5487f99ac7
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
bc2a6e429c
Use tag_name for Discord release message
2022-10-11 18:31:17 -04:00
Mikayla Maki
0beb97547e
Finished refactoring out fs and rope
2022-10-11 15:25:54 -07:00
Joseph T. Lyons
941f4097fe
Add amplitude release ( #1720 )
...
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
2022-10-11 18:25:36 -04:00
K Simmons
673041d1f5
working quote and bracket text objects
2022-10-11 15:17:29 -07:00
Nate Butler
6dfa34fcf8
Remove a few Zed default themes
...
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
2022-10-11 17:40:45 -04:00
Nate Butler
b626ec3bf9
Use different dark and light ramps for cave
...
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
2022-10-11 17:39:38 -04:00
Nate Butler
5708879b5a
Style elevations & update styleTrees
...
Also rename `info` -> `accent`
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
2022-10-11 17:38:28 -04: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
Mikayla Maki
0a8e2f6bb0
Moved fs to it's own crate, build failing due to cyclic dependency on rope
2022-10-11 13:03:36 -07:00
Max Brunsfeld
9bdcd37f60
Merge pull request #1718 from zed-industries/dont-wait-for-project-upload
...
Proceed with share while project state uploads
2022-10-11 12:48:33 -07:00
Mikayla Maki
a833652077
Undid change to paths variables and cleaned up leftovers
2022-10-11 12:48:30 -07:00
Mikayla Maki
7ce758b343
Added notes from working with Nathan
2022-10-11 12:48:30 -07:00
Mikayla Maki
cc8ae45012
Added theme writing code, really bad race condition
2022-10-11 12:48:30 -07:00
Max Brunsfeld
65b8c512fe
Allow opening other local projects via contacts list
2022-10-11 12:37:00 -07:00
