yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,720 Commits 5 Branches 0 Tags
f7bda1eab47e45f59e8c5b0e2e66d84ede1bd149
Commit Graph
3720 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Brunsfeld f7bda1eab4 Add back key binding for confirming completions with tab 2022-04-13 10:35:05 -07:00
Max Brunsfeld 6b0265da0d 0.26.0 2022-04-13 09:34:42 -07:00
Nate Butler 054ba080b7 Merge pull request #804 from zed-industries/update-theme-feature-colors 
Update theme feature colors
 2022-04-12 13:36:52 -04:00
Nate Butlerandgibusu b93e8f3bfc Update theme feature colors 
- border focus color
- Text feature color
- Match & active match highlight color

Matches should be more legible now in both themes. `activeMatch` is still not hooked up on the rust side, so it won't take any effect yet.

Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
 2022-04-12 12:44:38 -04:00
Nate Butlerandgibusu 0515ec3e59 Fix incorrect path in theme build script 
`buildThemes.ts` had an incorrect path for generating the theme json files.

It probably happened when we did some reorganization of the styles directory.

Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
 2022-04-12 12:37:38 -04:00
Antonio Scandurra ca91b74915 Merge pull request #802 from zed-industries/update-contacts-on-share 
Update contacts list when a project is shared
 2022-04-12 11:48:34 +02:00
Antonio Scandurra 783d23ec32 Update contacts list when a project is shared 2022-04-12 11:41:20 +02:00
Antonio Scandurra 5f5d226dd4 Merge pull request #801 from zed-industries/randomized-test-improvements 
Introduce guest disconnection in randomized collaboration test
 2022-04-12 11:25:07 +02:00
Antonio Scandurra 0c384891ff Fix warning 2022-04-12 10:52:16 +02:00
Antonio Scandurra 4813e5f4a9 Adjust distribution in randomized test 2022-04-12 10:15:38 +02:00
Antonio Scandurra 6655df7caf Merge branch 'main' into randomized-test-improvements 2022-04-12 10:14:08 +02:00
Antonio Scandurra cd84ec36cf Make Server::update_contacts_for_users always synchronous 2022-04-12 09:44:23 +02:00
Antonio Scandurra 1cd3defb9b Limit incoming size to 1 in tests to more easily simulate backpressure 2022-04-12 09:43:36 +02:00
Max Brunsfeld 0d18c26a94 Merge pull request #800 from zed-industries/tolerate-lsp-workspace-symbols-failure 
Avoid bailing out of Project::symbols when one LSP request fails
 2022-04-11 21:14:51 -07:00
Max Brunsfeld ce20350803 Avoid bailing out of Project::symbols when one LSP request fails 2022-04-11 21:09:01 -07:00
Max Brunsfeld a8b3b136ec Merge pull request #799 from zed-industries/debug-project-diagnostics-as-json 
Allow dumping the project diagnostic view's state as JSON
 2022-04-11 20:40:50 -07:00
Nathan Sobo 5af3a0905b Merge pull request #785 from zed-industries/collab-renames 
Rename zed-server to collab
 2022-04-11 20:56:37 -06:00
Max BrunsfeldandNathan Sobo 476165f242 Allow dumping the project diagnostic view's state as JSON 
Also, improve DebugElements action so that it shows the JSON in an editor.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-04-11 19:51:46 -07:00
Nathan Sobo bdd03c22ca Merge branch 'main' into collab-renames 2022-04-11 19:07:07 -06:00
Max Brunsfeld a3c414bfc4 Merge pull request #795 from zed-industries/cancel-buffer-search 
Handle editor cancel in pane in order to dismiss find toolbar
 2022-04-11 17:47:44 -07:00
Max Brunsfeld d971d8f6e1 Merge pull request #762 from zed-industries/safer-atlas-allocation 
Safer Atlas Allocation
 2022-04-11 17:42:53 -07:00
Max Brunsfeld 786a87bcfa Merge pull request #797 from zed-industries/project-search-focus 
Focus Project Search query editor always when deployed
 2022-04-11 17:41:08 -07:00
Max Brunsfeld 2d723723b8 Merge branch 'main' into cancel-buffer-search 2022-04-11 17:38:26 -07:00
Max Brunsfeld c5d0efbcc8 Merge pull request #792 from zed-industries/fix-tsx-default-indent 
Set default tsx tabsize
 2022-04-11 17:35:54 -07:00
Keith Simmons 6d5d6797cd Set tsx default indent to 2 and remove js from extension list in tsx config.toml 2022-04-11 17:34:44 -07:00
Nathan Sobo 3bab61bacc Update certificate 2022-04-11 18:33:55 -06:00
Max Brunsfeld 07ff10a699 Merge pull request #786 from zed-industries/load-keymaps 
Allow key bindings to be customized via a JSON file
 2022-04-11 17:31:22 -07:00
Max Brunsfeld e0cc479823 Merge pull request #791 from zed-industries/project-search-focus-fix 
Properly activate project search item on mouse click
 2022-04-11 17:31:06 -07:00
Nathan Sobo 9548044eb6 Update paths to renamed collab crate 2022-04-11 18:18:12 -06:00
Max BrunsfeldandKeith Simmons 4111c83b90 Use '*' to represent the default context in keymap files 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 17:17:03 -07:00
Nathan Sobo 51dc07de73 Update Kubernetes manifest to refer to "collab" instead of "zed" 2022-04-11 18:15:41 -06:00
Keith Simmons 60c68ac592 Don't focus active editor when deploying project search and focus query editor on project search focus 2022-04-11 17:05:24 -07:00
Max BrunsfeldandKeith Simmons 6693b3ed13 Use the word 'keymap' more consistently 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 17:02:16 -07:00
Max BrunsfeldandKeith Simmons 3787b3b5be Watch ~/.zed/bindings.json file for custom key bindings 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 16:50:44 -07:00
Max Brunsfeld a4e5dafea4 Merge branch 'main' into load-keymaps 2022-04-11 15:55:10 -07:00
Max BrunsfeldandKeith Simmons f75211df7d Move assets to their own crate, load keymaps in vim tests 
Also, move assets folder to the top-level.

Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 15:54:52 -07:00
Max BrunsfeldandKeith Simmons <keith@zed.dev 4353d8f0f7 Move keymap_file module into settings crate 
Co-authored-by: Keith Simmons <keith@zed.dev
 2022-04-11 15:22:18 -07:00
Keith Simmons 9931a12de1 Handle editor cancel in pane in order to dismiss find toolbar 2022-04-11 15:11:23 -07:00
Keith Simmons 622b87cd55 Add logging when atlas allocator fails to allocate 2022-04-11 10:31:38 -07:00
Antonio ScandurraandNathan Sobo 73755f0f24 Hold the state lock while responding to guest joining a project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-11 19:30:52 +02:00
Keith Simmons 885f4b8e0e Make atlas allocation fallable and skip rendering icons and paths when it fails 2022-04-11 10:15:49 -07:00
Keith Simmons 74068b292a Reraise editor events in Project Search and activate workspace item from them 2022-04-11 10:13:07 -07:00
Antonio Scandurra 7a9338847b Replace synchronous Store lock with an async lock 
This also fixes some failures due to `broadcast` and `update_contacts_for_users`
being fallible. As part of this commit, these two functions don't return `Result`
anymore: the reason for this change is that we don't want a request to fail only
because a peer disconnected while we were trying to broadcast a message to them.
 2022-04-11 17:56:30 +02:00
Antonio Scandurra 845646952d Acquire guest connection ids after save request has been forwarded 
This fixes a bug that would cause the server to broadcast the save
message to guests that have potentially left the project.
 2022-04-11 16:27:14 +02:00
Antonio Scandurra 0b47b46d69 Simulate random guest disconnection and reconnection 2022-04-11 16:27:11 +02:00
Antonio ScandurraandNathan Sobo 2f87a68164 Distribute operation workload evenly across peers in randomized test 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-11 14:43:30 +02:00
Antonio Scandurra fd6338dda2 Simulate parallelism among peers correctly in randomized collab test 
Previously they were all using the same foreground executor, which was
not properly simulating concurrency among tasks from different peers.
 2022-04-11 13:42:30 +02:00
Antonio Scandurra 5f3d58180f Allow taking an Arc<Deterministic> in [gpui::test]-decorated tests 2022-04-11 13:42:30 +02:00
Antonio Scandurra f951667422 Merge pull request #787 from zed-industries/buffer-divergence 
Fix divergence bug when peer reconnects reusing a prior replica id
 2022-04-11 13:34:30 +02:00
Antonio Scandurra a51b05d3ff Fix divergence bug when peer reconnects reusing a prior replica id 
We forgot to observe the footprint of the reconnecting replica's prior
undos into the local clock. This could cause the replica to generate
edits with a version strictly smaller than what other peers may have
observed. As such, those peers would think they had already seen those
edits and skip them.
 2022-04-11 13:17:47 +02:00