Commit Graph
1097 Commits
Author SHA1 Message Date
Max Brunsfeld d182182ae2 Avoid ProjectPanel panic when worktree has no root entry
Also, avoid bug where too many UniformList elements were rendered.
2021-09-29 22:08:31 -07:00
Antonio Scandurra 1519e1d45f Maintain active entry Project and render it in ProjectPanel 2021-09-29 17:05:03 +02:00
Antonio Scandurra 67c40eb4be Allow opening entries from project panel 2021-09-29 13:08:27 +02:00
Antonio Scandurra e030917769 Refine project panel styling 2021-09-29 11:32:06 +02:00
Nathan SoboandMax Brunsfeld bd7bf82d18 Load .gitignore files from the Fs object so we can test this with a FakeFs
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-09-28 13:21:19 -06:00
Nathan SoboandMax Brunsfeld dde782a006 Remove top/bottom padding from project panel
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-09-28 12:26:26 -06:00
Nathan SoboandMax Brunsfeld 14bc2c6857 Fix scrolling of project panel
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-09-28 12:26:15 -06:00
Nathan Sobo a3f45c0d3b Merge branch 'worktree-cursor' into project-browser 2021-09-28 12:13:47 -06:00
Nathan SoboandMax Brunsfeld 60799c5a7c 💄
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-09-28 12:03:11 -06:00
b9b08879f2 Get tests passing
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2021-09-28 11:23:09 -06:00
Antonio Scandurra 366552f3bb Use Bias::Left when traversing by path 2021-09-28 13:42:46 +02:00
Nathan Sobo c3e8a5baa0 Unify all worktree traversal in a Traversal cursor/iterator
This uses our new ability to have a SeekTarget that's distinct from Dimension.
2021-09-27 21:58:22 -06:00
Max BrunsfeldandNathan Sobo ab31ddfc31 Allow seeking SumTree cursor by multiple seek types per dimension
Also, remove the cursor's sum_dimension. Replace it with a
blanket implementation of Dimension for two-element tuples
of dimensions.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-24 18:23:53 -07:00
Max BrunsfeldandNathan Sobo 443a7826bb Start work on expanding and collapsing directories in project panel
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-24 15:12:49 -07:00
Max Brunsfeld 7eda614c4a Start work on ProjectPanel 2021-09-23 18:14:15 -07:00
Max Brunsfeld d561f50ab1 Extract from Workspace a Project model that stores a window's worktrees 2021-09-23 16:34:06 -07:00
82ec1b73e0 Flush pending selection before performing any action on all selections
Closes #155

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-23 11:20:56 -07:00
Antonio Scandurra 286846cafd Merge pull request #179 from zed-industries/rpc-protocol-version
Forbid connections from outdated clients
2021-09-23 18:26:12 +02:00
Antonio ScandurraandNathan Sobo e32f1f8b80 Create test_app_state with FakeFs instead of RealFs
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-23 18:17:49 +02:00
Antonio ScandurraandNathan Sobo 2352725c58 💄
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-23 17:32:37 +02:00
Antonio Scandurra 374b05a379 Display warning in titlebar when Zed is out-of-date 2021-09-23 15:36:32 +02:00
Antonio Scandurra 511cbaa2bd Version the zrpc protocol using a X-ZRPC-VERSION header 2021-09-23 15:35:35 +02:00
Antonio Scandurra 9efd8ce323 Exclude ignored entries when sharing a worktree
This commit also adds a randomized test that exercises building and
applying snapshot updates.
2021-09-23 11:20:53 +02:00
Antonio Scandurra d07ff73999 Bump PathEntry::scan_id when the ignore status of an entry changes 2021-09-23 11:20:53 +02:00
Max Brunsfeld 1402f842f7 Adjust word-boundary motion, treating whitespace more like other editors
Also, fix the behavior of 'delete_to_{prev,next}_word_boundary' commands when
there are non-empty selections.
2021-09-22 17:00:57 -07:00
Max Brunsfeld 84c7064699 Fix bytes/chars error in Editor::paste
Fixes #156
2021-09-22 14:36:30 -07:00
Antonio ScandurraandNathan Sobo 6120ce3747 Move people panel up
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 17:09:24 +02:00
Antonio ScandurraandNathan Sobo 23d77e2b9f Refine people panel styling
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 17:02:50 +02:00
Antonio ScandurraandNathan Sobo 257744ac36 Fix resolution of extends directive when children are unresolved
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-22 16:04:44 +02:00
Antonio Scandurra 78fbd1307a Remove remote worktrees and close their buffers when host unshares 2021-09-22 14:50:32 +02:00
Antonio Scandurra d67227177a Allow leaving worktree while opening a buffer 2021-09-22 12:38:31 +02:00
Max BrunsfeldandNathan Sobo c24d439eb1 Allow clicking on worktrees to share, unshare, join, and leave
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 16:27:57 -07:00
Max BrunsfeldandNathan Sobo 41a1514cec Add chainable Element methods for common containers
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 15:24:14 -07:00
Max BrunsfeldandNathan Sobo b576397610 Vertically align avatars with labels in people panel
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 15:09:31 -07:00
Max BrunsfeldandNathan Sobo 729896d32a Style worktree rows in people panel
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 13:35:00 -07:00
Max Brunsfeld 9352c4e076 Ignore empty ZED_IMPERSONATE env var 2021-09-21 13:29:06 -07:00
412535420b Allow joining worktrees by clicking them in the people panel
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 12:21:03 -07:00
Antonio ScandurraandNathan Sobo c90dc7235e Rename participants to guests in proto
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 18:30:49 +02:00
Antonio ScandurraandNathan Sobo 1bd6cd0978 Allow size to be specified in ImageStyle
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 18:27:26 +02:00
Antonio ScandurraandNathan Sobo f8990b707a Style people panel
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-21 18:13:02 +02:00
Antonio Scandurra 4a723a1fb9 Merge branch 'main' into people-panel 2021-09-21 17:29:07 +02:00
Antonio Scandurra b9d46366ed Fix more failing/hanging unit tests 2021-09-21 16:20:20 +02:00
Max Brunsfeld 5dfd4be174 WIP 2021-09-20 18:05:46 -07:00
Max Brunsfeld 8b1a2c8cd2 Fix warnings in people_panel 2021-09-20 15:45:41 -07:00
Max BrunsfeldandNathan Sobo a068019d94 Add ZED_IMPERSONATE env var, for testing
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-20 15:44:28 -07:00
Max BrunsfeldandNathan Sobo 4ca5814470 Add missing people panel properties to base theme
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-20 13:38:59 -07:00
Nathan SoboandMax Brunsfeld 4279451150 Fix language selection when saving new buffers as a single-file worktree
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2021-09-20 14:28:02 -06:00
23652f2ba6 Start on PeoplePanel::render
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-09-20 20:04:48 +02:00
Nathan Sobo edfed001de Merge pull request #159 from zed-industries/tabs-cleanup
Clean up tabs styling
2021-09-20 09:16:08 -07:00
Antonio Scandurra 67946b7224 Add an integration test to verify collaborators are kept up to date 2021-09-20 16:40:31 +02:00