Commit Graph
39175 Commits
Author SHA1 Message Date
Antonio Scandurra 19cac9e679 Add basic styling 2023-08-23 13:09:02 +02:00
Antonio Scandurra 5429903eee Highlight text when the diff is the same 2023-08-23 10:28:43 +02:00
Joseph T. Lyons 8026edceb7 Shorten setting name 2023-08-23 04:07:10 -04:00
Joseph T. Lyons dfa179521c WIP 2023-08-23 04:04:36 -04:00
Antonio Scandurra 900b114bbc Delete unused imports 2023-08-23 09:59:07 +02:00
Antonio Scandurra 46cbbbd6ed Support multi-byte characters in diff 2023-08-23 09:46:33 +02:00
Antonio Scandurra fc93c33b75 Add randomized tests for incremental diff 2023-08-23 09:09:01 +02:00
Joseph T. Lyons 260a97a1a7 Update textmate.json 2023-08-23 01:31:01 -04:00
Julia 045faea6e7 Add Tailwind server to JS/TS 2023-08-23 00:11:15 -04:00
Julia 2936f98ff5 Add VSCode CSS language server & add Tailwind to .css files 2023-08-22 23:50:40 -04:00
Julia 228326d9ec Only generate workspace/configuration for relevant adapter 2023-08-22 23:36:04 -04:00
Nathan Sobo 298aeb0f11 Mark new crates as publish = false 2023-08-22 20:47:05 -06:00
Conrad Irwin ae7b6c9a5b vim: Rewrite paste (#2878)
A complete overhaul of the way vim did paste. This ended up being more
involved than I expected because of the variety of different behaviors
that vim exhibits when copying/pasting between various modes.

Release Notes:

- vim: support P for paste before
([#1869](https://github.com/zed-industries/community/issues/1869)).
- vim: support P in visual modes for paste without overriding clipboard
- vim: fix position when using `p` on text copied outside zed
([#469](https://github.com/zed-industries/community/issues/469)).
- vim: fix indentation when using `p` on text copied from zed
([#1015](https://github.com/zed-industries/community/issues/1015)).
- all: Separate copied multi-selections by `\n`
2023-08-22 20:21:58 -06:00
Nathan Sobo ec9bebc7f4 Merge branch 'main' into divs 2023-08-22 16:35:56 -06:00
Conrad Irwin 6df5f15880 Ensure editor clipboard contains \n too 2023-08-22 13:52:04 -06:00
Conrad Irwin ec55ac38f6 vim: Dismiss menu in insert mode with escape (#2879)
Release Notes:

- vim: Fix escape to dismiss suggestions in insert mode.
2023-08-22 13:38:12 -06:00
Joseph T. LyonsandJulia da4fd139ca WIP
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-08-22 15:29:25 -04:00
Conrad Irwin fa6cb5033b vim: Dismiss menu in insert mode with escape 2023-08-22 13:28:50 -06:00
Conrad Irwin 21b6d69d61 Rewrite paste
- vim: support P for paste before
- vim: support P in visual mode for paste without overriding clipboard
- vim: fix position when using `p` on text copied outside zed
- vim: fix indentation when using `p` on text copied from zed
2023-08-22 13:27:57 -06:00
Conrad Irwin 3a2fdcf51c Vim z 2819 (#2875)
Add `$` and `#` and a smoke test for vim-mode respecting the
configuration.
2023-08-22 11:38:06 -06:00
Nathan SoboandAntonio Scandurra 93b10e6626 Checkpoint
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-08-22 11:34:06 -06:00
Antonio Scandurra 6f68df8260 🎨 2023-08-22 18:41:22 +02:00
Piotr Osiewicz 3800a42500 chore: fmt 2023-08-22 18:14:07 +02:00
Piotr OsiewiczandConrad Irwin 3231bf5e96 Query char_kind for completion triggers.
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
2023-08-22 18:12:05 +02:00
Joseph T. Lyons e8a7311c11 Add default bindings for new file and directory (#2877)
Release Notes:

- Added default key bindings for `NewFile` and `NewDirectory` in the
project panel (bound to `cmd-n` and `alt-cmd-n`, respectively).
2023-08-22 11:48:02 -04:00
Joseph T. Lyons 07a815a3bc Add default bindings for new file and directory 2023-08-22 11:33:40 -04:00
Nathan Sobo 8ddfc32685 Add more style helpers 2023-08-22 09:16:05 -06:00
Nathan Sobo ac8408ac9b Checkpoint 2023-08-22 09:07:45 -06:00
KCaverly 3a5fa9d688 reorganized to stop the race 2023-08-22 15:01:21 +02:00
KCaverly 266de7c0f2 working on initialization + index breakup 2023-08-22 14:45:27 +02:00
Antonio Scandurra 320cb0c7f9 Integrate the new diff algorithm into the modal assistant 2023-08-22 13:59:45 +02:00
Antonio Scandurra 61227c592a Start on a custom diff implementation 2023-08-22 12:07:41 +02:00
KCaverly a61ec2ec89 reworked ProjectState to include additional context 2023-08-22 11:58:48 +02:00
Kirill Bulatov a87b39b1cf Reenable html, remove emmet due to the lack of the code 2023-08-22 12:51:14 +03:00
Kirill Bulatov efca47ae15 Expand word characters for html and css 2023-08-22 12:41:59 +03:00
Piotr OsiewiczandJulia Risley 97573a1995 Z 2819 (#2872)
This PR adds new config option to language config called
`word_boundaries` that controls which characters should be recognised as
word boundary for a given language. This will improve our UX for
languages such as PHP and Tailwind.

Release Notes:

- Improved completions for PHP
[#1820](https://github.com/zed-industries/community/issues/1820)

---------

Co-authored-by: Julia Risley <julia@zed.dev>
2023-08-22 12:23:30 +03:00
Piotr OsiewiczandJulia Risley 9a197a63f8 Z 2819 (#2872)
This PR adds new config option to language config called
`word_boundaries` that controls which characters should be recognised as
word boundary for a given language. This will improve our UX for
languages such as PHP and Tailwind.

Release Notes:

- Improved completions for PHP
[#1820](https://github.com/zed-industries/community/issues/1820)

---------

Co-authored-by: Julia Risley <julia@zed.dev>
2023-08-22 10:35:20 +02:00
Joseph T. LyonsandMikayla 12462785e9 Add a default_open_ai_model setting for the assistant (#2876)
[This PR has been sitting around for a
bit](https://github.com/zed-industries/zed/pull/2845). I received a bit
of mixed opinions from the team on how this setting should work, if it
should use the full model names or some simpler form of it, etc. I went
ahead and made the decision to do the following:

- Use the full model names in settings - ex: `gpt-4-0613`
- Default to `gpt-4-0613` when no setting is present
- Save the full model names in the conversation history files (this is
how it was prior) - ex: `gpt-4-0613`
- Display the shortened model names in the assistant - ex: `gpt-4`
- Not worry about adding an option to add custom models (can add in a
follow-up PR)
- Not query what models are available to the user via their api key (can
add in a follow-up PR)

Release Notes:

- Added a `default_open_ai_model` setting for the assistant (defaults to
`gpt-4-0613`).

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
2023-08-22 02:55:27 -04:00
Antonio Scandurra db6002f80e WIP 2023-08-22 08:16:22 +02:00
Conrad Irwin 3b7b5bc3f7 Add test for word characters in vim 2023-08-21 22:37:14 -06:00
Conrad Irwin b59df7df6d Add # and $ for js 2023-08-21 22:36:58 -06:00
Piotr Osiewicz c2df72d499 Remove comment;for real now 2023-08-22 01:04:55 +02:00
Piotr Osiewicz 5eda997e42 Revert "Remove dead comment"
This reverts commit ba0b744132.
2023-08-22 01:04:15 +02:00
Piotr Osiewicz 1228f3ddb3 Rename word_boundaries to word_characters 2023-08-22 01:02:25 +02:00
Piotr Osiewicz ba0b744132 Remove dead comment 2023-08-22 01:01:27 +02:00
Nathan Sobo fe69caadb4 Checkpoint 2023-08-21 16:14:59 -06:00
Joseph T. Lyons 52d13092c7 Add channel id to call events (#2873)
Release Notes:

- N/A
2023-08-21 14:11:35 -04:00
Joseph T. LyonsandMax Brunsfeld b6fc142f3e Add channel id to call events
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-08-21 13:50:04 -04:00
Piotr Osiewicz 9cbc680636 Merge branch 'main' into Z-2819 2023-08-21 17:41:27 +02:00
Piotr Osiewicz f134b20104 ..and use it in PHP language config 2023-08-21 17:41:05 +02:00