@herb-tools/formatter 0.4.2 → 0.4.3

package/src/printer.ts

@@ -70,8 +70,16 @@ export class Printer extends Visitor {
   private inlineMode: boolean = false
   private isInComplexNesting: boolean = false
 
+  private static readonly INLINE_ELEMENTS = new Set([
+    'a', 'abbr', 'acronym', 'b', 'bdo', 'big', 'br', 'cite', 'code',
+    'dfn', 'em', 'i', 'img', 'kbd', 'label', 'map', 'object', 'q',
+    'samp', 'small', 'span', 'strong', 'sub', 'sup',
+    'tt', 'var', 'del', 'ins', 'mark', 's', 'u', 'time', 'wbr'
+  ])
+
   constructor(source: string, options: Required<FormatOptions>) {
     super()
+
     this.source = source
     this.indentWidth = options.indentWidth
     this.maxLineLength = options.maxLineLength
@@ -94,7 +102,7 @@ export class Printer extends Visitor {
       this.visit(node)
     }
 
-    return this.lines.filter(Boolean).join("\n")
+    return this.lines.join("\n")
   }
 
   private push(line: string) {
@@ -105,6 +113,7 @@ export class Printer extends Visitor {
     this.indentLevel++
     const result = callback()
     this.indentLevel--
+
     return result
   }
 
@@ -112,30 +121,188 @@ export class Printer extends Visitor {
     return " ".repeat(this.indentLevel * this.indentWidth)
   }
 
+  /**
+   * Format ERB content with proper spacing around the inner content.
+   * Returns empty string if content is empty, otherwise wraps content with single spaces.
+   */
+  private formatERBContent(content: string): string {
+    return content.trim() ? ` ${content.trim()} ` : ""
+  }
+
+  /**
+   * Check if a node is an ERB control flow node (if, unless, block, case, while, for)
+   */
+  private isERBControlFlow(node: Node): boolean {
+    return node instanceof ERBIfNode || (node as any).type === 'AST_ERB_IF_NODE' ||
+      node instanceof ERBUnlessNode || (node as any).type === 'AST_ERB_UNLESS_NODE' ||
+      node instanceof ERBBlockNode || (node as any).type === 'AST_ERB_BLOCK_NODE' ||
+      node instanceof ERBCaseNode || (node as any).type === 'AST_ERB_CASE_NODE' ||
+      node instanceof ERBCaseMatchNode || (node as any).type === 'AST_ERB_CASE_MATCH_NODE' ||
+      node instanceof ERBWhileNode || (node as any).type === 'AST_ERB_WHILE_NODE' ||
+      node instanceof ERBForNode || (node as any).type === 'AST_ERB_FOR_NODE'
+  }
+
+  /**
+   * Count total attributes including those inside ERB conditionals
+   */
+  private getTotalAttributeCount(attributes: HTMLAttributeNode[], inlineNodes: Node[] = []): number {
+    let totalAttributeCount = attributes.length
+
+    inlineNodes.forEach(node => {
+      if (this.isERBControlFlow(node)) {
+        const erbNode = node as any
+        if (erbNode.statements) {
+          totalAttributeCount += erbNode.statements.length
+        }
+      }
+    })
+
+    return totalAttributeCount
+  }
+
+  /**
+   * Extract HTML attributes from a list of nodes
+   */
+  private extractAttributes(nodes: Node[]): HTMLAttributeNode[] {
+    return nodes.filter((child): child is HTMLAttributeNode =>
+      child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE'
+    )
+  }
+
+  /**
+   * Extract inline nodes (non-attribute, non-whitespace) from a list of nodes
+   */
+  private extractInlineNodes(nodes: Node[]): Node[] {
+    return nodes.filter(child =>
+      !(child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE') &&
+      !(child instanceof WhitespaceNode || (child as any).type === 'AST_WHITESPACE_NODE')
+    )
+  }
+
+  /**
+   * Render attributes as a space-separated string
+   */
+  private renderAttributesString(attributes: HTMLAttributeNode[]): string {
+    if (attributes.length === 0) return ""
+    return ` ${attributes.map(attr => this.renderAttribute(attr)).join(" ")}`
+  }
+
+  /**
+   * Determine if a tag should be rendered inline based on attribute count and other factors
+   */
+  private shouldRenderInline(
+    totalAttributeCount: number,
+    inlineLength: number,
+    indentLength: number,
+    maxLineLength: number = this.maxLineLength,
+    hasComplexERB: boolean = false,
+    nestingDepth: number = 0,
+    inlineNodesLength: number = 0
+  ): boolean {
+    if (hasComplexERB) return false
+
+    // Special case: no attributes at all, always inline if it fits
+    if (totalAttributeCount === 0) {
+      return inlineLength + indentLength <= maxLineLength
+    }
+
+    const basicInlineCondition = totalAttributeCount <= 3 &&
+                                 inlineLength + indentLength <= maxLineLength
+
+    const erbInlineCondition = inlineNodesLength > 0 && totalAttributeCount <= 3
+
+    return basicInlineCondition || erbInlineCondition
+  }
+
+  /**
+   * Render multiline attributes for a tag
+   */
+  private renderMultilineAttributes(
+    tagName: string,
+    attributes: HTMLAttributeNode[],
+    inlineNodes: Node[] = [],
+    allChildren: Node[] = [],
+    isSelfClosing: boolean = false,
+    isVoid: boolean = false,
+    hasBodyContent: boolean = false
+  ): void {
+    const indent = this.indent()
+    this.push(indent + `<${tagName}`)
+
+    this.withIndent(() => {
+      // Render children in order, handling both attributes and ERB nodes
+      allChildren.forEach(child => {
+        if (child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE') {
+          this.push(this.indent() + this.renderAttribute(child as HTMLAttributeNode))
+        } else if (!(child instanceof WhitespaceNode || (child as any).type === 'AST_WHITESPACE_NODE')) {
+          this.visit(child)
+        }
+      })
+    })
+
+    if (isSelfClosing) {
+      this.push(indent + "/>")
+    } else if (isVoid) {
+      this.push(indent + ">")
+    } else if (!hasBodyContent) {
+      this.push(indent + `></${tagName}>`)
+    } else {
+      this.push(indent + ">")
+    }
+  }
+
   /**
    * Print an ERB tag (<% %> or <%= %>) with single spaces around inner content.
    */
   private printERBNode(node: ERBNode): void {
-    const indent = this.indent()
+    const indent = this.inlineMode ? "" : this.indent()
     const open = node.tag_opening?.value ?? ""
     const close = node.tag_closing?.value ?? ""
-    let inner: string
-    if (node.tag_opening && node.tag_closing) {
-      const [, openingEnd] = node.tag_opening.range.toArray()
-      const [closingStart] = node.tag_closing.range.toArray()
-      const rawInner = this.source.slice(openingEnd, closingStart)
-      inner = ` ${rawInner.trim()} `
-    } else {
-      const txt = node.content?.value ?? ""
-      inner = txt.trim() ? ` ${txt.trim()} ` : ""
-    }
+    const content = node.content?.value ?? ""
+    const inner = this.formatERBContent(content)
+
     this.push(indent + open + inner + close)
   }
 
   // --- Visitor methods ---
 
   visitDocumentNode(node: DocumentNode): void {
-    node.children.forEach(child => this.visit(child))
+    let lastWasMeaningful = false
+    let hasHandledSpacing = false
+
+    for (let i = 0; i < node.children.length; i++) {
+      const child = node.children[i]
+
+      if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') {
+        const textNode = child as HTMLTextNode
+        const isWhitespaceOnly = textNode.content.trim() === ""
+
+        if (isWhitespaceOnly) {
+          const hasPrevNonWhitespace = i > 0 && this.isNonWhitespaceNode(node.children[i - 1])
+          const hasNextNonWhitespace = i < node.children.length - 1 && this.isNonWhitespaceNode(node.children[i + 1])
+
+          const hasMultipleNewlines = textNode.content.includes('\n\n')
+
+          if (hasPrevNonWhitespace && hasNextNonWhitespace && hasMultipleNewlines) {
+            this.push("")
+            hasHandledSpacing = true
+          }
+
+          continue
+        }
+      }
+
+      if (this.isNonWhitespaceNode(child) && lastWasMeaningful && !hasHandledSpacing) {
+        this.push("")
+      }
+
+      this.visit(child)
+
+      if (this.isNonWhitespaceNode(child)) {
+        lastWasMeaningful = true
+        hasHandledSpacing = false
+      }
+    }
   }
 
   visitHTMLElementNode(node: HTMLElementNode): void {
@@ -143,21 +310,31 @@ export class Printer extends Visitor {
     const tagName = open.tag_name?.value ?? ""
     const indent = this.indent()
 
-    const attributes = open.children.filter((child): child is HTMLAttributeNode =>
-      child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE'
-    )
 
-    const inlineNodes = open.children.filter(child =>
-      !(child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE') &&
-      !(child instanceof WhitespaceNode || (child as any).type === 'AST_WHITESPACE_NODE')
-    )
+    const attributes = this.extractAttributes(open.children)
+    const inlineNodes = this.extractInlineNodes(open.children)
 
-    const children = node.body.filter(
-      child =>
-        !(child instanceof WhitespaceNode || (child as any).type === 'AST_WHITESPACE_NODE') &&
-        !((child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') && (child as any)?.content.trim() === ""),
-    )
+    const hasTextFlow = this.isInTextFlowContext(null, node.body)
+
+    const children = node.body.filter(child => {
+      if (child instanceof WhitespaceNode || (child as any).type === 'AST_WHITESPACE_NODE') {
+        return false
+      }
+
+      if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') {
+        const content = (child as HTMLTextNode).content
+
+        if (hasTextFlow && content === " ") {
+          return true
+        }
+
+        return content.trim() !== ""
+      }
+
+      return true
+    })
 
+    const isInlineElement = this.isInlineElement(tagName)
     const hasClosing = open.tag_closing?.value === ">" || open.tag_closing?.value === "/>"
     const isSelfClosing = open.tag_closing?.value === "/>"
 
@@ -191,15 +368,59 @@ export class Printer extends Visitor {
 
               if (!textContent.includes('\n') && (indent.length + singleLine.length) <= this.maxLineLength) {
                 this.push(indent + singleLine)
+
                 return
               }
             }
           }
         } else {
-          const inlineResult = this.tryRenderInline(children, tagName)
+          const inlineResult = this.tryRenderInline(children, tagName, 0, false, hasTextFlow)
 
           if (inlineResult && (indent.length + inlineResult.length) <= this.maxLineLength) {
             this.push(indent + inlineResult)
+
+            return
+          }
+
+          if (hasTextFlow) {
+            const hasAnyNewlines = children.some(child => {
+              if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') {
+                return (child as HTMLTextNode).content.includes('\n')
+              }
+
+              return false
+            })
+
+            if (!hasAnyNewlines) {
+              const fullInlineResult = this.tryRenderInlineFull(node, tagName, attributes, children)
+
+              if (fullInlineResult) {
+                const totalLength = indent.length + fullInlineResult.length
+                const maxNesting = this.getMaxNestingDepth(children, 0)
+                const maxInlineLength = maxNesting <= 1 ? this.maxLineLength : 60
+
+                if (totalLength <= maxInlineLength) {
+                  this.push(indent + fullInlineResult)
+
+                  return
+                }
+              }
+            }
+          }
+        }
+      }
+
+      if (hasTextFlow) {
+        const fullInlineResult = this.tryRenderInlineFull(node, tagName, [], children)
+
+        if (fullInlineResult) {
+          const totalLength = indent.length + fullInlineResult.length
+          const maxNesting = this.getMaxNestingDepth(children, 0)
+          const maxInlineLength = maxNesting <= 1 ? this.maxLineLength : 60
+
+          if (totalLength <= maxInlineLength) {
+            this.push(indent + fullInlineResult)
+
             return
           }
         }
@@ -208,7 +429,11 @@ export class Printer extends Visitor {
       this.push(indent + `<${tagName}>`)
 
       this.withIndent(() => {
-        children.forEach(child => this.visit(child))
+        if (hasTextFlow) {
+          this.visitTextFlowChildren(children)
+        } else {
+          children.forEach(child => this.visit(child))
+        }
       })
 
       if (!node.is_void && !isSelfClosing) {
@@ -242,25 +467,41 @@ export class Printer extends Visitor {
       return
     }
 
-    const inline = this.renderInlineOpen(tagName, attributes, isSelfClosing, inlineNodes, open.children)
-    const singleAttribute = attributes[0]
-    const hasEmptyValue =
-      singleAttribute &&
-      (singleAttribute.value instanceof HTMLAttributeValueNode || (singleAttribute.value as any)?.type === 'AST_HTML_ATTRIBUTE_VALUE_NODE') &&
-      (singleAttribute.value as any)?.children.length === 0
+    const hasERBControlFlow = inlineNodes.some(node => this.isERBControlFlow(node)) ||
+                             open.children.some(node => this.isERBControlFlow(node))
 
-    const hasERBControlFlow = inlineNodes.some(node =>
-      node instanceof ERBIfNode || (node as any).type === 'AST_ERB_IF_NODE' ||
-      node instanceof ERBUnlessNode || (node as any).type === 'AST_ERB_UNLESS_NODE' ||
-      node instanceof ERBBlockNode || (node as any).type === 'AST_ERB_BLOCK_NODE' ||
-      node instanceof ERBCaseNode || (node as any).type === 'AST_ERB_CASE_NODE' ||
-      node instanceof ERBWhileNode || (node as any).type === 'AST_ERB_WHILE_NODE' ||
-      node instanceof ERBForNode || (node as any).type === 'AST_ERB_FOR_NODE'
+    const hasComplexERB = hasERBControlFlow && inlineNodes.some(node => {
+      if (node instanceof ERBIfNode || (node as any).type === 'AST_ERB_IF_NODE') {
+        const erbNode = node as ERBIfNode
+
+        if (erbNode.statements.length > 0 && erbNode.location) {
+          const startLine = erbNode.location.start.line
+          const endLine = erbNode.location.end.line
+
+          return startLine !== endLine
+        }
+
+        return false
+      }
+
+      return false
+    })
+
+    const inline = hasComplexERB ? "" : this.renderInlineOpen(tagName, attributes, isSelfClosing, inlineNodes, open.children)
+    const nestingDepth = this.getMaxNestingDepth(children, 0)
+    const totalAttributeCount = this.getTotalAttributeCount(attributes, inlineNodes)
+
+    const shouldKeepInline = this.shouldRenderInline(
+      totalAttributeCount,
+      inline.length,
+      indent.length,
+      this.maxLineLength,
+      hasComplexERB,
+      nestingDepth,
+      inlineNodes.length
     )
 
-    const shouldKeepInline = (attributes.length <= 3 &&
-                            inline.length + indent.length <= this.maxLineLength) ||
-                            (inlineNodes.length > 0 && !hasERBControlFlow)
+
 
     if (shouldKeepInline) {
       if (children.length === 0) {
@@ -269,7 +510,69 @@ export class Printer extends Visitor {
         } else if (node.is_void) {
           this.push(indent + inline)
         } else {
-          this.push(indent + inline.replace('>', `></${tagName}>`))
+          let result = `<${tagName}`
+
+          result += this.renderAttributesString(attributes)
+
+          if (inlineNodes.length > 0) {
+            const currentIndentLevel = this.indentLevel
+            this.indentLevel = 0
+            const tempLines = this.lines
+            this.lines = []
+
+            inlineNodes.forEach(node => {
+              const wasInlineMode = this.inlineMode
+
+              if (!this.isERBControlFlow(node)) {
+                this.inlineMode = true
+              }
+
+              this.visit(node)
+              this.inlineMode = wasInlineMode
+            })
+
+            const inlineContent = this.lines.join("")
+
+            this.lines = tempLines
+            this.indentLevel = currentIndentLevel
+
+            result += inlineContent
+          }
+
+          result += `></${tagName}>`
+          this.push(indent + result)
+        }
+
+        return
+      }
+
+      if (isInlineElement && children.length > 0 && !hasERBControlFlow) {
+        const fullInlineResult = this.tryRenderInlineFull(node, tagName, attributes, children)
+
+        if (fullInlineResult) {
+          const totalLength = indent.length + fullInlineResult.length
+
+          if (totalLength <= this.maxLineLength || totalLength <= 120) {
+            this.push(indent + fullInlineResult)
+
+            return
+          }
+        }
+      }
+
+      if (!isInlineElement && children.length > 0 && !hasERBControlFlow) {
+        this.push(indent + inline)
+
+        this.withIndent(() => {
+          if (hasTextFlow) {
+            this.visitTextFlowChildren(children)
+          } else {
+            children.forEach(child => this.visit(child))
+          }
+        })
+
+        if (!node.is_void && !isSelfClosing) {
+          this.push(indent + `</${tagName}>`)
         }
 
         return
@@ -282,7 +585,11 @@ export class Printer extends Visitor {
       }
 
       this.withIndent(() => {
-        children.forEach(child => this.visit(child))
+        if (hasTextFlow) {
+          this.visitTextFlowChildren(children)
+        } else {
+          children.forEach(child => this.visit(child))
+        }
       })
 
       if (!node.is_void && !isSelfClosing) {
@@ -293,25 +600,9 @@ export class Printer extends Visitor {
     }
 
     if (inlineNodes.length > 0 && hasERBControlFlow) {
-      this.push(indent + `<${tagName}`)
-      this.withIndent(() => {
-        open.children.forEach(child => {
-          if (child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE') {
-            this.push(this.indent() + this.renderAttribute(child as HTMLAttributeNode))
-          } else if (!(child instanceof WhitespaceNode || (child as any).type === 'AST_WHITESPACE_NODE')) {
-            this.visit(child)
-          }
-        })
-      })
+      this.renderMultilineAttributes(tagName, attributes, inlineNodes, open.children, isSelfClosing, node.is_void, children.length > 0)
 
-      if (isSelfClosing) {
-        this.push(indent + "/>")
-      } else if (node.is_void) {
-        this.push(indent + ">")
-      } else if (children.length === 0) {
-        this.push(indent + ">" + `</${tagName}>`)
-      } else {
-        this.push(indent + ">")
+      if (!isSelfClosing && !node.is_void && children.length > 0) {
         this.withIndent(() => {
           children.forEach(child => this.visit(child))
         })
@@ -327,24 +618,42 @@ export class Printer extends Visitor {
         this.push(indent + `</${tagName}>`)
       }
     } else {
-      this.push(indent + `<${tagName}`)
-      this.withIndent(() => {
-        attributes.forEach(attribute => {
-          this.push(this.indent() + this.renderAttribute(attribute))
-        })
-      })
+      if (isInlineElement && children.length > 0) {
+        const fullInlineResult = this.tryRenderInlineFull(node, tagName, attributes, children)
 
-      if (isSelfClosing) {
-        this.push(indent + "/>")
-      } else if (node.is_void) {
-        this.push(indent + ">")
-      } else if (children.length === 0) {
-        this.push(indent + ">" + `</${tagName}>`)
-      } else {
-        this.push(indent + ">")
+        if (fullInlineResult) {
+          const totalLength = indent.length + fullInlineResult.length
+
+          if (totalLength <= this.maxLineLength || totalLength <= 120) {
+            this.push(indent + fullInlineResult)
+            return
+          }
+        }
+      }
 
+      if (isInlineElement && children.length === 0) {
+        let result = `<${tagName}`
+        result += this.renderAttributesString(attributes)
+        if (isSelfClosing) {
+          result += " />"
+        } else if (node.is_void) {
+          result += ">"
+        } else {
+          result += `></${tagName}>`
+        }
+        this.push(indent + result)
+        return
+      }
+
+      this.renderMultilineAttributes(tagName, attributes, inlineNodes, open.children, isSelfClosing, node.is_void, children.length > 0)
+
+      if (!isSelfClosing && !node.is_void && children.length > 0) {
         this.withIndent(() => {
-          children.forEach(child => this.visit(child))
+          if (hasTextFlow) {
+            this.visitTextFlowChildren(children)
+          } else {
+            children.forEach(child => this.visit(child))
+          }
         })
 
         this.push(indent + `</${tagName}>`)
@@ -355,9 +664,8 @@ export class Printer extends Visitor {
   visitHTMLOpenTagNode(node: HTMLOpenTagNode): void {
     const tagName = node.tag_name?.value ?? ""
     const indent = this.indent()
-    const attributes = node.children.filter((attribute): attribute is HTMLAttributeNode =>
-      attribute instanceof HTMLAttributeNode || (attribute as any).type === 'AST_HTML_ATTRIBUTE_NODE'
-    )
+    const attributes = this.extractAttributes(node.children)
+    const inlineNodes = this.extractInlineNodes(node.children)
 
     const hasClosing = node.tag_closing?.value === ">"
 
@@ -366,52 +674,53 @@ export class Printer extends Visitor {
       return
     }
 
-    const inline = this.renderInlineOpen(tagName, attributes, node.is_void)
+    const inline = this.renderInlineOpen(tagName, attributes, node.is_void, inlineNodes, node.children)
+    const totalAttributeCount = this.getTotalAttributeCount(attributes, inlineNodes)
+    const shouldKeepInline = this.shouldRenderInline(
+      totalAttributeCount,
+      inline.length,
+      indent.length,
+      this.maxLineLength,
+      false,
+      0,
+      inlineNodes.length
+    )
 
-    if (attributes.length === 0 || inline.length + indent.length <= this.maxLineLength) {
+    if (shouldKeepInline) {
       this.push(indent + inline)
 
       return
     }
 
-    this.push(indent + `<${tagName}`)
-    this.withIndent(() => {
-      attributes.forEach(attribute => {
-        this.push(this.indent() + this.renderAttribute(attribute))
-      })
-    })
-    this.push(indent + (node.is_void ? "/>" : ">"))
+    this.renderMultilineAttributes(tagName, attributes, inlineNodes, node.children, false, node.is_void, false)
   }
 
   visitHTMLSelfCloseTagNode(node: HTMLSelfCloseTagNode): void {
     const tagName = node.tag_name?.value ?? ""
     const indent = this.indent()
-    const attributes = node.attributes.filter((attribute): attribute is HTMLAttributeNode =>
-      attribute instanceof HTMLAttributeNode || (attribute as any).type === 'AST_HTML_ATTRIBUTE_NODE'
-    )
-    const inline = this.renderInlineOpen(tagName, attributes, true)
-
-    const singleAttribute = attributes[0]
-    const hasEmptyValue =
-      singleAttribute &&
-      (singleAttribute.value instanceof HTMLAttributeValueNode || (singleAttribute.value as any)?.type === 'AST_HTML_ATTRIBUTE_VALUE_NODE') &&
-      (singleAttribute.value as any)?.children.length === 0
 
-    const shouldKeepInline = attributes.length <= 3 &&
-                            inline.length + indent.length <= this.maxLineLength
+    const attributes = this.extractAttributes(node.attributes)
+    const inlineNodes = this.extractInlineNodes(node.attributes)
+
+    const inline = this.renderInlineOpen(tagName, attributes, true, inlineNodes, node.attributes)
+    const totalAttributeCount = this.getTotalAttributeCount(attributes, inlineNodes)
+    const shouldKeepInline = this.shouldRenderInline(
+      totalAttributeCount,
+      inline.length,
+      indent.length,
+      this.maxLineLength,
+      false,
+      0,
+      inlineNodes.length
+    )
 
     if (shouldKeepInline) {
       this.push(indent + inline)
+
       return
     }
 
-    this.push(indent + `<${tagName}`)
-    this.withIndent(() => {
-      attributes.forEach(attribute => {
-        this.push(this.indent() + this.renderAttribute(attribute))
-      })
-    })
-    this.push(indent + "/>")
+    this.renderMultilineAttributes(tagName, attributes, inlineNodes, node.attributes, true, false, false)
   }
 
   visitHTMLCloseTagNode(node: HTMLCloseTagNode): void {
@@ -424,6 +733,16 @@ export class Printer extends Visitor {
   }
 
   visitHTMLTextNode(node: HTMLTextNode): void {
+    if (this.inlineMode) {
+      const normalizedContent = node.content.replace(/\s+/g, ' ').trim()
+
+      if (normalizedContent) {
+        this.push(normalizedContent)
+      }
+
+      return
+    }
+
     const indent = this.indent()
     let text = node.content.trim()
 
@@ -464,16 +783,21 @@ export class Printer extends Visitor {
     const indent = this.indent()
     const open_quote = node.open_quote?.value ?? ""
     const close_quote = node.close_quote?.value ?? ""
+
     const attribute_value = node.children.map(child => {
       if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE' ||
           child instanceof LiteralNode || (child as any).type === 'AST_LITERAL_NODE') {
+
         return (child as HTMLTextNode | LiteralNode).content
       } else if (child instanceof ERBContentNode || (child as any).type === 'AST_ERB_CONTENT_NODE') {
         const erbChild = child as ERBContentNode
+
         return (erbChild.tag_opening!.value + erbChild.content!.value + erbChild.tag_closing!.value)
       }
+
       return ""
     }).join("")
+
     this.push(indent + open_quote + attribute_value + close_quote)
   }
 
@@ -572,10 +896,19 @@ export class Printer extends Visitor {
 
   visitERBInNode(node: ERBInNode): void {
     this.printERBNode(node)
+
+    this.withIndent(() => {
+      node.statements.forEach(stmt => this.visit(stmt))
+    })
   }
 
   visitERBCaseMatchNode(node: ERBCaseMatchNode): void {
     this.printERBNode(node)
+
+    node.conditions.forEach(condition => this.visit(condition))
+
+    if (node.else_clause) this.visit(node.else_clause)
+    if (node.end_node) this.visit(node.end_node)
   }
 
   visitERBBlockNode(node: ERBBlockNode): void {
@@ -600,26 +933,21 @@ export class Printer extends Visitor {
       const open = node.tag_opening?.value ?? ""
       const content = node.content?.value ?? ""
       const close = node.tag_closing?.value ?? ""
+      const inner = this.formatERBContent(content)
 
-      this.lines.push(open + content + close)
+      this.lines.push(open + inner + close)
 
-      if (node.statements.length > 0) {
+      node.statements.forEach((child, _index) => {
         this.lines.push(" ")
-      }
 
-      node.statements.forEach((child, index) => {
         if (child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE') {
           this.lines.push(this.renderAttribute(child as HTMLAttributeNode))
         } else {
           this.visit(child)
         }
-
-        if (index < node.statements.length - 1) {
-          this.lines.push(" ")
-        }
       })
 
-      if (node.statements.length > 0) {
+      if (node.statements.length > 0 && node.end_node) {
         this.lines.push(" ")
       }
 
@@ -632,8 +960,9 @@ export class Printer extends Visitor {
         const endOpen = endNode.tag_opening?.value ?? ""
         const endContent = endNode.content?.value ?? ""
         const endClose = endNode.tag_closing?.value ?? ""
+        const endInner = this.formatERBContent(endContent)
 
-        this.lines.push(endOpen + endContent + endClose)
+        this.lines.push(endOpen + endInner + endClose)
       }
     } else {
       this.printERBNode(node)
@@ -669,11 +998,11 @@ export class Printer extends Visitor {
   }
 
   visitERBCaseNode(node: ERBCaseNode): void {
-    const baseLevel = this.indentLevel
     const indent = this.indent()
     const open = node.tag_opening?.value ?? ""
     const content = node.content?.value ?? ""
     const close = node.tag_closing?.value ?? ""
+
     this.push(indent + open + content + close)
 
     node.conditions.forEach(condition => this.visit(condition))
@@ -746,6 +1075,186 @@ export class Printer extends Visitor {
 
   // --- Utility methods ---
 
+  private isNonWhitespaceNode(node: Node): boolean {
+    if (node instanceof HTMLTextNode || (node as any).type === 'AST_HTML_TEXT_NODE') {
+      return (node as HTMLTextNode).content.trim() !== ""
+    }
+
+    if (node instanceof WhitespaceNode || (node as any).type === 'AST_WHITESPACE_NODE') {
+      return false
+    }
+
+    return true
+  }
+
+  /**
+   * Check if an element should be treated as inline based on its tag name
+   */
+  private isInlineElement(tagName: string): boolean {
+    return Printer.INLINE_ELEMENTS.has(tagName.toLowerCase())
+  }
+
+  /**
+   * Check if we're in a text flow context (parent contains mixed text and inline elements)
+   */
+  private visitTextFlowChildren(children: Node[]): void {
+    const indent = this.indent()
+    let currentLineContent = ""
+
+    for (const child of children) {
+      if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') {
+        const content = (child as HTMLTextNode).content
+
+        let processedContent = content.replace(/\s+/g, ' ').trim()
+
+        if (processedContent) {
+          const hasLeadingSpace = /^\s/.test(content)
+
+          if (currentLineContent && hasLeadingSpace && !currentLineContent.endsWith(' ')) {
+            currentLineContent += ' '
+          }
+
+          currentLineContent += processedContent
+
+          const hasTrailingSpace = /\s$/.test(content)
+
+          if (hasTrailingSpace && !currentLineContent.endsWith(' ')) {
+            currentLineContent += ' '
+          }
+
+          if ((indent.length + currentLineContent.length) > Math.max(this.maxLineLength, 120)) {
+            this.visitTextFlowChildrenMultiline(children)
+
+            return
+          }
+        }
+      } else if (child instanceof HTMLElementNode || (child as any).type === 'AST_HTML_ELEMENT_NODE') {
+        const element = child as HTMLElementNode
+        const openTag = element.open_tag as HTMLOpenTagNode
+        const childTagName = openTag?.tag_name?.value || ''
+
+        if (this.isInlineElement(childTagName)) {
+          const childInline = this.tryRenderInlineFull(element, childTagName,
+            this.extractAttributes(openTag.children),
+            element.body.filter(c => !(c instanceof WhitespaceNode || (c as any).type === 'AST_WHITESPACE_NODE') &&
+              !((c instanceof HTMLTextNode || (c as any).type === 'AST_HTML_TEXT_NODE') && (c as any)?.content.trim() === "")))
+
+          if (childInline) {
+            currentLineContent += childInline
+
+            if ((indent.length + currentLineContent.length) > this.maxLineLength) {
+              this.visitTextFlowChildrenMultiline(children)
+
+              return
+            }
+          } else {
+            if (currentLineContent.trim()) {
+              this.push(indent + currentLineContent.trim())
+              currentLineContent = ""
+            }
+
+            this.visit(child)
+          }
+        } else {
+          if (currentLineContent.trim()) {
+            this.push(indent + currentLineContent.trim())
+            currentLineContent = ""
+          }
+
+          this.visit(child)
+        }
+      } else if (child instanceof ERBContentNode || (child as any).type === 'AST_ERB_CONTENT_NODE') {
+        const oldLines = this.lines
+        const oldInlineMode = this.inlineMode
+
+        try {
+          this.lines = []
+          this.inlineMode = true
+          this.visit(child)
+          const erbContent = this.lines.join("")
+          currentLineContent += erbContent
+
+          if ((indent.length + currentLineContent.length) > Math.max(this.maxLineLength, 120)) {
+            this.visitTextFlowChildrenMultiline(children)
+
+            return
+          }
+        } finally {
+          this.lines = oldLines
+          this.inlineMode = oldInlineMode
+        }
+      } else {
+        if (currentLineContent.trim()) {
+          this.push(indent + currentLineContent.trim())
+          currentLineContent = ""
+        }
+
+        this.visit(child)
+      }
+    }
+
+    if (currentLineContent.trim()) {
+      const finalLine = indent + currentLineContent.trim()
+      if (finalLine.length > Math.max(this.maxLineLength, 120)) {
+        this.visitTextFlowChildrenMultiline(children)
+
+        return
+      }
+      this.push(finalLine)
+    }
+  }
+
+  private visitTextFlowChildrenMultiline(children: Node[]): void {
+    children.forEach(child => this.visit(child))
+  }
+
+  private isInTextFlowContext(parent: Node | null, children: Node[]): boolean {
+    const hasTextContent = children.some(child =>
+      (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') &&
+      (child as HTMLTextNode).content.trim() !== ""
+    )
+
+    if (!hasTextContent) {
+      return false
+    }
+
+    const nonTextChildren = children.filter(child =>
+      !(child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE')
+    )
+
+    if (nonTextChildren.length === 0) {
+      return false
+    }
+
+    const allInline = nonTextChildren.every(child => {
+      if (child instanceof ERBContentNode || (child as any).type === 'AST_ERB_CONTENT_NODE') {
+        return true
+      }
+
+      if (child instanceof HTMLElementNode || (child as any).type === 'AST_HTML_ELEMENT_NODE') {
+        const element = child as HTMLElementNode
+        const openTag = element.open_tag as HTMLOpenTagNode
+        const tagName = openTag?.tag_name?.value || ''
+
+        return this.isInlineElement(tagName)
+      }
+
+      return false
+    })
+
+    if (!allInline) {
+      return false
+    }
+
+    const maxNestingDepth = this.getMaxNestingDepth(children, 0)
+
+    if (maxNestingDepth > 2) {
+      return false
+    }
+
+    return true
+  }
+
   private renderInlineOpen(name: string, attributes: HTMLAttributeNode[], selfClose: boolean, inlineNodes: Node[] = [], allChildren: Node[] = []): string {
     const parts = attributes.map(attribute => this.renderAttribute(attribute))
 
@@ -763,10 +1272,10 @@ export class Printer extends Visitor {
             this.lines.push(" " + this.renderAttribute(child as HTMLAttributeNode))
           } else if (!(child instanceof WhitespaceNode || (child as any).type === 'AST_WHITESPACE_NODE')) {
             const wasInlineMode = this.inlineMode
+
             this.inlineMode = true
 
             this.lines.push(" ")
-
             this.visit(child)
             this.inlineMode = wasInlineMode
           }
@@ -789,8 +1298,13 @@ export class Printer extends Visitor {
 
         inlineNodes.forEach(node => {
           const wasInlineMode = this.inlineMode
-          this.inlineMode = true
+
+          if (!this.isERBControlFlow(node)) {
+            this.inlineMode = true
+          }
+
           this.visit(node)
+
           this.inlineMode = wasInlineMode
         })
 
@@ -816,41 +1330,161 @@ export class Printer extends Visitor {
     let value = ""
 
     if (attribute.value && (attribute.value instanceof HTMLAttributeValueNode || (attribute.value as any)?.type === 'AST_HTML_ATTRIBUTE_VALUE_NODE')) {
-      const attrValue = attribute.value as HTMLAttributeValueNode
-      const open_quote = (attrValue.open_quote?.value ?? "")
-      const close_quote = (attrValue.close_quote?.value ?? "")
-      const attribute_value = attrValue.children.map((attr: any) => {
-        if (attr instanceof HTMLTextNode || (attr as any).type === 'AST_HTML_TEXT_NODE' || attr instanceof LiteralNode || (attr as any).type === 'AST_LITERAL_NODE') {
+      const attributeValue = attribute.value as HTMLAttributeValueNode
 
-          return (attr as HTMLTextNode | LiteralNode).content
-        } else if (attr instanceof ERBContentNode || (attr as any).type === 'AST_ERB_CONTENT_NODE') {
-          const erbAttr = attr as ERBContentNode
+      let open_quote = attributeValue.open_quote?.value ?? ""
+      let close_quote = attributeValue.close_quote?.value ?? ""
+      let htmlTextContent = ""
 
-          return (erbAttr.tag_opening!.value + erbAttr.content!.value + erbAttr.tag_closing!.value)
+      const content = attributeValue.children.map((child: Node) => {
+        if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE' || child instanceof LiteralNode || (child as any).type === 'AST_LITERAL_NODE') {
+          const textContent = (child as HTMLTextNode | LiteralNode).content
+          htmlTextContent += textContent
+
+          return textContent
+        } else if (child instanceof ERBContentNode || (child as any).type === 'AST_ERB_CONTENT_NODE') {
+          const erbAttribute = child as ERBContentNode
+
+          return erbAttribute.tag_opening!.value + erbAttribute.content!.value + erbAttribute.tag_closing!.value
         }
 
         return ""
       }).join("")
 
-      value = open_quote + attribute_value + close_quote
+      if (open_quote === "" && close_quote === "") {
+        open_quote = '"'
+        close_quote = '"'
+      } else if (open_quote === "'" && close_quote === "'" && !htmlTextContent.includes('"')) {
+        open_quote = '"'
+        close_quote = '"'
+      }
+
+      value = open_quote + content + close_quote
     }
 
     return name + equals + value
   }
 
+  /**
+   * Try to render a complete element inline including opening tag, children, and closing tag
+   */
+  private tryRenderInlineFull(node: HTMLElementNode, tagName: string, attributes: HTMLAttributeNode[], children: Node[]): string | null {
+    let result = `<${tagName}`
+
+    result += this.renderAttributesString(attributes)
+
+    result += ">"
+
+    const childrenContent = this.tryRenderChildrenInline(children)
+    if (!childrenContent) {
+      return null
+    }
+
+    result += childrenContent
+    result += `</${tagName}>`
+
+    return result
+  }
+
+  /**
+   * Try to render just the children inline (without tags)
+   */
+  private tryRenderChildrenInline(children: Node[]): string | null {
+    let result = ""
+
+    for (const child of children) {
+      if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') {
+        const content = (child as HTMLTextNode).content
+        const normalizedContent = content.replace(/\s+/g, ' ')
+        const hasLeadingSpace = /^\s/.test(content)
+        const hasTrailingSpace = /\s$/.test(content)
+        const trimmedContent = normalizedContent.trim()
+
+        if (trimmedContent) {
+          let finalContent = trimmedContent
+
+          if (hasLeadingSpace && result && !result.endsWith(' ')) {
+            finalContent = ' ' + finalContent
+          }
+
+          if (hasTrailingSpace) {
+            finalContent = finalContent + ' '
+          }
+
+          result += finalContent
+        } else if (hasLeadingSpace || hasTrailingSpace) {
+          if (result && !result.endsWith(' ')) {
+            result += ' '
+          }
+        }
+
+      } else if (child instanceof HTMLElementNode || (child as any).type === 'AST_HTML_ELEMENT_NODE') {
+        const element = child as HTMLElementNode
+        const openTag = element.open_tag as HTMLOpenTagNode
+        const childTagName = openTag?.tag_name?.value || ''
+
+        if (!this.isInlineElement(childTagName)) {
+          return null
+        }
+
+        const childInline = this.tryRenderInlineFull(element, childTagName,
+          this.extractAttributes(openTag.children),
+          element.body.filter(c => !(c instanceof WhitespaceNode || (c as any).type === 'AST_WHITESPACE_NODE') &&
+            !((c instanceof HTMLTextNode || (c as any).type === 'AST_HTML_TEXT_NODE') && (c as any)?.content.trim() === ""))
+        )
+
+        if (!childInline) {
+          return null
+        }
+
+        result += childInline
+      } else {
+        const oldLines = this.lines
+        const oldInlineMode = this.inlineMode
+        const oldIndentLevel = this.indentLevel
+
+        try {
+          this.lines = []
+          this.inlineMode = true
+          this.indentLevel = 0
+          this.visit(child)
+
+          result += this.lines.join("")
+        } finally {
+          this.lines = oldLines
+          this.inlineMode = oldInlineMode
+          this.indentLevel = oldIndentLevel
+        }
+      }
+    }
+
+    return result.trim()
+  }
+
   /**
    * Try to render children inline if they are simple enough.
    * Returns the inline string if possible, null otherwise.
    */
-  private tryRenderInline(children: Node[], tagName: string, depth: number = 0): string | null {
-    if (children.length > 10) {
+  private tryRenderInline(children: Node[], tagName: string, depth: number = 0, forceInline: boolean = false, hasTextFlow: boolean = false): string | null {
+    if (!forceInline && children.length > 10) {
       return null
     }
 
     const maxNestingDepth = this.getMaxNestingDepth(children, 0)
 
-    if (maxNestingDepth > 1) {
+    let maxAllowedDepth = forceInline ? 5 : (tagName && ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'div'].includes(tagName) ? 1 : 2)
+
+    if (hasTextFlow && maxNestingDepth >= 2) {
+      const roughContentLength = this.estimateContentLength(children)
+
+      if (roughContentLength > 47) {
+        maxAllowedDepth = 1
+      }
+    }
+
+    if (!forceInline && maxNestingDepth > maxAllowedDepth) {
       this.isInComplexNesting = true
+
       return null
     }
 
@@ -864,12 +1498,10 @@ export class Printer extends Visitor {
       } else if (child instanceof HTMLElementNode || (child as any).type === 'AST_HTML_ELEMENT_NODE') {
         const element = child as HTMLElementNode
         const openTag = element.open_tag as HTMLOpenTagNode
+        const elementTagName = openTag?.tag_name?.value || ''
+        const isInlineElement = this.isInlineElement(elementTagName)
 
-        const attributes = openTag.children.filter((child): child is HTMLAttributeNode =>
-          child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE'
-        )
-
-        if (attributes.length > 0) {
+        if (!isInlineElement) {
           return null
         }
 
@@ -897,13 +1529,9 @@ export class Printer extends Visitor {
           const openTag = element.open_tag as HTMLOpenTagNode
           const childTagName = openTag?.tag_name?.value || ''
 
-          const attributes = openTag.children.filter((child): child is HTMLAttributeNode =>
-            child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE'
-          )
+          const attributes = this.extractAttributes(openTag.children)
 
-          const attributesString = attributes.length > 0
-            ? ' ' + attributes.map(attr => this.renderAttribute(attr)).join(' ')
-            : ''
+          const attributesString = this.renderAttributesString(attributes)
 
           const elementContent = this.renderElementInline(element)
 
@@ -914,7 +1542,7 @@ export class Printer extends Visitor {
           const erbContent = erbNode.content?.value ?? ""
           const close = erbNode.tag_closing?.value ?? ""
 
-          content += `${open} ${erbContent.trim()} ${close}`
+          content += `${open}${this.formatERBContent(erbContent)}${close}`
         }
       }
 
@@ -928,6 +1556,29 @@ export class Printer extends Visitor {
     }
   }
 
+  /**
+   * Estimate the total content length of children nodes for decision making.
+   */
+  private estimateContentLength(children: Node[]): number {
+    let length = 0
+
+    for (const child of children) {
+      if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') {
+        length += (child as HTMLTextNode).content.length
+      } else if (child instanceof HTMLElementNode || (child as any).type === 'AST_HTML_ELEMENT_NODE') {
+        const element = child as HTMLElementNode
+        const openTag = element.open_tag as HTMLOpenTagNode
+        const tagName = openTag?.tag_name?.value || ''
+
+        length += tagName.length + 5 // Rough estimate for tag overhead
+        length += this.estimateContentLength(element.body)
+      } else if (child instanceof ERBContentNode || (child as any).type === 'AST_ERB_CONTENT_NODE') {
+        length += (child as ERBContentNode).content?.value.length || 0
+      }
+    }
+    return length
+  }
+
   /**
    * Calculate the maximum nesting depth in a subtree of nodes.
    */
@@ -962,6 +1613,7 @@ export class Printer extends Visitor {
     )
 
     let content = ''
+
     for (const child of children) {
       if (child instanceof HTMLTextNode || (child as any).type === 'AST_HTML_TEXT_NODE') {
         content += (child as HTMLTextNode).content
@@ -970,15 +1622,12 @@ export class Printer extends Visitor {
         const openTag = childElement.open_tag as HTMLOpenTagNode
         const childTagName = openTag?.tag_name?.value || ''
 
-        const attributes = openTag.children.filter((child): child is HTMLAttributeNode =>
-          child instanceof HTMLAttributeNode || (child as any).type === 'AST_HTML_ATTRIBUTE_NODE'
-        )
+        const attributes = this.extractAttributes(openTag.children)
 
-        const attributesString = attributes.length > 0
-          ? ' ' + attributes.map(attr => this.renderAttribute(attr)).join(' ')
-          : ''
+        const attributesString = this.renderAttributesString(attributes)
 
         const childContent = this.renderElementInline(childElement)
+
         content += `<${childTagName}${attributesString}>${childContent}</${childTagName}>`
       } else if (child instanceof ERBContentNode || (child as any).type === 'AST_ERB_CONTENT_NODE') {
         const erbNode = child as ERBContentNode
@@ -986,7 +1635,7 @@ export class Printer extends Visitor {
         const erbContent = erbNode.content?.value ?? ""
         const close = erbNode.tag_closing?.value ?? ""
 
-        content += `${open} ${erbContent.trim()} ${close}`
+        content += `${open}${this.formatERBContent(erbContent)}${close}`
       }
     }