dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(prettier): clean up implementation of object key (#2378)

Browse source
This commit is contained in:
Boshen 2024-02-10 16:49:10 +08:00 committed by GitHub
parent ef336cb66b
commit f194b1fac8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/oxc_prettier/src/format/mod.rs
View file

@ -1556,7 +1556,7 @@ impl<'a> Format<'a> for PropertyKey<'a> {
wrap!(p, self, PropertyKey, {
// Perf: Cache the result of `need_quote` to avoid checking it in each PropertyKey
let need_quote = p.options.quote_props.is_consistent()
let need_quote = p.options.quote_props.consistent()
&& match p.parent_parent_kind() {
Some(AstKind::ObjectExpression(a)) => a.properties.iter().any(|x| match x {
ObjectPropertyKind::ObjectProperty(p) => {
@ -1584,16 +1584,20 @@ impl<'a> Format<'a> for PropertyKey<'a> {
PropertyKey::PrivateIdentifier(ident) => ident.format(p),
PropertyKey::Expression(expr) => match expr {
Expression::StringLiteral(literal) => {
let unquote = if need_quote {
false
// This does not pass quotes/objects.js
// because prettier uses the function `isEs5IdentifierName` based on unicode version 3,
// but `is_identifier_name` uses the latest unicode version.
if is_identifier_name(literal.value.as_str())
&& (p.options.quote_props.as_needed()
|| (p.options.quote_props.consistent()/* && !needsQuoteProps.get(parent) */))
{
string!(p, literal.value.as_str())
} else {
is_identifier_name(literal.value.as_str())
};
if !unquote || p.options.quote_props.is_preserve() {
literal.format(p)
} else {
p.str(literal.value.as_str())
Doc::Str(string::print_string(
p,
literal.value.as_str(),
p.options.single_quote,
))
}
}
Expression::NumberLiteral(literal) => {

9
crates/oxc_prettier/src/options.rs
View file

@ -126,10 +126,15 @@ pub enum QuoteProps {
}
impl QuoteProps {
pub fn is_preserve(self) -> bool {
pub fn as_needed(self) -> bool {
matches!(self, Self::AsNeeded)
}
pub fn preserve(self) -> bool {
matches!(self, Self::Preserve)
}
pub fn is_consistent(self) -> bool {
pub fn consistent(self) -> bool {
matches!(self, Self::Consistent)
}
}