Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6178 commits 1103 branches 1111 tags 398 MiB
Commit graph

298 commits

Author SHA1 Message Date
Antonio Scandurra
31dfd01fda Make add_local_worktree private and use find_or_create_local_worktree 
The former always adds a worktree, even if we have one already in the
project and that could be misused. The public API should always search
for a local worktree containing the requested path first so that the
project can uphold invariants about which worktrees it has.
 2022-01-22 11:23:00 +01:00
Nathan Sobo
19751e9200 Merge remote-tracking branch 'origin/main' into go-to-definition 2022-01-21 11:12:38 -07:00
Nathan Sobo
a73671e57c Revert "Replace project_path with project_entry in workspace::{Item, ItemView}" 
This reverts commit 9c9a09cccb.
 2022-01-21 11:07:10 -07:00
Antonio Scandurra
6e7e86e491 Remove weak worktrees from project when nobody references them 
Also, avoid showing them in the project panel as well as in the
contacts panel.
 2022-01-21 14:34:14 +01:00
Nathan Sobo
fbca28337a When opening a path in an existing window, move it to the foreground 2022-01-20 20:45:30 -07:00
Antonio Scandurra
c450945001 WIP 2022-01-20 18:11:37 +01:00
Antonio Scandurra
b6685a532c Make "go to definition" work in project diagnostics 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-20 17:30:30 +01:00
Antonio Scandurra
cbbf7391e8 Start on Project::definition that only works locally (for now) 2022-01-20 12:11:41 +01:00
Antonio Scandurra
71082d4cdc Return a Task<Result<()>> in {ItemView,Buffer,MultiBuffer}::save 2022-01-20 09:58:24 +01:00
Antonio Scandurra
634340dd84 Return a task from Workspace::save_active_item 
This required changing our approach to OS prompts and this commit greatly
simplifies that. We now avoid passing a callback and return a simple future
instead. This lets callers spawn tasks to handle those futures.
 2022-01-20 09:51:29 +01:00
Max Brunsfeld
0992132a0d Always open buffers via the project 2022-01-19 14:48:54 -08:00
Antonio Scandurra
ae284c2d8a Route save_as via the Project 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-01-19 18:44:48 +01:00
Antonio Scandurra
9c9a09cccb Replace project_path with project_entry in workspace::{Item, ItemView} 2022-01-19 15:56:04 +01:00
Antonio Scandurra
18f1040c85 Rename Navigation to NavHistory 2022-01-19 15:27:34 +01:00
Antonio Scandurra
4f472e1442 🔥 2022-01-18 10:10:16 +01:00
Max Brunsfeld
11b7270f68 Navigate to previous positions in editors when using navigation history 2022-01-17 16:01:52 -08:00
Max Brunsfeld
e43d33cdad WIP - Reopen closed items when going back in nav history 2022-01-17 10:46:47 -08:00
Antonio Scandurra
ea624c6cde Populate backward/forward stacks upon item deactivation 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-01-17 18:57:31 +01:00
Antonio Scandurra
bbf634f439 Start laying the foundation for a per-pane navigation system 2022-01-17 16:59:06 +01:00
Max Brunsfeld
b7561c6cef Add select_first and select_last bindings to outline view 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-14 10:45:37 -08:00
Max Brunsfeld
ed88fdcea2 Add unit test for diagnostic + path header ordering 2022-01-12 11:34:57 -08:00
Max Brunsfeld
6865a42df9 Show error+warning counts in project diagnostics tab 
Allow workspace items' tab contents to be arbitrary elements

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-12 10:51:28 -08:00
Max Brunsfeld
a0a558318c In diagnostics editor, attempt to open excerpts in a different pane 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-10 16:33:25 -08:00
Max Brunsfeld
c7eb6a6a60 Tweak color of share icon in titlebar 2022-01-10 11:26:07 -08:00
Antonio Scandurra
1a53d5b7ba Use a new Workspace::activate_item API in project diagnostics 
Previously, we would only activate the pane without switching the
pane's *active item*.
 2022-01-10 10:10:11 +01:00
Max Brunsfeld
ce6f3d7f3e Reuse views when moving between diagnostic view and editors 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 11:00:12 -08:00
Max Brunsfeld
ea263822fa Finish implementing ProjectDiagnostics::open_excerpts 
* Build workspace item views with a reference to the workspace
* Add randomized test for MultiBuffer::excerpted_buffers and fix a small bug

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 09:59:27 -08:00
Antonio Scandurra
e5c520a265 Use Buffer handles instead of MultiBuffer as editor workspace items 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 17:48:31 +01:00
Antonio Scandurra
794d214eee Refactor opening workspace items 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 17:38:37 +01:00
Antonio Scandurra
3cab32d201 WIP: Add keybinding to open buffers under cursors 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 16:12:50 +01:00
Max Brunsfeld
1f762e482d Unify Flexible and Expanded elements 
We'll use the name Expanded for something else now.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-06 17:29:34 -08:00
Antonio Scandurra
b2f0c78924 Merge branch 'main' into polish-project-diagnostics 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-01-04 18:35:28 +01:00
Antonio Scandurra
508b9dc024 Rip out "diagnostic providers" 2022-01-04 16:32:17 +01:00
Max Brunsfeld
a4027aacb5 Introduce a WorktreeId struct, fix incorrect use of remote worktrees' handle id 2022-01-04 11:28:44 +01:00
Max Brunsfeld
a080ae98c6 Allow the zed app to connect to both the old and new rpc endpoints 
In the case of the new Next.js app, the app will follow a redirect
from 'zed.dev/rpc' to the subdomain where the rust service is hosted.
Until then, the app will connect directly to zed.dev/rpc.
 2022-01-03 15:29:26 -08:00
Antonio Scandurra
a85e400b35 Start on a DiagnosticProvider implementation for Rust 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-24 16:22:22 +01:00
Antonio Scandurra
89c0b358a7 Allow sharing/unsharing of projects 2021-12-21 12:45:20 +01:00
Antonio Scandurra
17094ec542 Allow opening of remote projects via the contacts panel 2021-12-21 12:05:38 +01:00
Antonio Scandurra
40da3b233f Get more integration tests passing 2021-12-21 09:50:11 +01:00
Max Brunsfeld
55910c0d79 Get the server and integration tests compiling 2021-12-20 16:30:29 -08:00
Max Brunsfeld
466a377e1d Merge branch 'main' into share-project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-20 11:42:59 -08:00
Max Brunsfeld
614ee4eac7 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
Nathan Sobo
e4f18947de Insert a time heading when creating a journal entry 2021-12-18 10:38:54 -07:00
Nathan Sobo
9e8ef31452 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
ca0d7e5e1f 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
Antonio Scandurra
88d663a253 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
Max Brunsfeld
6ab795c629 Handle buffer deduping in the worktree instead of in workspace 
Previously, buffers were only deduped by file if they were opened
through Workspace::open_entry
 2021-12-13 16:35:46 -08:00
Nathan Sobo
1445ce10b5 Name the root file of every crate after the crate to ease navigation 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-11-30 12:46:39 -07:00
Renamed from crates/workspace/src/lib.rs (Browse further)