Commit Graph
39175 Commits
Author SHA1 Message Date
Antonio Scandurra 9ed64a054c Allow sharing/unsharing of projects 2021-12-21 12:45:20 +01:00
Antonio Scandurra fe07e92529 Allow opening of remote projects via the contacts panel 2021-12-21 12:05:38 +01:00
Antonio Scandurra f0ebe2fc79 Fix invalid theme variables 2021-12-21 10:25:37 +01:00
Antonio Scandurra 25ce0d830a Drop project instead of worktree to simulate client leaving 2021-12-21 10:20:05 +01:00
Antonio Scandurra 98c32a7522 Update contacts as projects/worktrees get registered/unregistered 2021-12-21 10:17:26 +01:00
Antonio Scandurra 57444fed31 Get more integration tests passing 2021-12-21 09:50:11 +01:00
Antonio Scandurra 2d63c76b50 Register local worktrees after acquiring a project remote id 2021-12-21 09:49:13 +01:00
Antonio Scandurra b99cc1599f Re-enable commented out worktree test 2021-12-21 08:35:08 +01:00
Max Brunsfeld 66858ccb1e Get some RPC integration tests passing 2021-12-20 18:08:53 -08:00
Max Brunsfeld c3479bbe28 Add missing RPC handlers for local projects 2021-12-20 18:08:06 -08:00
Max Brunsfeld 2424fc98bf Send a LeaveProject message when dropping a remote project 2021-12-20 18:07:51 -08:00
Max Brunsfeld f084b7bb7b Fix logic for waiting for project's remote id 2021-12-20 18:07:34 -08:00
Max Brunsfeld a6d09087ec Fix accidental usages of local worktree id instead of remote id 2021-12-20 18:06:58 -08:00
Max Brunsfeld 79e275f0ff Get the server and integration tests compiling 2021-12-20 16:30:29 -08:00
Max BrunsfeldandNathan Sobo a8488fee91 Merge branch 'main' into share-project
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-12-20 11:42:59 -08:00
e6e633c69c Send worktree info only when sharing worktree
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-12-20 11:36:59 -08:00
Antonio Scandurra 8293699fde Get back to a compiling state for client
This temporarily disables some tests and there are still some server-side
compiler errors.
2021-12-20 16:08:34 +01:00
Nathan Sobo 24c14a15b1 Add the fetching of user JSON by github login with a token header 2021-12-19 09:43:13 -07:00
Nathan Sobo 0f475ebe18 Relocate admin routes to make room for API
I want to use the top-level /users route for the API that we'll access from the front-end site running on Vercel, and this is the easiest way to make space. Eventually we won't have admin pages, but I want to be additive for now.
2021-12-19 09:06:57 -07:00
Nathan Sobo d831c18326 Fix journal format strings 2021-12-18 12:15:07 -07:00
Nathan Sobo 978ae73ba7 Merge pull request #287 from zed-industries/journal
Add a simple journaling feature
2021-12-18 11:17:18 -07:00
Nathan Sobo 051c574744 Pad single-digit months, days, and minutes with a leading zero 2021-12-18 11:11:04 -07:00
Nathan Sobo 0ddef7d526 Fix warnings and tests 2021-12-18 11:06:07 -07:00
Nathan Sobo 0fdc955732 Insert a time heading when creating a journal entry 2021-12-18 10:38:54 -07:00
Nathan Sobo 86eb1a155f Return item handles when opening items
This will support interacting with the opened item. Although I think I should probably return the ItemView rather than the Item. Next commit.
2021-12-18 08:26:57 -07:00
Nathan Sobo b9a83e5ade Add journal crate and move supporting logic into workspace crate
I needed to interact with the workspace to open a file from the journal crate, so I moved a bunch of logic out of main related to opening new workspaces and paths.
2021-12-18 08:12:59 -07:00
Nathan Sobo 712552cfa3 Halt keystroke dispatch immediately when we call a global action handler
Someday, we may want to define a global action context that allows us to propagate the action, but this isn't currently supported. Previous to this commit, we were invoking the same global action handler multiple times, once for each view in the responder chain.
2021-12-18 08:12:08 -07:00
Max BrunsfeldandNathan Sobo 2b7b99248a WIP - start restructuring collaboration around entire projects
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-12-17 22:00:39 -08:00
Antonio ScandurraandNathan Sobo 746d9b93e0 Allow saving of all buffers contained in project diagnostics editor
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-12-17 16:48:16 +01:00
Antonio ScandurraandNathan Sobo 9a59caff50 Gracefully degrade diagnostics_in_range, diagnostic_group and file
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-12-17 16:37:12 +01:00
Antonio Scandurra 34c3c8f595 Implement MultiBuffer::save
This is still not integrated with `workspace::ItemView`.
2021-12-17 16:11:18 +01:00
Antonio Scandurra 3dc1435ddc Implement MultiBuffer::{is_dirty,has_conflict} 2021-12-17 15:33:09 +01:00
Antonio Scandurra a35d60ee91 Implement MultiBuffer::enclosing_bracket_ranges 2021-12-17 15:05:05 +01:00
Antonio Scandurra f280e8c6f1 Implement MultiBuffer::range_for_syntax_ancestor 2021-12-17 14:57:42 +01:00
Antonio Scandurra 647a5cb5d3 Make MultiBuffer::is_parsing a test-only method 2021-12-17 14:57:24 +01:00
Antonio Scandurra 21a4e89e98 Display filename on the first excerpt's header for a group 2021-12-17 13:49:21 +01:00
Antonio Scandurra 3f71306ec1 Enhance diagnostic unit test and correctly display primary diagnostic
That is, if the diagnostic has more than one line we will display the
first line in the header and all the other message lines at the error
location.
2021-12-17 12:16:09 +01:00
Max Brunsfeld 3fe4adf041 WIP - Improve project diagnostic context rendering 2021-12-16 18:34:29 -08:00
Max Brunsfeld a7b89e4e51 Correctly incorporate editor settings into diagnostic header rendering 2021-12-16 16:36:33 -08:00
Max Brunsfeld 72f9b28337 Don't terminate on an empty input chunk in ExcerptChunks 2021-12-16 16:05:28 -08:00
Max Brunsfeld 012719e41e Autoscroll after inserting blocks 2021-12-16 14:20:01 -08:00
Max Brunsfeld 1892193c59 Transfer focus from ProjectDiagnostics view to its editor 2021-12-16 14:14:22 -08:00
Max Brunsfeld 2c2313311a Integrate MultiBuffer::buffer_rows into the display map 2021-12-16 13:53:32 -08:00
Max Brunsfeld ed32b7d257 Implement MultiBuffer::buffer_rows 2021-12-16 12:17:47 -08:00
Max Brunsfeld 1a8345564e Suppress unused field warnings 2021-12-16 11:17:06 -08:00
Max Brunsfeld e46727016c Fix up/down movement across excerpt headers
Implement these movements in terms of clipping, instead of with explicit loops
2021-12-16 11:16:48 -08:00
Max BrunsfeldandAntonio Scandurra f1aef7e4b5 Resolve Anchor::min and ::max to valid positions
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2021-12-16 10:25:09 -08:00
Max BrunsfeldandAntonio Scandurra b02988e6cc Always panic if invalid point is passed to {prev,next}_row_boundary
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2021-12-16 10:23:45 -08:00
Antonio Scandurra 1ebe71d886 Account for folds when inserting/removing block decorations 2021-12-16 16:44:15 +01:00
Antonio Scandurra ac3f4b6bf3 Test blocks in display map randomized tests
This highlighted some errors in the implementation.
2021-12-16 16:15:14 +01:00