mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
3659 commits 777 branches 798 tags 287 MiB
Commit graph

240 commits

Author SHA1 Message Date
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
377e41a90f Make navigation history work with project diagnostics 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-01-20 18:21:48 +01: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
Max Brunsfeld
2cae706033 Limit the storage used by the navigation history 2022-01-18 16:31:48 -08:00
Max Brunsfeld
926306582b Add a unit test for navigation behavior at the editor level 2022-01-18 16:25:22 -08:00
Max Brunsfeld
f7326b8d74 Push to navigation history based on jump distance instead of time 2022-01-18 15:02:49 -08:00
Antonio Scandurra
16b82d59f1 Experiment with a more general way of pushing editor navigation entries 2022-01-18 18:03:10 +01:00
Antonio Scandurra
0cae3e0ac0 Ensure focus is transferred when opening the first item in pane 2022-01-18 10:15:37 +01:00
Antonio Scandurra
b7091dd5e2 Fix double borrow error when closing an item 2022-01-18 10:13:50 +01:00
Antonio Scandurra
4f472e1442 🔥 2022-01-18 10:10:16 +01:00
Antonio Scandurra
d480738cc5 Skip past entries in the navigation history that can't be re-opened 2022-01-18 09:58:40 +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
Antonio Scandurra
cd0d1d3340 Delete unused pane::State struct 2022-01-17 15:27:54 +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
Max Brunsfeld
026c3476db Upgrade tree-sitter to 0.20.1 2021-12-05 21:37:08 -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
Antonio Scandurra
b9edde7b26 Make settings fields that can be overridden private 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-29 17:08:43 +01:00
Antonio Scandurra
93de2bcfed Allow overriding editor settings on a per-language basis 2021-11-29 09:39:13 +01:00
Nathan Sobo
815cc7ee91 Give avatar ribbons a rounded top 2021-11-28 14:04:31 -07:00
Nathan Sobo
fbc307cd5e Associate collaborator avatars with "ribbons" corresponding to their cursor color 2021-11-28 13:25:05 -07:00
Nathan Sobo
a5039cad65 Tweak avatar sizes in titlebar 2021-11-28 12:41:46 -07:00
Nathan Sobo
6ce76ca13e Render active worktree collaborator avatars in the titlebar 2021-11-28 12:28:10 -07:00
Nathan Sobo
9930e92412 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
Antonio Scandurra
0d8c68ae1d Replace signed out silhouette with a "Sign in" label 2021-11-25 10:34:03 +01:00
Antonio Scandurra
afdac15572 Move integration test up into the zed crate 2021-11-24 17:39:15 +01:00
Antonio Scandurra
e88d3bb97e Invert dependency between editor and workspace 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-24 17:07:16 +01:00
Antonio Scandurra
2cf44d30b7 🔥 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-24 16:17:41 +01:00
Antonio Scandurra
03bd6d6c33 Pull up diagnostic and cursor position status bar items creation 2021-11-24 16:04:24 +01:00
Antonio Scandurra
9bb195e177 Introduce "entry openers" but still register editors in workspace 2021-11-24 15:18:15 +01:00
Max Brunsfeld
447f710570
Merge pull request #226 from zed-industries/1d-block-map 
Allow full diagnostic messages to be displayed in the editor
 2021-11-19 09:16:49 -08:00
Antonio Scandurra
b0afc80678 Ignore diagnostics with empty ranges 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-19 16:30:26 +01:00
Antonio Scandurra
401b59be5c Refactor retrieving oldest and newest selection 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-18 15:18:35 +01:00
Max Brunsfeld
61b9179fb1
Merge pull request #222 from zed-industries/fix-hover-beachball 
Give the MouseEventHandlers for each tab bar their own id
 2021-11-03 19:38:04 -07:00
Nathan Sobo
0ff87e603f Give the MouseEventHandlers for each tab bar their own id 
This fixes a beachball where we oscillate back and forth between hovered and unhovered due to confusing two different tab bars as the same tab bar.
 2021-11-03 19:15:55 -06:00
Nathan Sobo
44e0a00734 Only show the first line of diagnostic messages in the status bar 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-11-03 16:52:32 -06:00
Max Brunsfeld
1ec31738e6 Improve styling of diagnostic status bar item 2021-11-03 14:15:22 -07:00
Max Brunsfeld
8b5089c759 In the status bar, show the diagnostic under the cursor 2021-11-03 12:33:16 -07:00
Antonio Scandurra
c07d794249 Avoid ending the pending selection until updating selections 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-11-03 19:07:06 +01:00
Antonio Scandurra
a26b066788 Introduce a status bar and add the cursor position to it 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-11-03 17:27:51 +01:00
Max Brunsfeld
8d3f42de52 Start language servers based on buffers' languages 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-02 17:41:01 -07:00
Max Brunsfeld
89392cd23d Avoid using worktree handle in File's path methods 
This avoids a circular model update that was happening
when trying to retrieve the absolute path from a buffer's
file while applying remote operations.
 2021-11-02 14:33:55 -07:00
Max Brunsfeld
4069db4959 Allow underlines to have different color than the text 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-26 12:46:46 -07:00
Antonio Scandurra
0674e76864 WIP 2021-10-26 19:42:40 +02:00
Max Brunsfeld
81a85e9c79 Extract a language crate 2021-10-20 22:51:40 +02:00
Antonio Scandurra
724272931a Skip autoclosed pairs 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-10-06 19:04:55 +02:00
Antonio Scandurra
05d7e9c4e7 Start on autoclosing pairs 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-06 16:34:57 +02:00
Max Brunsfeld
3cb7ba0f57 Make the fields of buffer::Language private 2021-10-05 14:19:33 -07:00
Antonio Scandurra
499616d769 Move workspace module into its own crate 2021-10-05 13:49:10 +02:00
Antonio Scandurra
5105596918 Move sidebar-specific code out of Workspace 2021-10-05 10:59:20 +02:00