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
Max Brunsfeld
cf499abf31
v0.60.1
2022-10-13 10:00:07 -07:00
Antonio Scandurra
86ddbc6d26
Merge pull request #1752 from zed-industries/allow-inviting-users-to-another-guest-project
...
Allow inviting users to a project that was shared by someone else
2022-10-13 17:58:22 +01:00
Antonio Scandurra
b8bc5a282e
Allow inviting users to a project that was shared by someone else
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-13 18:48:14 +02:00
Antonio Scandurra
f5db02a605
Merge pull request #1749 from zed-industries/child-view-panic
...
Prevent `ChildView` from retaining an otherwise dropped view
2022-10-13 15:45:53 +01:00
Antonio Scandurra
9ebd586350
Improve error message when rendering a child view for a dropped view
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-13 16:40:52 +02:00
Antonio Scandurra
1bec8087ee
Add unit test for ChildView
2022-10-13 15:59:52 +02:00
Antonio Scandurra
a5a60eb854
Log view name alongside error in ChildView
2022-10-13 15:44:01 +02:00
Antonio Scandurra
edb61a9c8f
Avoid panicking if child view points to a view that was not rendered
2022-10-13 15:11:57 +02:00
Antonio Scandurra
06dfb74663
Prevent ChildView from retaining an otherwise dropped view
2022-10-13 15:04:57 +02:00
Antonio Scandurra
26b03afa60
Merge pull request #1747 from zed-industries/fix-clangd-error
...
Fix error on clangd when `compile-commands.json` is present
2022-10-13 10:16:10 +01:00
Antonio Scandurra
c4680e66ff
Fix error on clangd when compile-commands.json is present
...
The language server was failing because we were forgetting to provide
a `jsonrpc` field for responses to requests coming from the lsp.
2022-10-13 11:10:23 +02:00
Antonio Scandurra
06e9b8276f
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
ad975da8bd
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
37a0fd33c5
Use fake file system for buffer identity test
2022-10-13 09:33:55 +02:00
Antonio Scandurra
f28cc5ca0c
Preserve buffer identity when underlying entry temporarily disappears
2022-10-13 09:10:10 +02:00
Antonio Scandurra
0a1aea6cb8
Add test to ensure buffer identity is kept across Project::rename
2022-10-13 08:17:35 +02: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
b5786cbf30
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 Brunsfeld
513c02e67f
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
51c0a140c6
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
e73270085b
Fixed settings
2022-10-12 17:11:47 -07:00
Mikayla Maki
dd1320e6d1
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
d42bf8eebe
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
2a1dbd6fb5
Update gpui focus test to match the new removal of intermediate focus filtering
2022-10-12 15:57:29 -07:00
Max Brunsfeld
9760eb0081
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
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
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
