Improve canCollapseWhitespaceIn handling for tailwindPreserveWhitespace: true

Author: Dunqing

src/index.ts

@@ -108,7 +108,7 @@ function transformDynamicAngularAttribute(attr: any, env: TransformerEnv) {
     StringLiteral(node, path) {
       if (!node.value) return
 
-      let collapseWhitespace = canCollapseWhitespaceIn(path)
+      let collapseWhitespace = canCollapseWhitespaceIn(path, env)
 
       changes.push({
         start: node.start + 1,
@@ -124,7 +124,7 @@ function transformDynamicAngularAttribute(attr: any, env: TransformerEnv) {
     TemplateLiteral(node, path) {
       if (!node.quasis.length) return
 
-      let collapseWhitespace = canCollapseWhitespaceIn(path)
+      let collapseWhitespace = canCollapseWhitespaceIn(path, env)
 
       for (let i = 0; i < node.quasis.length; i++) {
         let quasi = node.quasis[i]
@@ -604,7 +604,14 @@ function isSortableExpression(
   return false
 }
 
-function canCollapseWhitespaceIn(path: Path<import('@babel/types').Node, any>) {
+function canCollapseWhitespaceIn(
+  path: Path<import('@babel/types').Node, any>,
+  env: TransformerEnv,
+): false | { start: boolean; end: boolean } {
+  if (env.options.tailwindPreserveWhitespace) {
+    return false
+  }
+
   let start = true
   let end = true
 
@@ -656,7 +663,7 @@ function transformJavaScript(ast: import('@babel/types').Node, { env }: Transfor
 
   function sortInside(ast: import('@babel/types').Node) {
     visit(ast, (node, path) => {
-      let collapseWhitespace = canCollapseWhitespaceIn(path)
+      let collapseWhitespace = canCollapseWhitespaceIn(path, env)
 
       if (isStringLiteral(node)) {
         sortStringLiteral(node, { env, collapseWhitespace })
@@ -712,7 +719,7 @@ function transformJavaScript(ast: import('@babel/types').Node, { env }: Transfor
         return
       }
 
-      let collapseWhitespace = canCollapseWhitespaceIn(path)
+      let collapseWhitespace = canCollapseWhitespaceIn(path, env)
 
       sortTemplateLiteral(node.quasi, {
         env,

src/sorting.ts

@@ -42,10 +42,6 @@ export function sortClasses(
     return classStr
   }
 
-  if (env.options.tailwindPreserveWhitespace) {
-    collapseWhitespace = false
-  }
-
   // This class list is purely whitespace
   // Collapse it to a single space if the option is enabled
   if (/^[\t\r\f\n ]+$/.test(classStr) && collapseWhitespace) {