Skip to content

fix(formatter): template literal element should not be indented #16189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Nov 27, 2025
Merged

fix(formatter): template literal element should not be indented #16189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 27 additions & 39 deletions crates/oxc_formatter/src/write/template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,15 @@ pub(super) enum TemplateExpression<'a, 'b> {
TSType(&'b AstNode<'a, TSType<'a>>),
}

impl TemplateExpression<'_, '_> {
pub fn as_expression(&self) -> Option<&AstNode<'_, Expression<'_>>> {
match self {
Self::Expression(e) => Some(e),
Self::TSType(_) => None,
}
}
}

impl GetSpan for TemplateExpression<'_, '_> {
fn span(&self) -> Span {
match self {
Expand Down Expand Up @@ -293,30 +302,25 @@ impl<'a> Format<'a> for FormatTemplateExpression<'a, '_> {
}
TemplateElementLayout::Fit => {
// Determine if we should add indentation based on expression complexity
let indent = match self.expression {
TemplateExpression::Expression(e) => {
has_comment_in_expression
|| match e.as_ref() {
Expression::StaticMemberExpression(_)
| Expression::ComputedMemberExpression(_)
| Expression::PrivateFieldExpression(_)
| Expression::ConditionalExpression(_)
| Expression::SequenceExpression(_)
| Expression::TSAsExpression(_)
| Expression::TSSatisfiesExpression(_)
| Expression::BinaryExpression(_)
| Expression::LogicalExpression(_)
| Expression::Identifier(_) => true,
Expression::ChainExpression(chain) => {
chain.expression.is_member_expression()
}
_ => false,
let indent = self.expression.as_expression().is_some_and(|e| {
has_comment_in_expression
|| match e.as_ref() {
Expression::StaticMemberExpression(_)
| Expression::ComputedMemberExpression(_)
| Expression::PrivateFieldExpression(_)
| Expression::ConditionalExpression(_)
| Expression::SequenceExpression(_)
| Expression::TSAsExpression(_)
| Expression::TSSatisfiesExpression(_)
| Expression::BinaryExpression(_)
| Expression::LogicalExpression(_)
| Expression::Identifier(_) => true,
Expression::ChainExpression(chain) => {
chain.expression.is_member_expression()
}
}
TemplateExpression::TSType(t) => {
self.options.after_new_line || is_complex_type(t.as_ref())
}
};
_ => false,
}
});

match &interned_expression {
Some(element) if indent => {
Expand Down Expand Up @@ -395,22 +399,6 @@ fn write_with_indention<'a, Content>(
write!(f, [dedent_to_root(&format_aligned)]);
}

/// Check if a TypeScript type is complex enough to warrant line breaks
#[inline]
fn is_complex_type(ts_type: &TSType) -> bool {
matches!(
ts_type,
TSType::TSConditionalType(_)
| TSType::TSMappedType(_)
| TSType::TSTypeLiteral(_)
| TSType::TSIntersectionType(_)
| TSType::TSUnionType(_)
| TSType::TSTupleType(_)
| TSType::TSArrayType(_)
| TSType::TSIndexedAccessType(_)
)
}

#[derive(Debug)]
enum EachTemplateElement<'a> {
/// A significant value in the test each table. It's a row element.
Expand Down
12 changes: 12 additions & 0 deletions crates/oxc_formatter/tests/fixtures/ts/template-literal-type/issue-16136.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
type templateLiteralType = `${
TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? '_'
: ''
}`;

type CamelToSnakeCase<TCamelCaseString extends string> =
TCamelCaseString extends `${infer TStringConvertedSoFar}${infer TStringYetToConvert}`
? `${TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? '_'
: ''}${Lowercase<TStringConvertedSoFar>}${CamelToSnakeCase<TStringYetToConvert>}`
: TCamelCaseString;
47 changes: 47 additions & 0 deletions crates/oxc_formatter/tests/fixtures/ts/template-literal-type/issue-16136.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
---
source: crates/oxc_formatter/tests/fixtures/mod.rs
---
==================== Input ====================
type templateLiteralType = `${
TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? '_'
: ''
}`;

type CamelToSnakeCase<TCamelCaseString extends string> =
TCamelCaseString extends `${infer TStringConvertedSoFar}${infer TStringYetToConvert}`
? `${TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? '_'
: ''}${Lowercase<TStringConvertedSoFar>}${CamelToSnakeCase<TStringYetToConvert>}`
: TCamelCaseString;
==================== Output ====================
------------------
{ printWidth: 80 }
------------------
type templateLiteralType =
`${TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? "_"
: ""}`;

type CamelToSnakeCase<TCamelCaseString extends string> =
TCamelCaseString extends `${infer TStringConvertedSoFar}${infer TStringYetToConvert}`
? `${TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? "_"
: ""}${Lowercase<TStringConvertedSoFar>}${CamelToSnakeCase<TStringYetToConvert>}`
: TCamelCaseString;

-------------------
{ printWidth: 100 }
-------------------
type templateLiteralType = `${TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? "_"
: ""}`;

type CamelToSnakeCase<TCamelCaseString extends string> =
TCamelCaseString extends `${infer TStringConvertedSoFar}${infer TStringYetToConvert}`
? `${TStringConvertedSoFar extends Capitalize<TStringConvertedSoFar>
? "_"
: ""}${Lowercase<TStringConvertedSoFar>}${CamelToSnakeCase<TStringYetToConvert>}`
: TCamelCaseString;

===================== End =====================
Loading