yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,144 Commits 5 Branches 0 Tags
90e9db99ab658e46dfbc2c692e1c5ea5d4af0653
Commit Graph
11144 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo 1def4c0326 Add support for joining lines (#2636) 
🚧 We have a couple more refinements to this to add 🚧 

Release Notes:

You can now join lines with `ctrl-j` or `shift-J` in Vim normal mode.

🍐'd with @ConradIrwin
 2023-06-22 06:38:57 -06:00
Piotr Osiewicz f41f648b26 Remove unused variable 2023-06-22 13:57:41 +02:00
Piotr Osiewicz 263e72b9a6 Remove unused import 2023-06-22 13:52:21 +02:00
Piotr Osiewicz 8bc6fdffb7 cargo fmt 2023-06-22 13:49:36 +02:00
Piotr Osiewicz fa148af2bc Merge branch 'main' into collab-titlebar-2 2023-06-22 13:48:16 +02:00
Julia 18096e493f Route language server requests through wrapper object 2023-06-21 23:05:37 -04:00
Nathan Sobo ac28aefdb1 Add Zoom button to assistant panel 2023-06-21 19:50:22 -06:00
Nathan Sobo cb72b81c35 Move model and remaining tokens to assistant toolbar 2023-06-21 19:01:30 -06:00
Conrad Irwin 6e93f7407e vim: Support s on selections and with multiple cursors 2023-06-21 15:44:19 -06:00
Conrad Irwin 0d7c2a88ce vim: Add basic 's' support 2023-06-21 15:06:34 -06:00
Conrad Irwin ef79513fc6 vim: ctrl+] and ctrl+o to jump to definition and back 
Equivalent to f12 and ctrl-- in non-vim mode.
 2023-06-21 14:34:35 -06:00
Conrad Irwin 2d9366839f vim: Allow up/down/left/right in vim mode 
The user impact of this is to 5<down> to move 5 lines at a time.
 2023-06-21 14:20:39 -06:00
Conrad Irwin a46b2dc208 join_lines: Skip over leading indentation 2023-06-21 13:44:31 -06:00
Nate Butler 165f7d5e0a Split Interactive into Interactive and Toggleable (#2628) 
This is a part of the intensity driven theme rewrite. 

It introduces the `toggle` and `interactive` helper functions to build
Toggle<T> and Interactive<T> styles for interactive elements in the
theme.

This PR also removes the `theme_testbench` crate and related actions.

Huge thanks to @osiewicz and @mikayla-maki for pushing this forward 🙏🏽

Release Notes:

- Updated the style of many interactive elements.
 2023-06-21 15:03:08 -04:00
KCaverly aa6f51c03d WIP: started work on vector store db, by walking project worktrees.\n\nCo-Authored-By: Max <max@zed.dev> 2023-06-21 14:53:08 -04:00
Kirill Bulatov fda5b1a498 Run LSP response deserialization outside of main thread (#2635) 
Improves latency for big inlay hints LSP responses for ~8k line files.

Before, the CPU usage sample for editing a single line inside
`edirot.rs` file in Zed contained serde inside the main thread traces:

<img width="1728" alt="Screenshot 2023-06-21 at 00 33 23"
src="https://github.com/zed-industries/zed/assets/2690773/d9789efe-8055-487f-bbe7-8beb49605bcb">

Release Notes:

- N/A
 2023-06-21 21:03:18 +03:00
Julia 63de597246 The log-ification 2023-06-21 14:02:21 -04:00
Joseph T. Lyons dbe124ddb6 v0.93.x dev 2023-06-21 13:59:07 -04:00
Nate Butler ffa8f60ab9 Format 2023-06-21 13:58:54 -04:00
Nate Butler 2ebe509147 Update settings.json 2023-06-21 13:58:42 -04:00
Nathan SoboandConrad Irwin 0ea52d851d Add shift-J binding to Vim normal mode 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 11:58:31 -06:00
Nate Butler 9d47acf5fb Update toggle active styles 2023-06-21 13:56:27 -04:00
Nathan SoboandConrad Irwin 4bea8aa424 Don't use test-only method; add ctrl-j binding 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 11:53:11 -06:00
Nathan SoboandConrad Irwin 9bf7db748b Handle multiple selections when joining lines 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 11:47:06 -06:00
Nathan SoboandConrad Irwin 9214a55498 Add more assertions for joining lines at the end of the file 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 11:21:09 -06:00
Nathan SoboandConrad Irwin 5a81efa38c Allow joining multiple lines and deleting empty lines 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 11:18:28 -06:00
Nate Butler 3dfaa7b8b4 Fix status bar buttons 2023-06-21 13:14:39 -04:00
Piotr Osiewicz 47a44dcce7 Remove theme_testbench 2023-06-21 19:11:55 +02:00
Piotr Osiewicz 40b084d619 Tidy up xtask 2023-06-21 19:06:34 +02:00
Piotr Osiewicz aa9f99dbfc xtask: publish = false 2023-06-21 18:51:06 +02:00
Piotr Osiewicz 5e91866c51 Use xtask for theme generation 2023-06-21 18:48:09 +02:00
Nate Butler a2000be008 Update rose pine theme family (#2624) 
Update the Rose Pine theme family, including new syntax overrides
matching the official theme docs:
https://rosepinetheme.com/palette/ingredients/

Also adds a doc to our internal docs starting to outline how our syntax
highlighting works.

Before:
<img width="626" alt="CleanShot 2023-06-21 at 12 19 17@2x"
src="https://github.com/zed-industries/zed/assets/1714999/5ebe1cd0-1707-483b-a50f-bb53dbf89ba2">

After:
<img width="718" alt="CleanShot 2023-06-21 at 12 18 48@2x"
src="https://github.com/zed-industries/zed/assets/1714999/46b588aa-31a0-4402-934b-e3de7bc2f6b5">

From their site:

![image](https://github.com/zed-industries/zed/assets/1714999/83d4f671-e15f-4423-a01e-b382145e79fb)


Release Notes:

- Updated Rose Pine theme family to better match original theme.
 2023-06-21 12:46:18 -04:00
Nathan SoboandConrad Irwin f9399f3dfa Start on joining lines 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 10:32:02 -06:00
Nate Butler 1741fad377 Update syntax colors 2023-06-21 12:21:01 -04:00
Nate Butler ecc4689a60 Remove unused light variable 2023-06-21 12:20:47 -04:00
Nate Butler 0445ee98ff Add initial syntax highlighting doc 2023-06-21 12:15:24 -04:00
Mikayla Makiandantonio 51e40881e8 Fix segfault with remote track publications 
co-authored-by: antonio <antonio@zed.dev>
 2023-06-21 09:05:36 -07:00
Nathan Sobo f2a1afbacb Add title to assistant panel and move + to right 2023-06-21 09:54:49 -06:00
Mikayla Makiandantonio a70262dfe1 Fix race condition in sharing mic on connection 
co-authored-by: antonio <antonio@zed.dev>
 2023-06-21 08:50:38 -07:00
Sergey Onufrienko 646e3d0b0a feat: move gen to styles and add scripts 2023-06-21 16:13:41 +02:00
Sergey Onufrienko 44a78ebd48 fix: create schemas folder 2023-06-21 16:13:04 +02:00
Sergey Onufrienko fe30c945da chore: move schema gen to theme 2023-06-21 16:12:27 +02:00
Sergey Onufrienko b664b6c754 chore: ignore generated files 2023-06-21 16:12:01 +02:00
Antonio Scandurra 3790817f53 Allow loading a previously-saved conversation 2023-06-21 16:06:09 +02:00
Kirill BulatovandAntonio Scandurra 439353cc29 Run LSP response deserialization outside of main thread 
Improves latency when big inlay hints LSP responses for ~8k line files

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-06-21 13:20:42 +03:00
Antonio Scandurra 257902778d WIP 2023-06-21 11:44:32 +02:00
Antonio Scandurra 12da134a1d Finish renaming AssistantEditor to ConversationEditor 2023-06-21 09:00:26 +02:00
Nathan Sobo e971ef3e32 Fix filename 2023-06-20 20:21:43 -06:00
Nathan Sobo 4df4846b73 WIP: Trying to display the toolbar but tired. May be worth discarding this. 2023-06-20 20:11:37 -06:00
Nathan SoboandJulia Risley b310fcc367 Remove the nested Pane from the assistant 
Since we don't want tabs, I think it would be better to render the toolbar
for ourselves directly and handle switching between conversations.

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-06-20 18:52:48 -06:00