
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
129 lines
4.2 KiB
Rust
129 lines
4.2 KiB
Rust
use std::str::FromStr;
|
|
use std::sync::OnceLock;
|
|
|
|
use crate::stories::*;
|
|
use clap::ValueEnum;
|
|
use clap::builder::PossibleValue;
|
|
use gpui::AnyView;
|
|
use strum::{EnumIter, EnumString, IntoEnumIterator};
|
|
use ui::prelude::*;
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display, EnumString, EnumIter)]
|
|
#[strum(serialize_all = "snake_case")]
|
|
pub enum ComponentStory {
|
|
ApplicationMenu,
|
|
AutoHeightEditor,
|
|
CollabNotification,
|
|
ContextMenu,
|
|
Cursor,
|
|
Focus,
|
|
IconButton,
|
|
Keybinding,
|
|
List,
|
|
ListHeader,
|
|
ListItem,
|
|
OverflowScroll,
|
|
Picker,
|
|
Scroll,
|
|
Tab,
|
|
TabBar,
|
|
Text,
|
|
ToggleButton,
|
|
ViewportUnits,
|
|
WithRemSize,
|
|
}
|
|
|
|
impl ComponentStory {
|
|
pub fn story(&self, window: &mut Window, cx: &mut App) -> AnyView {
|
|
match self {
|
|
Self::ApplicationMenu => cx
|
|
.new(|cx| title_bar::ApplicationMenuStory::new(window, cx))
|
|
.into(),
|
|
Self::AutoHeightEditor => AutoHeightEditorStory::new(window, cx).into(),
|
|
Self::CollabNotification => cx
|
|
.new(|_| collab_ui::notifications::CollabNotificationStory)
|
|
.into(),
|
|
Self::ContextMenu => cx.new(|_| ui::ContextMenuStory).into(),
|
|
Self::Cursor => cx.new(|_| crate::stories::CursorStory).into(),
|
|
Self::Focus => FocusStory::model(window, cx).into(),
|
|
Self::IconButton => cx.new(|_| ui::IconButtonStory).into(),
|
|
Self::Keybinding => cx.new(|_| ui::KeybindingStory).into(),
|
|
Self::List => cx.new(|_| ui::ListStory).into(),
|
|
Self::ListHeader => cx.new(|_| ui::ListHeaderStory).into(),
|
|
Self::ListItem => cx.new(|_| ui::ListItemStory).into(),
|
|
Self::OverflowScroll => cx.new(|_| crate::stories::OverflowScrollStory).into(),
|
|
Self::Picker => PickerStory::new(window, cx).into(),
|
|
Self::Scroll => ScrollStory::model(cx).into(),
|
|
Self::Tab => cx.new(|_| ui::TabStory).into(),
|
|
Self::TabBar => cx.new(|_| ui::TabBarStory).into(),
|
|
Self::Text => TextStory::model(cx).into(),
|
|
Self::ToggleButton => cx.new(|_| ui::ToggleButtonStory).into(),
|
|
Self::ViewportUnits => cx.new(|_| crate::stories::ViewportUnitsStory).into(),
|
|
Self::WithRemSize => cx.new(|_| crate::stories::WithRemSizeStory).into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
|
|
pub enum StorySelector {
|
|
Component(ComponentStory),
|
|
KitchenSink,
|
|
}
|
|
|
|
impl FromStr for StorySelector {
|
|
type Err = anyhow::Error;
|
|
|
|
fn from_str(raw_story_name: &str) -> std::result::Result<Self, Self::Err> {
|
|
use anyhow::Context as _;
|
|
|
|
let story = raw_story_name.to_ascii_lowercase();
|
|
|
|
if story == "kitchen_sink" {
|
|
return Ok(Self::KitchenSink);
|
|
}
|
|
|
|
if let Some((_, story)) = story.split_once("components/") {
|
|
let component_story = ComponentStory::from_str(story)
|
|
.with_context(|| format!("story not found for component '{story}'"))?;
|
|
|
|
return Ok(Self::Component(component_story));
|
|
}
|
|
|
|
anyhow::bail!("story not found for '{raw_story_name}'")
|
|
}
|
|
}
|
|
|
|
impl StorySelector {
|
|
pub fn story(&self, window: &mut Window, cx: &mut App) -> AnyView {
|
|
match self {
|
|
Self::Component(component_story) => component_story.story(window, cx),
|
|
Self::KitchenSink => KitchenSinkStory::model(cx).into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// The list of all stories available in the storybook.
|
|
static ALL_STORY_SELECTORS: OnceLock<Vec<StorySelector>> = OnceLock::new();
|
|
|
|
impl ValueEnum for StorySelector {
|
|
fn value_variants<'a>() -> &'a [Self] {
|
|
let stories = ALL_STORY_SELECTORS.get_or_init(|| {
|
|
let component_stories = ComponentStory::iter().map(StorySelector::Component);
|
|
|
|
component_stories
|
|
.chain(std::iter::once(StorySelector::KitchenSink))
|
|
.collect::<Vec<_>>()
|
|
});
|
|
|
|
stories
|
|
}
|
|
|
|
fn to_possible_value(&self) -> Option<clap::builder::PossibleValue> {
|
|
let value = match self {
|
|
Self::Component(story) => format!("components/{story}"),
|
|
Self::KitchenSink => "kitchen_sink".to_string(),
|
|
};
|
|
|
|
Some(PossibleValue::new(value))
|
|
}
|
|
}
|