Nathan Sobo
a3d5e9d9b8
Give avatar ribbons a rounded top
2021-11-28 14:04:31 -07:00
Nathan Sobo
19dd12e1c6
Associate collaborator avatars with "ribbons" corresponding to their cursor color
2021-11-28 13:25:05 -07:00
Nathan Sobo
30084531ed
Tweak avatar sizes in titlebar
2021-11-28 12:41:46 -07:00
Nathan Sobo
03b114d593
Render active worktree collaborator avatars in the titlebar
2021-11-28 12:28:10 -07:00
Nathan Sobo
f34b494fef
Introduce a TestClient and associate it with a PeerId
...
This makes it easier to integration test peer interactions because now we know their PeerIds.
2021-11-27 12:33:25 -07:00
Nathan Sobo
306c3e9a1b
Populate the user data of worktree collaborators
...
This will make it possible for us to render their avatars. Previously we only had the user ids. During rendering, everything needs to be available synchronously. So now, whenever collaborators are added, we perform the async I/O to fetch their user data prior to adding them to the worktree.
2021-11-26 20:35:50 -07:00
Nathan Sobo
fe66755e30
WIP: Give worktrees a reference to the UserStore
...
This will allow them to fetch user data when peers are added or removed. Still work to do though.
2021-11-26 19:12:12 -07:00
21a025ec7b
Introduce a worktree::Collaborator struct that holds the user_id
...
We can use this to render avatars.
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2021-11-26 11:28:30 -07:00
Nathan Sobo and Antonio Scandurra
ff11bcf0aa
Rename PeoplePanel to ContactsPanel
...
Yeah, it's true they're people, but this is a more specific way in which they're people.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2021-11-26 11:13:05 -07:00
Nathan Sobo and Antonio Scandurra
c72a5a822c
Rename collaborator_logins to authorized_logins
...
Again, this is about reserving the concept of a "collaborator" for actual collaborators on a worktree.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2021-11-26 11:08:34 -07:00
Nathan Sobo and Antonio Scandurra
7754a5a6bc
Rename Collaborators to Contacts
...
This will allow us to use the word "collaborator" to describe users that are actively collaborating on a worktree.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2021-11-26 10:59:41 -07:00
Nathan Sobo
e9edacaca4
Associate Peers with a user_id
...
This will help us render the collaborator avatars for the active worktree when we know its peers.
2021-11-26 10:22:34 -07:00
Nathan Sobo
252e50d635
Associate the project with an active worktree
...
This is similar to the active entry, but it can remain assigned even if there is no active entry and we can potentially manipulate it in other scenarios such as interaction with the project browser. This prepares the ground to show the collaborators for the active worktree.
2021-11-26 10:21:56 -07:00
Nathan Sobo
e9847e4b39
Merge pull request #257 from zed-industries/go-to-line-plus-mouse
...
Preserve selection when clicking on editor dismisses go-to-line dialog
2021-11-25 14:17:29 -07:00
Nathan Sobo
d2b5d2dbc8
Merge pull request #256 from zed-industries/select-next
...
Implement select next (cmd-d) and replace selection with next (cmd-k cmd-d)
2021-11-25 14:10:54 -07:00
Nathan Sobo
5194362de4
Preserve selection when clicking on editor dismisses go-to-line dialog
2021-11-25 14:10:43 -07:00
Nathan Sobo
ca3e7ff87f
Implement cmd-k cmd-d to replace selection with next
2021-11-25 13:39:08 -07:00
Nathan Sobo
ee129edc89
Improve range-based selection queries to only resolve the requested selections
2021-11-25 13:19:49 -07:00
Antonio Scandurra
7c93b1994c
WIP
2021-11-25 17:11:30 +01:00
Antonio Scandurra and Nathan Sobo
1916ecf6c4
Make summaries_for_anchors/summaries_for_anchor_ranges more generic
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-11-25 17:03:06 +01:00
Antonio Scandurra and Nathan Sobo
604fc600ac
Allow a single start/end bias per AnchorRangeMap
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-11-25 16:53:10 +01:00
Antonio Scandurra and Nathan Sobo
e66e9eac0d
Return Selections from Editor::selections_in_range
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-11-25 16:45:06 +01:00
Antonio Scandurra and Nathan Sobo
8d6a2c0b33
Autoscroll vertically to the newest selection on SelectNext
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-11-25 16:02:39 +01:00
Antonio Scandurra and Nathan Sobo
5dca1085a8
Implement SelectNext
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-11-25 15:44:06 +01:00
Antonio Scandurra
d8c127db87
Merge pull request #252 from zed-industries/replace-sign-in-icon-with-text
...
Replace signed out silhouette with a "Sign in" label
2021-11-25 10:49:37 +01:00
Antonio Scandurra
e4e96c3f6e
Adjust padding on sign in prompt in titlebar
2021-11-25 10:37:30 +01:00
Antonio Scandurra
370dbb93c6
Replace signed out silhouette with a "Sign in" label
2021-11-25 10:34:03 +01:00
Nathan Sobo
35a765eb9f
Merge pull request #250 from zed-industries/go-to-line
...
Implement go-to-line interface
2021-11-24 17:15:52 -07:00
Nathan Sobo
ae226183bb
Render the current line, column, and line count in go to line dialog
2021-11-24 16:52:18 -07:00
Nathan Sobo
89f528a763
Improve styling of the go to line modal
2021-11-24 16:16:29 -07:00
Nathan Sobo
13c4cc06f6
Restore scroll position and selections when cancelling go-to-line
...
But preserve the line when confirming.
2021-11-24 15:43:48 -07:00
Nathan Sobo
c609404a9f
Fix warnings
2021-11-24 15:24:27 -07:00
Nathan Sobo
7e0245f2fc
Highlight the selected line when typing in the go to line dialog
2021-11-24 15:23:45 -07:00
Antonio Scandurra
70d58a658d
Allow centering selections when requesting autoscroll
...
We use this new capability in the "go to line" modal.
2021-11-24 19:50:47 +01:00
Antonio Scandurra
ee817d5518
WIP: Start on go to line
2021-11-24 18:45:36 +01:00
Antonio Scandurra
80798fdebb
Merge pull request #249 from zed-industries/invert-workspace-editor-dependency
...
Invert dependency between workspace and editor
2021-11-24 17:54:28 +01:00
Antonio Scandurra
91cde5b838
Move integration test up into the zed crate
2021-11-24 17:39:15 +01:00
Antonio Scandurra and Nathan Sobo
69531cd8bf
Invert dependency between editor and workspace
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-11-24 17:07:16 +01:00
Antonio Scandurra
dc5035cccc
Merge pull request #248 from zed-industries/columnar-selection
...
Allow creation of columnar selections with the mouse when holding `alt-shift`
2021-11-24 16:18:48 +01:00
Antonio Scandurra and Nathan Sobo
ae1a990088
🔥
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-11-24 16:17:41 +01:00
Antonio Scandurra
30929b2d76
Pull up diagnostic and cursor position status bar items creation
2021-11-24 16:04:24 +01:00
Antonio Scandurra
a11408997a
Introduce "entry openers" but still register editors in workspace
2021-11-24 15:18:15 +01:00
Antonio Scandurra
e2ae3ca9cf
Skip over block lines when building columnar selections
2021-11-24 10:40:06 +01:00
Antonio Scandurra
00cfdaf5f3
Reverse columnar selections when head moves before tail's column
2021-11-24 10:37:35 +01:00
Antonio Scandurra
cd92190b62
Calculate an overshoot when mousing to build columnar selections
2021-11-24 10:28:32 +01:00
Nathan Sobo
87fcf9b9bc
WIP
2021-11-24 09:18:41 +01:00
Nathan Sobo
5dec861a22
Merge pull request #244 from zed-industries/mouse-selections
...
Improve support for selecting text via the mouse
2021-11-23 18:11:04 -07:00
Max Brunsfeld
686523581e
Merge pull request #243 from zed-industries/outdent
...
Add outdent command, fix indent bugs
2021-11-23 16:56:54 -08:00
Max Brunsfeld
3ff3de4493
Add outdent command, fix indent bugs
2021-11-23 16:44:05 -08:00
Nathan Sobo
6a7f39051a
Remove newest selection when adding a selection with a click count > 1
...
This prevents selections added in earlier clicks from being rendered under the pending selection.
2021-11-23 16:30:33 -07:00
Nathan Sobo