Commit Graph
25009 Commits
Author SHA1 Message Date
Marshall Bowers 94861f0260 storybook: Fix kitchen sink story (#3064)
This PR fixes the kitchen sink story in the storybook.

Included are some additional changes that make it so the kitchen sink is
automatically populated by all of the defined stories.

Release Notes:

- N/A
2023-09-28 21:22:50 -04:00
Max Brunsfeld 9d5b14d9cb Remove stray file 2023-09-28 17:14:53 -07:00
Max Brunsfeld 7f4cce9a99 🎨 Workspace::leader_updated 2023-09-28 17:13:10 -07:00
Max Brunsfeld 4d98184acc Remove unused db query method 2023-09-28 17:13:10 -07:00
Max Brunsfeld 893166c0fc Remove unused dependencies on theme 2023-09-28 17:13:10 -07:00
Max Brunsfeld c712acdfb2 Fix removal of followers on Unfollow 2023-09-28 16:46:43 -07:00
d54c6c2066 Mainline GPUI2 UI work (#3062)
This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Nate <nate@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-09-28 19:36:21 -04:00
Conrad Irwin d0e5c86d31 vim: Fix some dw edge cases (#3058)
Release Notes:

- vim: Fix `dw` on the last word of a line, and on empty lines.
2023-09-28 15:32:29 -06:00
Conrad Irwin 93b2d38756 vim keybinding updates (#3057)
Release Notes:

- vim: Add ctrl-i to go forward
([#1732](https://github.com/zed-industries/community/issues/1732)).
ctrl-o was already supported.
- vim: Add `g <space>` to open the current snippet in its own file.
- vim: Escape will now return to normal mode even if completion menus
are open (use `ctrl-x ctrl-z` to hide menus, as in vim).
- vim: Add key bindings for Zed's various completion mechanisms:
- - `ctrl-x ctrl-o` to open the completion menu,
- -  `ctrl-x ctrl-l` to open the LSP action menu,
- - `ctrl-x ctrl-c` to trigger Copilot (requires configuring copilot),
- - `ctrl-x ctrl-a` to trigger the inline Assistant (requires
configuring openAI),

NOTE: we should add these to the docs before shipping 0.107 to stable.
2023-09-28 15:32:21 -06:00
Conrad Irwin 43eda76653 vim increment (#3054)
- vim: add ctrl-a/ctrl-x for increment/decrement
2023-09-28 15:32:11 -06:00
Joseph T. Lyons 7642ced3cf Enable semantic_index by default (#3061)
Release Notes:

- Enabled the `semantic_index` setting by default.
2023-09-28 17:24:00 -04:00
Max Brunsfeld 26b0382f31 Undo making project optional on stored follower states
Following works without a project, but following in unshared projects does
not need to be replicated to other participants.
2023-09-28 14:21:44 -07:00
Joseph T. Lyons 3190bfa2e5 Enable semantic_index by default 2023-09-28 17:17:26 -04:00
Max BrunsfeldandConrad cd72b7c288 Fix errors from assuming all room_participant rows had a non-null participant_index
Rows representing pending participants have a null participant_index.

Co-authored-by: Conrad <conrad@zed.dev>
2023-09-28 12:03:53 -07:00
Max Brunsfeld 0729b740c9 Merge branch 'main' into allow-following-outside-of-projects 2023-09-28 11:58:28 -07:00
Max BrunsfeldandConrad 8b2a8959d3 Fix coloring of local selections when following
Co-authored-by: Conrad <conrad@zed.dev>
2023-09-28 11:37:47 -07:00
Max BrunsfeldandConrad 13f4957210 Rename color_index to participant_index
Co-authored-by: Conrad <conrad@zed.dev>
2023-09-28 11:37:22 -07:00
0976bdc78d Assign unique color indices to room participants, use those instead of replica_ids
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Antonio <antonio@zed.dev>
2023-09-28 11:06:09 -07:00
Joseph T. Lyons 50d9dc65aa Fix text transformation commands for multiple line, single selection cases (#3060)
If you highlight the following block of text (with a single selection):

```
The quick brown
fox jumps over
the lazy dog
```

and run `editor: convert to upper camel case`, you'll get:

```
TheQuickBrown
foxJumpsOver
theLazyDog
```

instead of:

```
TheQuickBrown
FoxJumpsOver
TheLazyDog
```

The same thing happens for `editor: convert to title case`. This happens
because [`to_case` crate](https://crates.io/crates/convert_case) doesn't
allow the user to define '\n' as a boundary. I wanted to fix this at the
lib level, so I filled [an
issue](https://github.com/rutrum/convert-case/issues/16) but I never
heard back. What's strange is VS Code and Sublime I think both exhibit
the same output as we do currently, but I don't personally think this
feels right (happy to hear opposing opinions). I'm just doing the naive
thing to hack around this limitation of the `to_case` crate.

I did some testing and it seems I only need to adjust `editor: convert
to title case` and `editor: convert to upper camel case`. The way the
other transformations are implemented in `to_case` don't seem to have
this issue.

Release Notes:

- Fixed a bug where running certain text transfomration commands on a
single selection covering multiple lines would not transform all
selected lines as expected.
2023-09-28 14:04:17 -04:00
Nathan Sobo 2ea05f16e9 Checkpoint 2023-09-28 12:02:52 -06:00
Kirill Bulatov 05111cb947 Improve file finder ergonomics (#3059)
Deals with https://github.com/zed-industries/community/issues/2086
Part of https://github.com/zed-industries/community/issues/351

Initial:
<img width="585" alt="Screenshot 2023-09-28 at 09 50 05"
src="https://github.com/zed-industries/zed/assets/2690773/e0149312-dfe3-4b7c-948c-0f593d6f540c">
First query letter input (only two history items match that, both are
preserved on top, with their order preserved also)
<img width="603" alt="Screenshot 2023-09-28 at 09 50 08"
src="https://github.com/zed-industries/zed/assets/2690773/85ab2f4c-bb9c-4811-b8b0-b5c14a370ae2">
Second query letter input, no matching history items:
<img width="614" alt="Screenshot 2023-09-28 at 09 50 11"
src="https://github.com/zed-industries/zed/assets/2690773/6d380403-a43c-4f00-a05b-88f43f91fefb">
Remove second query letter, history items match again and pop to the
top:
<img width="574" alt="Screenshot 2023-09-28 at 09 50 15"
src="https://github.com/zed-industries/zed/assets/2690773/5981ca53-6bc8-4305-ae36-27144080e1a2">


* allows `file_finder::Toggle` (cmd-p by default) to cycle through file
finder items (ESC closes the modal still)
* on query typing, preserve history items that match the query and keep
them on top, with their ordering preserved
* show history items' matched letters

Release Notes:

- Improve file finder ergonomics: allow cycle through items with the
toggle action, preserve matching history items on query input
2023-09-28 19:53:09 +03:00
Kirill Bulatov c99a9ddad6 Show path matches inside history items matching the query 2023-09-28 09:49:25 -07:00
Kirill Bulatov cb228f12c0 Show matching search history whenever possible 2023-09-28 09:34:20 -07:00
Kirill Bulatov a79c17a1f2 Add tests 2023-09-28 09:00:25 -07:00
Kirill Bulatov d5d3830152 Preserve matching history items and their order 2023-09-28 06:55:49 -07:00
Kirill Bulatov 005f33736d Cycle file finder entries on cmd-p 2023-09-28 06:55:49 -07:00
Piotr Osiewicz 9319b81317 assets: Add keybinds to replace (#3055)
Release Notes:

- N/A
2023-09-28 13:04:14 +02:00
Nathan Sobo cd1a37816e Checkpoint 2023-09-28 01:16:47 -06:00
Nathan Sobo 0a392e6739 Checkpoint 2023-09-28 00:46:15 -06:00
Nathan Sobo 3744b014d1 Checkpoint 2023-09-27 23:24:07 -06:00
Nathan Sobo edab66b5c8 Checkpoint 2023-09-27 23:19:32 -06:00
Nathan Sobo a584b177ea Checkpoint - No warnings 2023-09-27 23:10:22 -06:00
Conrad Irwin 98914f1155 vim: Fix some dw edge cases 2023-09-27 23:09:09 -06:00
Nathan Sobo de50c8149b Checkpoint 2023-09-27 23:05:39 -06:00
Nathan Sobo 924ea5da0e Checkpoint 2023-09-27 22:02:48 -06:00
Conrad Irwin c43687e3af Add vim-style completion bindings: 2023-09-27 21:29:18 -06:00
Conrad Irwin 8a1e8314c6 Escape returns to normal mode even if completion is open
For zed-industries/community#1746
2023-09-27 21:28:30 -06:00
Nathan Sobo 74c9c84d22 Checkpoint 2023-09-27 21:25:06 -06:00
Nathan Sobo b369ffe1d6 Checkpoint 2023-09-27 21:14:09 -06:00
Conrad Irwin bd227c6a5b Add g space for option-enter
vimify all the things
2023-09-27 21:05:58 -06:00
Conrad Irwin aafd68f93e Add ctrl-i to go forward
For zed-industries/community#1732
2023-09-27 21:04:13 -06:00
Conrad Irwin a9f0d72019 vim: add ctrl-a/ctrl-x
For zed-industries/community#1411
For zed-industries/community#619
2023-09-27 19:49:31 -06:00
Conrad Irwin d27c98003d Don't prompt to save unchanged files (#3053)
- don't prompt to save a set of unchanged files when closing
(preview-only)
2023-09-27 19:20:08 -06:00
Antonio Scandurra cb2f28a6d4 Fix tests 2023-09-27 18:19:35 -06:00
Antonio Scandurra f84a84bf07 Introduce a new include_warnings setting under diagnostics 2023-09-27 18:08:08 -06:00
Nathan Sobo fcaaa51863 Checkpoint 2023-09-27 17:51:12 -06:00
Antonio Scandurra 671e1bb188 Add an include/exclude warnings toggle in project diagnostics 2023-09-27 17:47:19 -06:00
Nathan Sobo f6843a1544 Checkpoint 2023-09-27 17:25:04 -06:00
Nathan Sobo 5f12e47201 Checkpoint 2023-09-27 17:17:30 -06:00
Conrad Irwin cbed65851d fix tests 2023-09-27 17:02:47 -06:00