refactor: redesign theme tokens and split catppuccin themes

src/api/issues.rs

@@ -289,8 +289,8 @@ impl query::QueryFn for ListPullRequests {
         }
 
         let query_string = match self.filter {
-        | Some(filter) => format!("is:pr archived:false sort:updated-desc {}", filter),
-        | None => "is:pr archived:false sort:updated-desc".into(),
+            | Some(filter) => format!("is:pr archived:false sort:updated-desc {}", filter),
+            | None => "is:pr archived:false sort:updated-desc".into(),
         };
 
         let gql =
@@ -312,19 +312,19 @@ impl query::QueryFn for ListPullRequests {
                         .flatten()
                         .filter_map(|edge| {
                             edge.node.and_then(|n| match n {
-                            | PullRequestPaginationQuerySearchEdgesNode::PullRequest(p) => {
-                                Some(PullRequest {
-                                    id: p.id.into(),
-                                    title: p.title,
-                                    state: p.state,
-                                    is_draft: p.is_draft,
-                                    repo_slug: format!(
-                                        "{}/{}",
-                                        p.repository.owner.login, p.repository.name
-                                    ),
-                                })
-                            }
-                            | _ => None,
+                                | PullRequestPaginationQuerySearchEdgesNode::PullRequest(p) => {
+                                    Some(PullRequest {
+                                        id: p.id.into(),
+                                        title: p.title,
+                                        state: p.state,
+                                        is_draft: p.is_draft,
+                                        repo_slug: format!(
+                                            "{}/{}",
+                                            p.repository.owner.login, p.repository.name
+                                        ),
+                                    })
+                                }
+                                | _ => None,
                             })
                         })
                         .collect::<Vec<_>>()
@@ -369,32 +369,32 @@ impl query::QueryFn for FetchPullRequest {
                 "missing 'node' field on PullRequestQuery response".into(),
             ))
             .and_then(|n| match n {
-            | PullRequestQueryNode::PullRequest(p) => {
-                let created_at =
-                    chrono::DateTime::parse_from_rfc3339(&p.created_at).map_err(|err| {
-                        api::Error::MalformedResponse(format!(
-                            "invalid pull request createdAt {:?}: {err}",
-                            p.created_at
-                        ))
-                    })?;
+                | PullRequestQueryNode::PullRequest(p) => {
+                    let created_at =
+                        chrono::DateTime::parse_from_rfc3339(&p.created_at).map_err(|err| {
+                            api::Error::MalformedResponse(format!(
+                                "invalid pull request createdAt {:?}: {err}",
+                                p.created_at
+                            ))
+                        })?;
 
-                Ok(DetailedPullRequest {
-                    title: p.title,
-                    state: p.state,
-                    is_draft: p.is_draft,
-                    body: p.body,
-                    author: p.author.map(|it| api::user::Actor {
-                        login: it.login,
-                        avatar_url: it.avatar_url,
-                    }),
-                    base_branch_name: p.base_ref.map(|r| r.name),
-                    head_branch_name: p.head_ref.map(|r| r.name),
-                    created_at: Some(created_at),
-                })
-            }
-            | _ => Err(api::Error::MalformedResponse(
-                "unexpected node type on PullRequestQuery".into(),
-            )),
+                    Ok(DetailedPullRequest {
+                        title: p.title,
+                        state: p.state,
+                        is_draft: p.is_draft,
+                        body: p.body,
+                        author: p.author.map(|it| api::user::Actor {
+                            login: it.login,
+                            avatar_url: it.avatar_url,
+                        }),
+                        base_branch_name: p.base_ref.map(|r| r.name),
+                        head_branch_name: p.head_ref.map(|r| r.name),
+                        created_at: Some(created_at),
+                    })
+                }
+                | _ => Err(api::Error::MalformedResponse(
+                    "unexpected node type on PullRequestQuery".into(),
+                )),
             })
     }
 }
@@ -437,11 +437,11 @@ impl query::QueryFn for FetchPullRequestTimeline {
 
             TimelineActor {
                 kind: match on {
-                | actorFieldsOn::Bot => "Bot",
-                | actorFieldsOn::EnterpriseUserAccount => "EnterpriseUserAccount",
-                | actorFieldsOn::Mannequin => "Mannequin",
-                | actorFieldsOn::Organization => "Organization",
-                | actorFieldsOn::User => "User",
+                    | actorFieldsOn::Bot => "Bot",
+                    | actorFieldsOn::EnterpriseUserAccount => "EnterpriseUserAccount",
+                    | actorFieldsOn::Mannequin => "Mannequin",
+                    | actorFieldsOn::Organization => "Organization",
+                    | actorFieldsOn::User => "User",
                 }
                 .into(),
                 name: login,
@@ -451,62 +451,62 @@ impl query::QueryFn for FetchPullRequestTimeline {
 
         fn normalize_assignee(actor: assigneeFields) -> TimelineActor {
             match actor {
-            | assigneeFields::Bot(actor) => TimelineActor {
-                kind: "Bot".into(),
-                name: actor.login,
-                avatar_url: Some(actor.avatar_url),
-            },
-            | assigneeFields::Mannequin(actor) => TimelineActor {
-                kind: "Mannequin".into(),
-                name: actor.login,
-                avatar_url: Some(actor.avatar_url),
-            },
-            | assigneeFields::Organization(actor) => TimelineActor {
-                kind: "Organization".into(),
-                name: actor.login,
-                avatar_url: Some(actor.avatar_url),
-            },
-            | assigneeFields::User(actor) => TimelineActor {
-                kind: "User".into(),
-                name: actor.login,
-                avatar_url: Some(actor.avatar_url),
-            },
+                | assigneeFields::Bot(actor) => TimelineActor {
+                    kind: "Bot".into(),
+                    name: actor.login,
+                    avatar_url: Some(actor.avatar_url),
+                },
+                | assigneeFields::Mannequin(actor) => TimelineActor {
+                    kind: "Mannequin".into(),
+                    name: actor.login,
+                    avatar_url: Some(actor.avatar_url),
+                },
+                | assigneeFields::Organization(actor) => TimelineActor {
+                    kind: "Organization".into(),
+                    name: actor.login,
+                    avatar_url: Some(actor.avatar_url),
+                },
+                | assigneeFields::User(actor) => TimelineActor {
+                    kind: "User".into(),
+                    name: actor.login,
+                    avatar_url: Some(actor.avatar_url),
+                },
             }
         }
 
         fn normalize_requested_reviewer(actor: requestedReviewerFields) -> TimelineActor {
             match actor {
-            | requestedReviewerFields::Bot(actor) => TimelineActor {
-                kind: "Bot".into(),
-                name: actor.login,
-                avatar_url: Some(actor.avatar_url),
-            },
-            | requestedReviewerFields::Mannequin(actor) => TimelineActor {
-                kind: "Mannequin".into(),
-                name: actor.login,
-                avatar_url: Some(actor.avatar_url),
-            },
-            | requestedReviewerFields::Team(actor) => TimelineActor {
-                kind: "Team".into(),
-                name: actor.name,
-                avatar_url: None,
-            },
-            | requestedReviewerFields::User(actor) => TimelineActor {
-                kind: "User".into(),
-                name: actor.login,
-                avatar_url: Some(actor.avatar_url),
-            },
+                | requestedReviewerFields::Bot(actor) => TimelineActor {
+                    kind: "Bot".into(),
+                    name: actor.login,
+                    avatar_url: Some(actor.avatar_url),
+                },
+                | requestedReviewerFields::Mannequin(actor) => TimelineActor {
+                    kind: "Mannequin".into(),
+                    name: actor.login,
+                    avatar_url: Some(actor.avatar_url),
+                },
+                | requestedReviewerFields::Team(actor) => TimelineActor {
+                    kind: "Team".into(),
+                    name: actor.name,
+                    avatar_url: None,
+                },
+                | requestedReviewerFields::User(actor) => TimelineActor {
+                    kind: "User".into(),
+                    name: actor.login,
+                    avatar_url: Some(actor.avatar_url),
+                },
             }
         }
 
         fn normalize_review_state(state: PullRequestReviewState) -> String {
             match state {
-            | PullRequestReviewState::PENDING => "PENDING",
-            | PullRequestReviewState::COMMENTED => "COMMENTED",
-            | PullRequestReviewState::APPROVED => "APPROVED",
-            | PullRequestReviewState::CHANGES_REQUESTED => "CHANGES_REQUESTED",
-            | PullRequestReviewState::DISMISSED => "DISMISSED",
-            | _ => "OTHER",
+                | PullRequestReviewState::PENDING => "PENDING",
+                | PullRequestReviewState::COMMENTED => "COMMENTED",
+                | PullRequestReviewState::APPROVED => "APPROVED",
+                | PullRequestReviewState::CHANGES_REQUESTED => "CHANGES_REQUESTED",
+                | PullRequestReviewState::DISMISSED => "DISMISSED",
+                | _ => "OTHER",
             }
             .into()
         }
@@ -726,10 +726,10 @@ impl query::QueryFn for FetchPullRequestTimeline {
                 "missing 'node' field on PullRequestTimelineQuery response".into(),
             ))
             .and_then(|node| match node {
-            | PullRequestTimelineQueryNode::PullRequest(pull_request) => Ok(pull_request),
-            | _ => Err(api::Error::MalformedResponse(
-                "unexpected node type on PullRequestTimelineQuery".into(),
-            )),
+                | PullRequestTimelineQueryNode::PullRequest(pull_request) => Ok(pull_request),
+                | _ => Err(api::Error::MalformedResponse(
+                    "unexpected node type on PullRequestTimelineQuery".into(),
+                )),
             })?;
 
         let timeline = pull_request.timeline_items;