Commit Graph
4885 Commits
Author SHA1 Message Date
Joseph T. Lyons aab0bdebc1 Use bitflags to hold error states 2023-12-14 17:22:13 -05:00
Nate Butler 543d1b5783 Continue styling new story components 2023-12-14 16:52:05 -05:00
Nate ButlerandMarshall Bowers 7ad611839c Extend Story components, allow linking to story file
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-14 15:55:17 -05:00
Marshall Bowers 329321ee6e Improve storybook story selection (#3653)
This PR builds on top of #3652 by adding a selection prompt to the
storybook to allow you to choose from the available list of stories if
you don't provide one explicitly:

<img width="1387" alt="Screenshot 2023-12-14 at 12 00 26 PM"
src="https://github.com/zed-industries/zed/assets/1486634/640d62a3-1340-45f1-9746-69b513faff62">

This way we don't have to keep generating the `script/storybook` script
whenever stories are added/removed.

#### Usage (through `cargo`):

```sh
# Select from the available stories
cargo run -p storybook2

# Run a specific story
cargo run -p storybook2 -- components/list_item
```

#### Usage (through `script/storybook`):

```sh
# Select from the available stories
./script/storybook

# Run a specific story
./script/storybook list_item
```

Release Notes:

- N/A
2023-12-14 12:13:02 -05:00
Piotr Osiewicz 4cdf2eb939 Vcs menu2 (#3648)
Header and footer are gonna be added in a separate PR as they require
changes to Picker trait that I feel are separate from the contents of
this PR.

Release Notes:

- N/A
2023-12-14 12:36:53 +01:00
Joseph T. Lyons 70fbe2b02c Simulate sending feedback in dev 2023-12-13 21:18:50 -05:00
Conrad Irwin 745b74dc37 Don't hang the app when signing in offline 2023-12-13 15:52:43 -07:00
Conrad Irwin 6256da7df2 Implement user menu 2023-12-13 14:14:03 -07:00
Conrad Irwin d528b07b8c Port project_symbols (#3634)
Release Notes:

- N/A
2023-12-13 14:13:25 -07:00
Conrad Irwin 0b2d20be0b Port project_symbols 2023-12-13 13:43:39 -07:00
Joseph T. Lyons 589738b5b3 collab 0.31.0 2023-12-13 12:39:29 -05:00
Joseph T. Lyons d8c6e0fc76 v0.118.x dev 2023-12-13 12:24:10 -05:00
Conrad Irwin ab430c6442 fix modal exchange (#3620)
- Fix opening GoToLine from Command
- Extend test to cover go_to_line behavior too

Release Notes:

- N/A
2023-12-12 21:30:34 -07:00
Conrad Irwin 6bf18efa4e Fix opening GoToLine from Command
This was broken because of the async hop introduced by should_dismiss.

Change that API to instead be syncronous, and require that implementors
(of which there is only one) to call dismiss again if they want to.
2023-12-12 20:46:27 -07:00
Conrad Irwin a183a3cfc0 vim2 (#3618)
- Uncomment editor event tests
- Uncomment vim search tests

Just command left

Release Notes:

- N/A
2023-12-12 19:19:08 -07:00
Conrad Irwin e1ee35d0a6 Fix vim toggle on welcome 2023-12-12 19:03:54 -07:00
Julia a2f80230c9 zed2 notification panel (#3603)
Release Notes:

- N/A
2023-12-12 18:04:47 -05:00
Julia 370706d316 Builds and runs 2023-12-12 13:07:17 -05:00
Antonio Scandurra 69f38a3c50 Use FxHashMap and FxHashSet in hot code paths
We can also use these maps and sets in place of `SeaHasher` because
they are also deterministic. Note that we're not swapping std's
`HashMap` and `HashSet` wholesale inside of `collections` because
on the server we need cryptographically secure collections.
2023-12-12 13:35:22 +01:00
Conrad Irwin 0d96e964ef Merge branch 'main' into vim2 2023-12-11 09:38:23 -07:00
Piotr Osiewicz ba57516632 Merge branch 'main' into project_search2 2023-12-11 16:47:48 +01:00
Marshall Bowers 50ff052569 Make clicking the breadcrumb toggle the symbol outline (#3571)
This PR wires up clicks on the breadcrumb to toggle the symbol outline.

Note that the behavior of the symbol outline is a little wonky at the
moment, due to the issues with pane focus.

Release Notes:

- N/A
2023-12-08 18:22:53 -05:00
Conrad Irwin e356a7df09 vim2 compiling (but mostly commented out) 2023-12-08 18:47:14 +00:00
Max Brunsfeld 974b21d539 Bump tree-sitter-vue to remove dangling submodule 2023-12-08 10:12:18 -08:00
Joseph T. Lyons 4c675b45db collab 0.30.1 2023-12-08 12:48:02 -05:00
Marshall Bowers f1ac5b11da Emit accurate hex colors in generated themes (#3547)
This PR fixes an issues where the hex colors in the generated themes
were not correct.

We're using the [`palette`](https://crates.io/crates/palette) crate to
perform the conversions, as this gives us accurate hex codes that match
the VS Code source themes.

Release Notes:

- N/A
2023-12-07 18:34:03 -05:00
Piotr Osiewicz 95814ab53b Barebones project search (no UI, but the crate compiles) 2023-12-07 14:36:45 +01:00
Joseph T. Lyons 263b79c047 Merge branch 'main' into feedback-2 2023-12-06 23:16:54 -05:00
Joseph T. Lyons 853da8eaa6 WIP 2023-12-06 23:15:04 -05:00
Marshall Bowers d910bd55d4 Port recent_projects to Zed2 (#3525)
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).

Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.

Release Notes:

- N/A
2023-12-06 18:41:50 -05:00
Max Brunsfeld 1be1e3b5b5 Upgrade async-compression dep 2023-12-06 14:29:09 -08:00
Joseph T. Lyons a364c9ed70 WIP 2023-12-06 17:27:10 -05:00
Marshall Bowers acf39c2f89 Wire up inline assist quick action (#3519)
This PR wires up the inline assist quick action in the toolbar.

Release Notes:

- N/A
2023-12-06 15:52:51 -05:00
Max Brunsfeld 6658543f3c Bring back channel notes (#3506) 2023-12-06 12:45:46 -08:00
Marshall Bowers 591fc7e3af Wire up inline assist quick action 2023-12-06 15:44:50 -05:00
Max Brunsfeld c247a87491 Fix propagation of active item to followers
Enable channel buffer integration tests.
2023-12-06 12:18:48 -08:00
Kirill Bulatov eeba1715d8 Use distinct version for zed2, append git hash to its nightly version 2023-12-06 22:04:45 +02:00
Marshall Bowers 01b7e0b079 Fix layout for terminal tabs (#3514)
This PR fixes the layout for terminal tabs.

We need to use an `h_stack` here to get the icon and the label to
position themselves next to each other instead of one on top of the
other.

Release Notes:

- N/A
2023-12-06 14:28:31 -05:00
Marshall Bowers ea5e5e61ef Port assistant crate to Zed2 (#3513)
This PR contains the initial port of the `assistant` crate to Zed2.

Release Notes:

- N/A
2023-12-06 14:04:01 -05:00
Joseph T. Lyons 38e979221b collab 0.30.0 2023-12-06 12:34:47 -05:00
Antonio Scandurra c62305edea Merge remote-tracking branch 'origin/main' into assistant-2
# Conflicts:
#	crates/ui2/src/components/icon.rs
2023-12-06 18:18:58 +01:00
Marshall Bowers 180e597117 v0.117.x dev 2023-12-06 12:03:59 -05:00
Piotr Osiewicz aac14f5c41 Merge branch 'main' into copilot2 2023-12-06 15:13:13 +01:00
Piotr Osiewicz 633224ed26 Signed out state is looking good 2023-12-06 13:00:57 +01:00
Antonio Scandurra c9300e2384 Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Antonio Scandurra 2be86deeaf Start wiring up assistant2 2023-12-06 12:51:25 +01:00
Marshall Bowers 106c479785 Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Joseph T. Lyons 5bf1b4404a Merge branch 'main' into feedback-2 2023-12-05 12:49:48 -05:00
Piotr OsiewiczandNate 508dd48a80 Port quick_action_bar to zed2
Co-authored-by: Nate <nate@zed.dev>
2023-12-05 17:33:35 +01:00
Antonio Scandurra 6688546075 WIP 2023-12-05 16:49:36 +01:00