Skip to content

Commit

Permalink
upgrade Raffia
Browse files Browse the repository at this point in the history
  • Loading branch information
@g-plane
g-plane committed Jul 27, 2024
1 parent 80250b5 commit c67e811
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 35 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion malva/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exclude = ["/tests"]
aho-corasick = "1.1"
itertools = "0.13"
memchr = "2.7"
raffia = "0.7"
raffia = "0.8"
serde = { version = "1.0", optional = true }
tiny_pretty = "0.2"

Expand Down
2 changes: 1 addition & 1 deletion malva/src/doc_gen/at_rule/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ impl<'s> DocGen<'s> for AtRulePrelude<'s> {
AtRulePrelude::Namespace(namespace) => namespace.doc(ctx),
AtRulePrelude::Nest(nest) => nest.doc(ctx).group().nest(ctx.indent_width),
AtRulePrelude::Page(page) => page.doc(ctx),
AtRulePrelude::PositionFallback(position_fallback) => position_fallback.doc(ctx),
AtRulePrelude::PositionTry(position_try) => position_try.doc(ctx),
AtRulePrelude::Property(property) => property.doc(ctx),
AtRulePrelude::SassAtRoot(sass_at_root) => sass_at_root.doc(ctx),
AtRulePrelude::SassContent(sass_content) => sass_content.doc(ctx),
Expand Down
66 changes: 35 additions & 31 deletions malva/src/doc_gen/selector.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,31 +295,31 @@ impl<'s> DocGen<'s> for PseudoClassSelector<'s> {
if let Some(arg) = &self.arg {
docs.push(Doc::text("("));

let arg_span = arg.span();
let arg_span = arg.kind.span();
let mut arg_doc = vec![];

if ctx.options.linebreak_in_pseudo_parens {
arg_doc.push(Doc::line_or_nil());
}

arg_doc.extend(ctx.end_spaced_comments(self.span.start, arg_span.start));
arg_doc.push(match arg {
PseudoClassSelectorArg::CompoundSelector(compound_selector) => {
arg_doc.extend(ctx.end_spaced_comments(arg.l_paren.end, arg_span.start));
arg_doc.push(match &arg.kind {
PseudoClassSelectorArgKind::CompoundSelector(compound_selector) => {
compound_selector.doc(ctx)
}
PseudoClassSelectorArg::CompoundSelectorList(compound_selector_list) => {
PseudoClassSelectorArgKind::CompoundSelectorList(compound_selector_list) => {
compound_selector_list.doc(ctx)
}
PseudoClassSelectorArg::Ident(ident) => ident.doc(ctx),
PseudoClassSelectorArg::LanguageRangeList(language_range_list) => {
PseudoClassSelectorArgKind::Ident(ident) => ident.doc(ctx),
PseudoClassSelectorArgKind::LanguageRangeList(language_range_list) => {
language_range_list.doc(ctx)
}
PseudoClassSelectorArg::Nth(nth) => nth.doc(ctx),
PseudoClassSelectorArg::Number(number) => number.doc(ctx),
PseudoClassSelectorArg::RelativeSelectorList(relative_selector_list) => {
PseudoClassSelectorArgKind::Nth(nth) => nth.doc(ctx),
PseudoClassSelectorArgKind::Number(number) => number.doc(ctx),
PseudoClassSelectorArgKind::RelativeSelectorList(relative_selector_list) => {
relative_selector_list.doc(ctx)
}
PseudoClassSelectorArg::SelectorList(selector_list) => {
PseudoClassSelectorArgKind::SelectorList(selector_list) => {
if ctx.options.linebreak_in_pseudo_parens {
selector_list.doc(ctx).group().nest(ctx.indent_width)
} else {
Expand All @@ -331,18 +331,20 @@ impl<'s> DocGen<'s> for PseudoClassSelector<'s> {
)
}
}
PseudoClassSelectorArg::LessExtendList(less_extend_list) => {
PseudoClassSelectorArgKind::LessExtendList(less_extend_list) => {
less_extend_list.doc(ctx)
}
PseudoClassSelectorArg::TokenSeq(token_seq) => format_pseudo_selector_arg_tokens(
token_seq,
ctx,
token_seq.span.start,
token_seq.span.end,
),
PseudoClassSelectorArgKind::TokenSeq(token_seq) => {
format_pseudo_selector_arg_tokens(
token_seq,
ctx,
token_seq.span.start,
token_seq.span.end,
)
}
});

arg_doc.extend(ctx.start_spaced_comments(arg_span.end, self.span.end));
arg_doc.extend(ctx.start_spaced_comments(arg_span.end, arg.r_paren.start));
if ctx.options.linebreak_in_pseudo_parens {
docs.push(
Doc::list(arg_doc)
Expand All @@ -369,28 +371,30 @@ impl<'s> DocGen<'s> for PseudoElementSelector<'s> {
if let Some(arg) = &self.arg {
docs.push(Doc::text("("));

let arg_span = arg.span();
let arg_span = arg.kind.span();
let mut arg_doc = vec![];

if ctx.options.linebreak_in_pseudo_parens {
arg_doc.push(Doc::line_or_nil());
}

arg_doc.extend(ctx.end_spaced_comments(self.span.start, arg_span.start));
arg_doc.push(match arg {
PseudoElementSelectorArg::CompoundSelector(compound_selector) => {
arg_doc.extend(ctx.end_spaced_comments(arg.l_paren.end, arg_span.start));
arg_doc.push(match &arg.kind {
PseudoElementSelectorArgKind::CompoundSelector(compound_selector) => {
compound_selector.doc(ctx)
}
PseudoElementSelectorArg::Ident(ident) => ident.doc(ctx),
PseudoElementSelectorArg::TokenSeq(token_seq) => format_pseudo_selector_arg_tokens(
token_seq,
ctx,
token_seq.span.start,
token_seq.span.end,
),
PseudoElementSelectorArgKind::Ident(ident) => ident.doc(ctx),
PseudoElementSelectorArgKind::TokenSeq(token_seq) => {
format_pseudo_selector_arg_tokens(
token_seq,
ctx,
token_seq.span.start,
token_seq.span.end,
)
}
});

arg_doc.extend(ctx.start_spaced_comments(arg_span.end, self.span.end));
arg_doc.extend(ctx.start_spaced_comments(arg_span.end, arg.r_paren.start));
if ctx.options.linebreak_in_pseudo_parens {
docs.push(
Doc::list(arg_doc)
Expand Down

0 comments on commit c67e811

Please sign in to comment.