zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
8,490 Commits 706 Branches 767 Tags 284 MiB
7b0a6c0dfa
Commit Graph

8490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld
7b0a6c0dfa Add an 'on_failure' attribute to gpui tests 
This lets us perform a finalization step when a randomized test fails.
 2023-04-03 18:16:08 -07:00
Max Brunsfeld
5ecc9606af Use synchronous locks in FakeFs 
This way, the state can be accessed without running the deterministic
executor.
 2023-04-03 18:15:07 -07:00
Max Brunsfeld
f95732e981 Fix bug where guest would drop BufferSaved messages while opening the buffer 2023-04-03 16:23:44 -07:00
Max Brunsfeld
543301f949 Avoid repeatedly loading/saving the test plan for each iteration 2023-04-03 15:58:11 -07:00
Max Brunsfeld
c960277349 Merge branch 'main' into randomized-tests-operation-script 2023-04-03 13:09:25 -07:00
Petros Amoiridis
69557655ee
Merge pull request #2346 from zed-industries/petros/z-360-dragging-file-from-tree-to-split-results 
Fix dragging file from tree to split results in empty pane
 2023-04-03 16:43:12 +03:00
Petros Amoiridis
5a397726d2
Do not drop the task 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-04-03 16:36:08 +03:00
Nathan Sobo
cdfe873802
Merge pull request #2343 from zed-industries/handles 
Make typed handles wrappers around their untyped equivalents
 2023-04-03 09:20:37 -04:00
Antonio Scandurra
0cb73b6579
Merge pull request #2345 from zed-industries/autocomplete-vs-copilot 
Make autocompletion and copilot mutually exclusive
 2023-04-03 14:37:02 +02:00
Antonio Scandurra
b88aa9af1d Clear active copilot suggestion only if there is one 2023-04-03 14:32:41 +02:00
Antonio Scandurra
ec5309b543 Make autocompletion and copilot mutually exclusive 2023-04-03 14:15:21 +02:00
Antonio Scandurra
b6a9d90609 Move creation of GetCompletionsParams entirely to the background 2023-04-03 13:30:57 +02:00
Antonio Scandurra
0b9e609e2a
Merge pull request #2344 from zed-industries/copilot-collaboration 
Fix Copilot errors when opening buffers that don't exist locally
 2023-04-03 13:26:21 +02:00
Antonio Scandurra
b26d4f4f62 🔥 2023-04-03 13:18:16 +02:00
Antonio Scandurra
75ecf92ae4 Fix Copilot errors when opening buffers that don't exist locally 2023-04-03 12:28:32 +02:00
Nathan Sobo
138aa0492a Add downcast_ref to AnyViewHandle 
I use unsafe code to transmute an AnyViewHandle to a ViewHandle<T> when
the type matches. Because ViewHandle<T> is repr(transparent) to the
wrapped AnyViewHandle, this is safe.
 2023-04-02 16:10:16 -06:00
Nathan Sobo
71cf6ec5ae Use into_any instead of weird 'as' hack 2023-04-02 15:55:30 -06:00
Nathan Sobo
27258a0889 Remove From trait for AnyViewHandle in favor of into_any method 
I think it's more explicit.
 2023-04-02 15:50:42 -06:00
Nathan Sobo
aed8df96ff Wrap AnyWeak handles with their typed counterparts 2023-04-02 15:42:03 -06:00
Nathan Sobo
82a713fd1d Store AnyViewHandle inside ViewHandle and Deref to it 2023-04-02 14:59:55 -06:00
Julia
59fb4b3d29
Merge pull request #2342 from zed-industries/trust-npm-version-management 
Trust NPM instead of managing dirs for different Node server versions
 2023-03-31 17:21:16 -04:00
Julia
8c0db17634 Trust NPM instead of managing dirs for different Node server versions 2023-03-31 17:15:44 -04:00
Mikayla Maki
c19e6f8f0e
Merge pull request #2338 from zed-industries/more-copilot-bugs 
More copilot bugs
 2023-03-31 12:45:19 -07:00
Mikayla Maki
297fd5f985
Merge pull request #2340 from zed-industries/fix-json-lsp-remove 
Fix bug where JSON LSP would be deleted on installation.
 2023-03-31 12:41:28 -07:00
Mikayla Maki
dcaa355ad2 Switch from removing all directories in the container dir to removing the non-version dir 2023-03-31 12:36:23 -07:00
Julia
0ae298a86f
Merge pull request #2339 from zed-industries/revert 
Revert "Merge pull request #2335 from zed-industries/dont-delete-json…
 2023-03-31 15:33:12 -04:00
Julia
0f4f3bfbde Revert "Merge pull request #2335 from zed-industries/dont-delete-json-server-after-downloading-it" 
This reverts commit 516e77906e, reversing
changes made to 54582fd77f.
 2023-03-31 15:31:50 -04:00
Mikayla Maki
57b5c1ee20 Fix crash on initiating copilot during collaboration. Copilot is now disabled when collaborating. 2023-03-31 12:28:58 -07:00
Mikayla Maki
f616e8bac9
Merge pull request #2336 from zed-industries/respect-languages-alias-in-settings-file 
Add support for writing to the langauge_overrides alias in settings
 2023-03-31 11:51:25 -07:00
Mikayla Maki
b6882f0cbf Fix typo in copilot button 2023-03-31 11:50:31 -07:00
Mikayla Maki
e5a6b11d8f
Merge pull request #2334 from zed-industries/quiet-copilot-loggin 
Add handlers for LogMessage and statusNotification to copilot LSP
 2023-03-31 11:22:23 -07:00
Mikayla Maki
c1445fe015 Add support for the langauge_overrides alias in the settings file updating code 2023-03-31 11:20:46 -07:00
Mikayla Maki
bdce96b19a
Update copilot.rs 2023-03-31 11:16:52 -07:00
Julia
516e77906e
Merge pull request #2335 from zed-industries/dont-delete-json-server-after-downloading-it 
Don't delete JSON language server directly after downloading it
 2023-03-31 14:08:09 -04:00
Julia
0199ffed5f Don't delete JSON language server directly after downloading it 
This was accidentally added during the messy NodeRuntime/Copilot rebase

Co-Authored-By: Joseph Lyons <joseph@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-03-31 14:01:04 -04:00
Mikayla Maki
f561e5ef2c remove spare debug 2023-03-31 11:00:06 -07:00
Mikayla Maki
4865ea2efc Add handlers for LogMessage and statusNotification to copilot LSP 2023-03-31 10:58:18 -07:00
Antonio Scandurra
54582fd77f
Merge pull request #2333 from zed-industries/copilot-improvements 
Fix several Copilot bugs
 2023-03-31 18:14:39 +02:00
Antonio Scandurra
b208d1a489 🎨 2023-03-31 18:10:10 +02:00
Antonio Scandurra
5f579a4287 Fix prefix/suffix calculation when determining copilot suggestion 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-03-31 18:05:07 +02:00
Antonio Scandurra
b588ba1435 Avoid auto-indenting when accepting copilot suggestion 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-03-31 17:17:35 +02:00
Antonio Scandurra
6e43e77c3f Use copilot's Completion::{range,text} to determine suggestion 
Previously, we were using display text, but this isn't always correct. Now,
we just attempt to determine what text Copilot wants to insert by finding
a prefix and suffix in the existing text with the suggested text.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-03-31 17:08:41 +02:00
Mikayla Maki
9b16277cf8
Merge pull request #2316 from zed-industries/copilot 
🚨 WIP 🚨 Copilot
 2023-03-30 18:27:14 -07:00
Mikayla Maki
713f5f604f Fix leaked handle and failure to update language in context menu 2023-03-30 17:40:11 -07:00
Mikayla Maki
e38f52d595 Fix unrelated panics in tests 2023-03-30 17:19:29 -07:00
Mikayla Maki
c3188be4c1 cargofmt 2023-03-30 16:58:11 -07:00
Mikayla Maki
81411b9114 Merge branch 'main' into copilot 2023-03-30 16:57:18 -07:00
Mikayla Maki
c28d2c490b Remove test modals 2023-03-30 16:52:55 -07:00
Mikayla Maki
afc9b832c8 Finish device code flow for copilot 2023-03-30 16:50:33 -07:00
Mikayla Maki
f5d4bcd934 Added erorr states and first-pass error handling to the copilot status bar item. 
Added correct icons
Added a new 'Toast' action which allows other crates to easily pop toasts with an optional click action
 2023-03-30 14:10:57 -07:00