mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-14 22:14:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
6826 commits 499 branches 808 tags 284 MiB
Commit graph

523 commits

Author SHA1 Message Date
Max Brunsfeld
4805cfe48c Merge branch 'main' into typescript 2022-03-30 14:44:07 -07:00
Max Brunsfeld
3b4cab9094 Move all configuration of individual LSP servers to LspAdapter 2022-03-29 18:14:30 -07:00
Max Brunsfeld
ebc711f9f5 Restructure fake language server setup 
Replace FakeLanguageServerConfig with FakeLanguageServerAdapter
 2022-03-29 17:55:57 -07:00
Keith Simmons
6d91fd078c Add restart-lsp keybinding 2022-03-29 17:24:23 -07:00
Max Brunsfeld
158d987965 Start work on allowing language servers to support multiple languages 2022-03-29 16:57:18 -07:00
Keith Simmons
0e1d371a67 Add typescript language server 
Currently not tested for tsx files

Co-authored-by: Max Brunsfeld <max@zed.dev>
 2022-03-29 13:42:21 -07:00
Antonio Scandurra
bfa5dd52dd Don't underflow when calling symbols_containing_offset(0) 2022-03-29 15:08:37 +02:00
Antonio Scandurra
a86118cfe2 Avoid matching duplicate impl outline items in tests 2022-03-29 11:59:52 +02:00
Antonio Scandurra
d7026c2228 Merge branch 'main' into breadcrumbs 2022-03-29 10:05:05 +02:00
Max Brunsfeld
a8600e76a3 Make language's language server config non-optional 2022-03-28 18:14:49 -07:00
Max Brunsfeld
4d456d3847 Remove duplication in build_language_registry 2022-03-28 18:01:29 -07:00
Keith Simmons
a7a52ef3f7 Add word and line movement in vim normal mode 
Add jump to start and end of the document
Move vim tests to relevant vim files
Rename VimTestAppContext to VimTestContext for brevity
Improve VimTestContext assertions to pretty print locations when selection position assertion panics
 2022-03-27 17:58:28 -07:00
Nathan Sobo
ccc276da7a
Merge pull request #672 from zed-industries/fix-unfollowing-on-edit 
Automatically unfollow leader only for edits that originate from the follower editor
 2022-03-24 13:26:28 -06:00
Keith Simmons
8f75520ade
Merge pull request #676 from zed-industries/highlighted-text-fix 
Highlighted text fix
 2022-03-24 11:52:06 -07:00
Keith Simmons
92c7b5d6ef Remove result from anchor cmp functions 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-03-24 11:48:31 -07:00
Keith Simmons
ab631cf6c3 Change language:⚓:min() to a constant 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-03-24 10:41:33 -07:00
Keith Simmons
f6805eb802 Make rename highlights work across multibuffer excerpts 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-03-24 10:22:47 -07:00
Antonio Scandurra
a739c362d9 Rename editor::Event::Edited to editor::Event::BufferEdited 
This is to distinguish it from a new event we're about to add which
represent edits originating from that specific editor.
 2022-03-24 08:55:46 +01:00
Max Brunsfeld
22148a3639 Fix extending selections starting at ends of other nodes 
Fixes #478
 2022-03-23 15:38:23 -07:00
Antonio Scandurra
004f98cc6d
Merge pull request #661 from zed-industries/follow 
Introduce basic following experience
 2022-03-23 15:17:44 +01:00
Antonio Scandurra
3117554568 Automatically unfollow when editing, scrolling or changing selections 2022-03-22 09:17:01 +01:00
Nathan Sobo
210fa4c443 Remove CharKind::Newline 
This is just a character, and so it seems clearer to refer to it specifically when we want to know if a character is a newline. There was only one case where we relied on Newline being different from Whitespace, and we special-cased that instance. Changing this actually makes us match the behavior of VS Code when double-clicking runs of multiple newlines.

/cc @as-cii

Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-03-21 15:17:32 -06:00
Max Brunsfeld
06cd9ac664 Match the leader's last selection when unfollowing 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-21 14:04:55 -07:00
Max Brunsfeld
d02ab9bd06 Start work on updating editors's scroll positions when following 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-18 12:56:20 -07:00
Antonio Scandurra
f0b7bd6e17 Serialize initial follow state in leader and reflect it in follower 2022-03-18 10:22:13 +01:00
Max Brunsfeld
257601b3c1 Add buffer method for getting the symbols containing a position 2022-03-15 14:04:58 -07:00
Antonio Scandurra
7155dabf5b Fade out unnecessary code 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-15 15:51:59 +01:00
Antonio Scandurra
021699e51c Implement shift-f8 to go to previous diagnostic 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-15 15:13:23 +01:00
Antonio Scandurra
a6d0caf557 Don't seek FilterCursor upon creation 
This lets us use `next` or `prev` to decide whether to park the cursor
at the first or last filtered item.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-15 15:13:23 +01:00
Max Brunsfeld
325e6c31ae Autoclose brackets before a language-specific set of characters 
Fixes #588
 2022-03-14 15:17:40 -07:00
Max Brunsfeld
b33a049958 Merge branch 'main' into settings-file 2022-03-13 10:43:23 -07:00
Nathan Sobo
33bcd6d904 Merge remote-tracking branch 'origin/main' into select-on-rename 2022-03-12 10:10:23 -07:00
Max Brunsfeld
20fed599b2 Start work on relaying settings to language servers 2022-03-11 17:36:27 -08:00
Nathan Sobo
951fd1ab36 Merge branch 'main' into select-on-rename 2022-03-11 15:30:07 -07:00
Max Brunsfeld
7a68b2d371 Provide JSON language server with settings schema 2022-03-11 11:46:22 -08:00
Nathan Sobo
134496ce8f Remove dead code 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-11 08:24:42 -07:00
Antonio Scandurra
ee6d7fc6d5 Delete till previous tabstop when backspacing within indent column 2022-03-10 10:28:24 +01:00
Nathan Sobo
ac1eb19f83 Start on text highlight support 2022-03-09 20:51:35 -07:00
Antonio Scandurra
7546ede288 Split language server initialization from construction 
This gives clients a chance to register to notifications.
 2022-03-09 12:31:21 +01:00
Antonio Scandurra
ef1ec88523 Remove delegate support from GPUI 
We added this because we thought it would save some allocations when
sending operations given that we could move them to the delegate upon
notifying it, but the reality is that we serialize operations and that
only requires a reference.
 2022-03-09 10:48:52 +01:00
Max Brunsfeld
4cb4b99c56 Assign buffer's completion triggers from LSP capabilities 
Also, make LanguageServer::new() async. The future resolves
once the server is initialized.
 2022-03-08 17:41:52 -08:00
Antonio Scandurra
317a1bb07b Remove language servers from buffers 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
Co-Authored-By: Keith Simmons <keith@zed.dev>
 2022-03-08 15:16:07 -08:00
Antonio Scandurra
6662ba62a3 Move DidSaveTextDocument notification from Buffer to Project 2022-03-08 11:35:54 +01:00
Antonio Scandurra
51d5ed48f0 Remove unused CloseBuffer message 2022-03-08 11:17:20 +01:00
Antonio Scandurra
d6c8fdb3c4 Send buffer operations via the Project instead of Worktree 2022-03-08 11:11:25 +01:00
Max Brunsfeld
5cc5fa2f93 Populate environment from shell 
Co-Authored-By: Keith Simmons <keith@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-07 16:39:50 -08:00
Max Brunsfeld
1982a8c27d Put vector clock serialization logic alongside other serialization logic 
This way, the `clock` crate doesn't depend on the `rpc` crate.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-04 13:54:07 -08:00
Max Brunsfeld
28bacabc4e Move Network test helper from util crate into text crate 
This way, `util` does not depend on `clock`.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-04 13:54:07 -08:00
Antonio Scandurra
dc5a09b3f7
Merge pull request #525 from zed-industries/preserve-worktrees 
Grow worktrees monotonically when sharing and move most messages to the background
 2022-03-04 09:48:18 +01:00
Antonio Scandurra
7c420050c7 Observe selection set lamport timestamps when deserializing buffer 2022-03-04 09:34:30 +01:00
Antonio Scandurra
bcd5c28833 Allow receiving diagnostic updates out of order 2022-03-04 09:27:49 +01:00
Max Brunsfeld
19658139b1 Avoid infinite loop when a language server fails to start 2022-03-03 18:13:38 -08:00
Max Brunsfeld
05df1dfae9 Disable doctests for all libraries 
We don't use them, and they add a lot of noise to the test output
when running all tests in the workspace.
 2022-03-03 16:15:56 -08:00
Max Brunsfeld
78d96a05fc Make fake language servers have full capabilities 2022-03-03 15:42:29 -08:00
Max Brunsfeld
9999862016 Enable formatting feature of JSON language server 
The feature doesn't work yet because the JSON language server
only supports *range* formatting, not document formatting.
We need to adjust our code to inspect the server's capabilities
and send range formatting requests instead when needed.

We're going to hold off on doing this right now, because it
will create merge conflicts with the `preserve-worktrees`
branch (#525)

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-03 14:16:58 -08:00
Max Brunsfeld
0582c557e3 Add JSON language server 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-03 13:29:25 -08:00
Antonio Scandurra
556d9cc53f Correctly defer undo operations when messages arrive out of order 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-03-03 18:07:59 +01:00
Antonio Scandurra
14d26eeedc Move several buffer-related messages to the background 2022-03-03 12:18:19 +01:00
Antonio Scandurra
466db69780 Pass a reference to TestAppContext in tests 
This allows us to drop the context *after* we ran all futures to
completion and that's crucial otherwise we'll never drop entities
and/or flush effects.
 2022-03-01 12:01:02 +01:00
Nathan Sobo
2f427769df Allow a new search to be created with cmd-enter 
This replaces the `cmd-alt-shift-F` binding to open a new search. Instead, you can preserve the existing search results by entering a query and then hitting `cmd-enter` instead of `enter`. This opens a new project find view and restores the previous view to whatever query it was previously displaying. It's a bit strange, but I don't want to rely on splitting as the only way of creating multiple sets of search results.
 2022-02-26 13:23:05 -07:00
Antonio Scandurra
0bf944e038 Use Project::search in ProjectFind and show search results 2022-02-25 10:32:45 +01:00
Antonio Scandurra
9e173564e9 Pass an AsyncAppContext to fake language server request handlers 2022-02-23 16:14:36 +01:00
Max Brunsfeld
64098247cb Allow languages to be registered at any time 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-02-22 10:35:20 -08:00
Antonio Scandurra
fad335b2ba Don't serialize the full LSP symbol when collaborating 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-22 18:08:43 +01:00
Antonio Scandurra
8a8ae0fbcd Rename CompletionLabel to CodeLabel and add Project::symbols 
This only works locally for now and we haven't implemented the
`RustLsp::label_for_symbol` method yet.
 2022-02-22 10:01:08 +01:00
Nathan Sobo
99594333a5 Log an error instead of panicking when there's no LSP download dir 2022-02-21 17:44:00 -07:00
Max Brunsfeld
03ec6e11b7 Assign language server download directory on startup 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-21 16:23:38 -08:00
Max Brunsfeld
79910ba931 Show more information in lsp status bar item 
* Distinguish between checking for updates and downloading
* Show dismissable error message when downloading failed and there
  is no cached server.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-21 16:11:51 -08:00
Max Brunsfeld
ededfff3a8 Download language servers on-demand 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-21 13:54:52 -08:00
Antonio Scandurra
aee479d615 Show message indicating when we're downloading language servers 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-21 17:25:52 +01:00
Antonio Scandurra
793d9e8bba Download rust-analyzer from GitHub 2022-02-21 16:15:54 +01:00
Antonio Scandurra
fafe521e9f Introduce LspPostProcessor::download_language_server 2022-02-21 09:46:18 +01:00
Antonio Scandurra
1ca50d0134 Make language server initialization asynchronous 2022-02-21 09:39:28 +01:00
Antonio Scandurra
b8523509da Revert "WIP: avoid code-signing rust-analyzer to prevent proc macro errors" 
This reverts commit fc3bccc1a1.
 2022-02-21 08:13:05 +01:00
Antonio Scandurra
fc3bccc1a1 WIP: avoid code-signing rust-analyzer to prevent proc macro errors 
If this works, I think we should set the permissions asynchronously,
maybe as part of starting the language server, so that we avoid doing
synchronous I/O.
 2022-02-20 12:14:43 +01:00
Antonio Scandurra
30e4ea1a4c Fix warnings 2022-02-17 17:26:03 +01:00
Antonio Scandurra
50a31721eb Wait for version before returning completions 2022-02-17 11:41:19 +01:00
Max Brunsfeld
e3c4ce208a Remove unnecessary waiting when handling save RPC requests 
Add saving to the randomized integration test

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-16 17:47:21 -08:00
Max Brunsfeld
41ba980c9b Remove unnecessary waiting during completion RPC requests 
Also, add completion requests to the randomized collaboration integration test,
to demonstrate that this is valid.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-16 17:23:16 -08:00
Max Brunsfeld
c4dff12d69 Allow multiple fake language servers to be started for a given project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-16 16:10:36 -08:00
Max Brunsfeld
d358072c74 Include the desired version in a SaveBuffer RPC request 
When handling this messages on the host, wait until the desired
version has been observed before performing the save.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-14 17:51:26 -08:00
Antonio Scandurra
fadb94afb2 Use selection instead of just the cursor when fetching code actions 2022-02-14 14:13:36 +01:00
Antonio Scandurra
e354133be0 Remove stray log statements 2022-02-12 12:32:57 +01:00
Max Brunsfeld
d84fc3beec Remove Buffer::apply_lsp_edits 
Always use `edits_from_lsp`.
 2022-02-11 16:22:19 -08:00
Antonio Scandurra
4929b8c525 Move Buffer::format to Project::format 2022-02-11 12:07:46 +01:00
Max Brunsfeld
645df73a37 Finish implementing Buffer::edits_from_lsp 2022-02-10 18:01:18 -08:00
Max Brunsfeld
3a1f9bb212 Start work on applying LSP edits via a diff 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-02-10 11:14:06 -08:00
Nathan Sobo
9936bb2efa Undo subsequent edits when undoing in multi-buffer 
When undoing in the multi-buffer, don't preserve edits that occurred outside the multi-buffer after the edit being undone.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-02-10 09:04:53 -07:00
Antonio Scandurra
0e1318dfe4 WIP: Make editor crate compile again 
Tests are still failing though.
 2022-02-09 11:09:11 +01:00
Max Brunsfeld
8b1fb9a2cc Fix unused import warnings 2022-02-08 16:27:33 -08:00
Max Brunsfeld
6731d92f60 Give the editor a handle to the project, not a weak handle to the workspace 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-08 15:48:44 -08:00
Max Brunsfeld
93bcde953c Consolidate logic for completion alongside code actions in Project 
This way, completions are dealt with more consistently with code actions,
and the logic is not spread across so many places. The `language::File`
trait and the multibuffer no longer need to deal with completions. Completions
are no longer generic over an anchor type.
 2022-02-08 14:24:45 -08:00
Max Brunsfeld
722c84c976 Consolidate all code actions logic into Project 2022-02-08 13:17:57 -08:00
Max Brunsfeld
e0fe8b5a7c Merge branch 'main' into assists 2022-02-08 12:41:57 -08:00
Max Brunsfeld
a32dffdd2b Apply lsp edits in reverse order 
This fixes the handling of multiple edits on the same line.
 2022-02-08 12:41:30 -08:00
Antonio Scandurra
36ff31858b Set file in test_diagnostics to excercise language server 2022-02-08 20:09:53 +01:00
Antonio Scandurra
7d8641afb6 Make transactions serializable to enable edits on behalf of other users 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-08 19:48:21 +01:00
Antonio Scandurra
624eb5907e Serialize buffer in terms of operations rather than state 
This is required because, after joining, we want to be able to refer
to operations that have happened prior to joining, which are not
captured by the state. There is probably a way of reconstructing operations
from the state, but that seems unnecessary and we've already talked about
wanting to have the server store operations rather than state once we start
persisting worktrees.
 2022-02-08 14:59:46 +01:00
Antonio Scandurra
dca974c7d4 Apply code actions remotely 2022-02-08 12:18:14 +01:00
Antonio Scandurra
9ce3b1adf2 Send DidCloseTextDocument when dropping buffer 
Closes https://github.com/zed-industries/zed/issues/434
 2022-02-08 10:02:26 +01:00
Max Brunsfeld
e3f055d950 Use a pool of databases to speed up integration tests 
Also, use env_logger consistently in the tests for each crate.
Only initiallize the logger at all if some RUST_LOG env var is set.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-07 15:00:00 -08:00
Antonio Scandurra
8f3ff1590e Apply edits received from LSP code actions and open all touched buffers 2022-02-07 18:48:45 +01:00
Antonio Scandurra
7a35ea7b25 Tolerate language servers reporting non-monotonic buffer versions 
This isn't perfect but we'll retain up to 10 old versions just in case there
are race conditions in the language server. We haven't seen this in the wild
but we're concerned about diagnostic reporting racing with code action
resolution.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-07 16:29:05 +01:00
Antonio Scandurra
982e90539d WIP: Start on applying code actions 2022-02-07 12:20:03 +01:00
Nathan Sobo
93a3f4b615 Move rendering and select prev/next into ContextMenu enum 
This prepares the way to have a code actions context menu.
 2022-02-05 10:19:43 -07:00
Max Brunsfeld
83d4fe8e3a Start work on code actions 
Just print out the returned code actions for now

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-04 17:45:00 -08:00
Max Brunsfeld
4900019e9b Add a ToPointUtf16 trait in text and multibuffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-04 17:35:37 -08:00
Max Brunsfeld
7fc951853d Adjust assertion to reflect rust grammar upgrade 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-04 13:31:41 -08:00
Max Brunsfeld
3e232f7115 Refine behavior of select_larger_syntax_node 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-02-04 13:19:00 -08:00
Max Brunsfeld
3dfff3866a Add integration test for getting and resolving completions 2022-02-03 15:24:16 -08:00
Antonio Scandurra
ab26a175a4 Opt into language-aware features when getting buffer chunks 
We use chunks a lot to transform points and sync the various display maps,
and always querying tree-sitter or the LSP diagnostics in those cases is
unnecessarily expensive.
 2022-02-03 11:21:30 +01:00
Antonio Scandurra
d246a39b57 Syntax highlight even when the label doesn't contain a detail 2022-02-03 09:57:04 +01:00
Max Brunsfeld
439d12cb85 Start work on syntax highlighting completions 2022-02-02 18:14:30 -08:00
Max Brunsfeld
45898daf83 Fix hang in editor completion unit test 2022-02-02 17:09:36 -08:00
Max Brunsfeld
bbdf62f263 Introduce Language::highlight_text method 2022-02-02 17:01:48 -08:00
Max Brunsfeld
88adddb324 Remove theme parameters from buffer/display map's chunks methods 
Change Chunks to contain highlight ids instead of actual highlight
styles. Retrieve the actual highlight style from the theme in the
editor element layer.

This is to set us up to perform syntax highlighting in other code
paths where the theme is not available.
 2022-02-02 16:33:04 -08:00
Antonio Scandurra
8149bcbb13 Improve formatting of function autocompletion labels in Rust 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-02-02 18:43:55 +01:00
Antonio Scandurra
8d7815456c Don't apply completion's edit when it wouldn't change the buffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-02 18:00:30 +01:00
Antonio Scandurra
924eb622ae Wait for additional edits before pushing transaction in remote buffer 2022-02-02 17:01:23 +01:00
Antonio Scandurra
d765e75bad Apply additional edits for completion when the buffer is remote 2022-02-02 16:29:13 +01:00
Antonio Scandurra
91e5c2dfac Broadcast completion triggers to remote participants 2022-02-02 14:07:41 +01:00
Antonio Scandurra
ed549e352f Start on requesting completions for remote buffers 2022-02-02 12:22:47 +01:00
Max Brunsfeld
7270fd00ba Start work on handling snippet completions 2022-02-01 15:35:02 -08:00
Max Brunsfeld
1371a20e58 🎨 Return an option task from confirm_completion 2022-02-01 14:27:01 -08:00
Antonio Scandurra
6c7d2cf6b5 Apply additional edits when confirming a completion 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-01 17:38:11 +01:00
Antonio Scandurra
bcc57036a5 Fix warnings in language::FakeFile 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-01 16:59:03 +01:00
Antonio Scandurra
b89a39bcb3 Filter and sort suggestions in autocomplete 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-01 15:11:20 +01:00
Nathan Sobo
fde03b1b37 Make the anchor range inclusive on completions 
This will help us to correctly interpolate the replacement range when we confirm before receiving new completions after typing with a completion open.
 2022-01-31 18:26:26 -07:00
Max Brunsfeld
1d1f8df180 Trigger completion when typing words or trigger characters 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-31 17:07:24 -08:00
Max Brunsfeld
8d2b7ba032 Insert completion text on enter 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-31 13:46:50 -08:00
Nathan Sobo
ab6eb0a655 Start on completion rendering 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-01-31 12:19:17 -07:00
Nathan Sobo
0344c543af Return anchored completions from Buffer::completions 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-01-31 11:25:00 -07:00
Antonio Scandurra
03bcbdc33d WIP 2022-01-31 19:12:35 +01:00
Antonio Scandurra
bd2527e691 Use StringMatchCandidate::new to construct candidates more conveniently 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-31 19:11:13 +01:00
Antonio Scandurra
f055053fc9 Avoid grouping transactions created by different editors 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-27 15:51:46 +01:00
Antonio Scandurra
121b45e249 Sanitize language server diagnostics coming from Rust 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-25 17:49:50 +01:00
Antonio Scandurra
96b66dcce1 Fix race condition when opening a buffer and getting a definition to it 2022-01-24 18:47:55 +01:00
Antonio Scandurra
245490f934 Implement Project::definition when the buffer is remote 2022-01-24 13:10:13 +01:00
Antonio Scandurra
f859d444ff Don't show conflict indicator on remote buffer after a reload 2022-01-24 10:17:36 +01:00
Antonio Scandurra
4372fe1ed0 Maintain remote buffers via UpdateBufferFile messages sent by host 2022-01-24 09:32:40 +01:00
Nathan Sobo
da13d028a3 Send File protos as part of Buffer protos 
Use the File proto to build the File associated with the buffer rather than relying on the local entry.
 2022-01-22 22:19:04 -07:00
Nathan Sobo
66fce5ec8e Introduce LocalFile trait 
If you want to call `abs_path` or `load`, the file needs to be local. You call `as_local` which returns `Option<dyn LocalFile>` with those local-only methods. I think this makes it more explicit what works only locally vs everywhere.
 2022-01-22 15:52:14 -07:00
Nathan Sobo
d192b6ebc7 Remove Worktree::abs_path 
I'd like to only have methods related to absolute paths on local worktrees, because it's not really possible to implement them on remote worktrees since we don't know the full path being shared and wouldn't have anything to do with it anyway if we did.
 2022-01-22 14:44:58 -07:00
Nathan Sobo
e2a2073bdb Remove worktree_path from File struct 2022-01-22 14:29:36 -07:00
Nathan Sobo
83418204b6 Assign diagnostics on buffer even if it doesn't have a language 
This shouldn't be necessary in practice but makes testing easier.
 2022-01-22 09:54:25 -07:00
Max Brunsfeld
bd49a02c92 Move buffers from worktree to project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-21 15:46:27 -08:00
Antonio Scandurra
71082d4cdc Return a Task<Result<()>> in {ItemView,Buffer,MultiBuffer}::save 2022-01-20 09:58:24 +01:00
Max Brunsfeld
f43dcd6763 Move logic for starting language servers to the project 2022-01-19 14:05:06 -08:00
Max Brunsfeld
ea69dcd42a Match on names only when outline query has no spaces 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-14 09:16:29 -08:00
Nathan Sobo
b52db22544 Only enable smart case if the query contains an uppercase character 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-01-14 09:16:09 -07:00
Nathan Sobo
f934370e7f Match full path when query contains spaces 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-01-14 09:02:04 -07:00
Antonio Scandurra
be24e58926 Associate StringMatchCandidate with an id 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-14 14:55:03 +01:00
Antonio Scandurra
a64ba8b687 Allow matching of context items in outline view 2022-01-14 11:09:02 +01:00
Antonio Scandurra
9c1f58ee89 Maintain order of outline items when filling out tree's missing parts 2022-01-14 09:12:30 +01:00
Max Brunsfeld
adeb7e6864 Incorporate syntax highlighting into symbol outline view 
Still need to figure out how to style the fuzzy match characters
now that there's syntax highlighting. Right now, they are
underlined in red.
 2022-01-13 18:10:02 -08:00
Max Brunsfeld
7913a1ea22 Include highlighting runs in Outline 2022-01-13 14:46:15 -08:00
Max Brunsfeld
3e1c559b2d Allow multiple disjoint nodes to be captured as matcheable in the outline query 2022-01-13 14:04:25 -08:00
Antonio Scandurra
055d48cfb2 Select the closest outline item when the outline view's query is empty 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-01-13 18:43:49 +01:00
Antonio Scandurra
2660d37ad8 Return Outline<Anchor> from MultiBuffer::outline 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-01-13 18:24:00 +01:00
Antonio Scandurra
e165f1e16c Use OutlineItem::depth to include ancestors of matching candidates 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-13 16:59:52 +01:00
Antonio Scandurra
06ba1c64cf Implement Outline::search 2022-01-13 15:10:29 +01:00
Antonio Scandurra
d6ed2ba642 Start on rendering the outline view 2022-01-13 12:01:11 +01:00
Antonio Scandurra
ef596c64f8 Add OutlineItem::depth so that we can render a tree in the outline view 2022-01-13 11:35:43 +01:00
Max Brunsfeld
63a401ac5d Add Buffer::outline method 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-12 18:17:49 -08:00
Antonio Scandurra
66694b4c9a Fix failing tests 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-01-12 18:43:23 +01:00
Antonio Scandurra
310def2923 Implement Buffer::format 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-12 18:01:20 +01:00
Nathan Sobo
d7a78e14ac Allow disk-based diagnostic progress begin/end events to interleave 
When multiple saves occur, we can have multiple start events followed by multiple end events. We don't want to update our project diagnostics view until all pending progress is finished.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-01-06 09:32:08 -07:00
Max Brunsfeld
fee7657fd7 Merge branch 'main' into polish-project-diagnostics 2022-01-05 20:38:20 -08:00
Max Brunsfeld
f9f75e98f8 Fix Locator::from_index 
Enhance language::tests::test_random_collaborators so that it checks buffer invariants.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-05 17:58:24 -08:00
Max Brunsfeld
e5faaeb2f2 Fix Global::gt and rename it to changed_since 
A false negative return value of `gt` was preventing guests' multibuffers from
syncing correctly.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-05 17:36:12 -08:00
Max Brunsfeld
8728d3292d Merge branch 'main' into polish-project-diagnostics 
Also fix false failure in ModelHandle::condition when parking is not forbidden.
 2022-01-05 10:53:18 -08:00
Antonio Scandurra
e56609cf0c Ensure prior, deferred selections don't override newer selections 2022-01-05 15:43:26 +01:00
Antonio Scandurra
f8c2620166 Fix Buffer::remote_selections_in_range at query range boundaries 2022-01-05 15:04:50 +01:00
Antonio Scandurra
587a908225 Populate deferred operations when an operation can't be applied 2022-01-05 15:04:19 +01:00
Antonio Scandurra
bf044506ed Verify that selections are replicated correctly in randomized test 2022-01-05 15:04:08 +01:00
Antonio Scandurra
870fa5f278 Serialize deferred operations 2022-01-05 11:52:41 +01:00
Antonio Scandurra
d383ff30ce Introduce randomized test for collaboration on buffers 
This test will exercise serialization of operations as well as peers
replicating from an existing buffer.
 2022-01-05 11:51:41 +01:00
Antonio Scandurra
7bc8eb4f3d Fix compile errors and get serialization unit test passing 2022-01-05 10:29:29 +01:00
Max Brunsfeld
984e366c32 WIP - Serialize buffer in terms of its state, not its base text + ops 
The main reason for this is that we need to include information about
a buffer's UndoMap into its protobuf representation. But it's a bit
complex to correctly incorporate this information into the current
protobuf representation.

If we want to continue reusing `Buffer::apply_remote_edit` for
incorporating the historical operations, we need to either make
that method capable of incorporating already-undone edits, or
serialize the UndoMap into undo *operations*, so that we can apply
these undo operations after the fact when deserializing. But this is
not trivial, because an UndoOperation requires information about
the full offset ranges that were undone.
 2022-01-04 18:06:16 -08:00
Max Brunsfeld
d7ecbdcc1d Add unit test showing problem with serialization of undo ops 2022-01-04 16:01:12 -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
ad1db117e6 Re-enable cargo check for rust-analyzer 2022-01-04 18:26:16 +01:00
Antonio Scandurra
508b9dc024 Rip out "diagnostic providers" 2022-01-04 16:32:17 +01:00
Antonio Scandurra
05a6137549 Capture a new buffer snapshot for excerpts whose selections got updated 2022-01-04 12:22:51 +01:00
Max Brunsfeld
7f8e76e0f1 Remove worktree-specific methods from language::File trait 
Use downcasting instead for accessing worktree-specific state of the Files.

This will allow us to introduce a WorktreeId type and use that everywhere
for identifying worktrees. It also just removes some unnecessary coupling
between the language crate and the worktree.
 2022-01-04 11:28:44 +01:00
Max Brunsfeld
cbd9e186b5 Store selections with a right start bias so that autoindent moves them 
Previously, cursors at column 0 had to be explicitly moved when those lines
were autoindented. This behavior was lost when we moved selections from
the buffer to the editor. Now, with the right bias, we get this behavior automatically.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-27 15:33:57 -08:00
Max Brunsfeld
43db9e826b Clear autoindent requests when applying autoindent 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-27 13:33:48 -08:00
Nathan Sobo
cf81f5a555 Update tests to reflect that we no longer attempt to recycle group ids 2021-12-24 16:36:21 -07: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
393009a05c Implement Buffer::diagnostic_group 2021-12-24 12:08:55 +01:00
Antonio Scandurra
11e3874b4a Remove duplication when assigning diagnostics and hardcode provider names 2021-12-24 12:07:26 +01:00
Max Brunsfeld
4f774e2bde wip 2021-12-23 23:10:28 -08:00
Max Brunsfeld
d5a17053df Get code compiling with some todos 2021-12-23 14:21:10 -08:00
Nathan Sobo
e3ecd87081 WIP 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-23 11:24:35 -07:00
Antonio Scandurra
7b453beebc WIP: Use cargo check for on-disk diagnostics 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-12-23 18:35:50 +01:00
Antonio Scandurra
b9d1ca4341 Show only disk-based diagnostics in ProjectDiagnosticsEditor 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-23 16:47:54 +01:00
Antonio Scandurra
dcf26acaac Use a different invalidation strategy for project-wide diagnostics 2021-12-23 15:41:43 +01:00
Antonio Scandurra
9164c5f239 Emit an UpdateDiagnostics from Worktree when buffer diagnostics change 2021-12-23 09:57:50 +01:00
Max Brunsfeld
5d8ed535be Clear out old disk-based diagnostics after 2 seconds 2021-12-22 15:51:51 -08:00
Max Brunsfeld
b9551ae8b1 Preserve group ids when updating diagnostics 2021-12-22 14:50:51 -08:00
Max Brunsfeld
0faf5308ac Add a unit test for preserving disk-based diagnostics 2021-12-22 13:27:43 -08:00
Max Brunsfeld
1544da887e Start work on preserving continuity of disk-based diagnostics 2021-12-22 12:52:50 -08:00
Max Brunsfeld
3c26f67ea3 Minor cleanup in Buffer::update_diagnostics 2021-12-21 14:07:50 -08:00
Max Brunsfeld
04d577e326 Fix context line handline in project diagnostic view 2021-12-21 11:46:47 -08:00
Max Brunsfeld
528d64d3cc WIP - Improve project diagnostic context rendering 2021-12-16 18:34:29 -08:00
Antonio Scandurra
1bdaeda43e Remove disk diagnostics that were invalidated by a buffer edit 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-12-15 18:29:01 +01:00
Nathan Sobo
6c5b27af1d Group diagnostics by primary 
Render primary message above the excerpt and supporting messages as block decorations with a `Below` disposition. This is still super rough.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-14 18:26:42 -07:00
Antonio Scandurra
08e9f3e1e3 Maintain a different undo/redo stack in MultiBuffer 
This only applies to singleton mode.
 2021-12-14 17:43:41 +01:00
Max Brunsfeld
4efdc53d9f WIP 2021-12-13 17:44:20 -08:00
Max Brunsfeld
52b8e3d1a2 Get tests passing after diagnostic + selection changes 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 11:34:56 -08:00
Max Brunsfeld
418a9a3d66 Get things compiling with diagnostics on worktree 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 11:15:03 -08:00
Antonio Scandurra
85674ba506 WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 16:46:35 +01:00
Antonio Scandurra
c984b39aaa Show remote collaborators' active selections 2021-12-13 11:38:38 +01:00
Nathan Sobo
cdbcbdfe6d Test undo/redo at editor layer, including selection restoration 2021-12-12 15:04:19 -07:00
Nathan Sobo
1e7184ea07 Get selections rendering again when local selections are owned by Editor 2021-12-11 13:42:46 -07:00
Nathan Sobo
4dd0752e80 More messy progress towards selections in editors 2021-12-11 00:29:34 -07:00
Nathan Sobo
8432daef6a WIP: Start on removing selections from buffer in favor of editor 2021-12-10 19:23:34 -07:00
Nathan Sobo
f35c419f43 Return optional transaction ids from undo/redo 
This will allow the editor to restore selections that it associated with the start or end of a transaction.
 2021-12-10 18:08:26 -07:00
Nathan Sobo
77defe6e28 Return optional transaction ids when starting/ending a transaction 
If the transaction was nested, we return None. Otherwise we return the transaction id in preparation for editors to maintain their own selection state.
 2021-12-10 18:00:09 -07:00
Nathan Sobo
c8b43e3078 Move multi_buffer to editor crate 2021-12-10 17:37:53 -07:00
Max Brunsfeld
6caf016df9 Get tests passing w/ multibuffer in editor 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 15:54:25 -08:00
Max Brunsfeld
75dd37d873 Update multibuffer when buffers' syntax trees or diagnostics change 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 15:54:06 -08:00
Max Brunsfeld
ceff57d02f Don't append a trailing newline in singleton MultiBuffer 2021-12-10 14:27:58 -08:00
Max Brunsfeld
a758bd4f8d Fill in some missing methods on MultiBuffer, MultiBufferSnapshot 2021-12-10 14:27:04 -08:00
Antonio Scandurra
5b31c1ba4e Start making MultiBuffer work with a singleton buffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 18:04:11 +01:00
Antonio Scandurra
7524974f19 Get everything compiling again 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 17:15:16 +01:00
Antonio Scandurra
da09247e5e WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 16:14:12 +01:00
Antonio Scandurra
9c74deb9ec Finish removing anchor collections from MultiBuffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 15:58:37 +01:00
Antonio Scandurra
c8d5e19492 Merge branch 'fragment-locators' into project-diagnostics 2021-12-10 14:01:17 +01:00
Antonio Scandurra
cb97b7cd1d Fix diagnostic unit test 2021-12-10 09:43:21 +01:00
Max Brunsfeld
5e516f59c0 Merge branch 'fragment-locators' into HEAD 2021-12-09 14:49:04 -08:00
Antonio Scandurra
91a7bbbba2 Fix some of the diagnostic tests and make DiagnosticEntry generic 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:53:08 +01:00
Antonio Scandurra
65711b2256 Remove anchor collections 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:28:27 +01:00
Nathan Sobo
98f726974e WIP 2021-12-08 20:04:30 -07:00
Nathan Sobo
4ee404a0af Take a cx in MultiBuffer::start_transaction 2021-12-08 19:30:52 -07:00
Nathan Sobo
87d16c271e Get Editor compiling with MultiBuffer as its buffer 
There's a bunch of unimplemented methods in MultiBuffer, but everything compiles.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-08 19:23:04 -07:00
Max Brunsfeld
daedf179b2 Implement Anchor, AnchorRangeMap, SelectionSet in multi_buffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-08 12:56:09 -08:00
Max Brunsfeld
a7634ccd5f Rename ExcerptList to MultiBuffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-08 10:07:15 -08:00
Max Brunsfeld
5f8e406c18 Fill out ExcerptList API 
This restores the improvements that we had made on the `project-diagnostics-generic` branch.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-08 10:04:22 -08:00
Max Brunsfeld
fa379885f1 Give more specific names to all snapshot and text iterator types 2021-12-08 09:24:00 -08:00
Max Brunsfeld
ad33111a22 Fix assertion in excerpt unit test after fixing edits 2021-12-06 17:40:32 -08:00
Max Brunsfeld
39cc0cac93 Fix Subscription re-export after moving it into its own module 2021-12-06 17:40:17 -08:00
Max Brunsfeld
102926d171 Implement and randomized test excerpt list point translation and clipping 2021-12-06 17:39:31 -08:00
Max Brunsfeld
09c0c3a0e7 🎨 excerpt_list::Chunks::next 2021-12-06 16:28:44 -08:00
Max Brunsfeld
416033a01c Get random excerpts test passing w/ text in range, edits 2021-12-06 16:17:31 -08:00
Nathan Sobo
02f42f2877 WIP 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-06 14:51:23 -07:00
Nathan Sobo
88e3d87098 Get randomized test passing on basic excerpt list features 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-06 13:48:07 -07:00
Nathan Sobo
4578938ea1 Implement ExcerptList::subscribe 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-06 13:37:17 -07:00
Nathan Sobo
a02a29944c Get the basic ExcerptList unit test passing again 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-06 13:01:09 -07:00
Nathan Sobo
cff610e1ec Rename FragmentList to ExcerptList 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-06 11:59:32 -07:00