Undo formatting changes

Author: thecrypticace

.gitignore

@@ -1,3 +1,2 @@
 node_modules
 /dist
-.DS_Store

src/index.ts

@@ -356,8 +356,8 @@ function transformLiquid(ast: any, { env }: TransformerContext) {
   }) {
     return Array.isArray(node.name)
       ? node.name.every(
-        (n) => n.type === 'TextNode' && staticAttrs.has(n.value),
-      )
+          (n) => n.type === 'TextNode' && staticAttrs.has(n.value),
+        )
       : staticAttrs.has(node.name)
   }
 
@@ -549,18 +549,18 @@ function sortTemplateLiteral(
     quasi.value.cooked = same
       ? quasi.value.raw
       : sortClasses(quasi.value.cooked, {
-        env,
-        ignoreFirst: i > 0 && !/^\s/.test(quasi.value.cooked),
-        ignoreLast:
-          i < node.expressions.length && !/\s$/.test(quasi.value.cooked),
-        collapseWhitespace: collapseWhitespace && {
-          start: collapseWhitespace && collapseWhitespace.start && i === 0,
-          end:
-            collapseWhitespace &&
-            collapseWhitespace.end &&
-            i >= node.expressions.length,
-        },
-      })
+          env,
+          ignoreFirst: i > 0 && !/^\s/.test(quasi.value.cooked),
+          ignoreLast:
+            i < node.expressions.length && !/\s$/.test(quasi.value.cooked),
+          collapseWhitespace: collapseWhitespace && {
+            start: collapseWhitespace && collapseWhitespace.start && i === 0,
+            end:
+              collapseWhitespace &&
+              collapseWhitespace.end &&
+              i >= node.expressions.length,
+          },
+        })
 
     if (
       quasi.value.raw !== originalRaw ||
@@ -846,23 +846,6 @@ function transformTwig(ast: any, { env, changes }: TransformerContext) {
 
     StringLiteral(node, path, meta) {
       if (!meta.sortTextNodes) {
-        // Check for .addClass() calls in Drupal Twig templates
-        const isAddClassCall = path.some((entry) => {
-          return (
-            entry.parent &&
-            entry.parent.type === 'CallExpression' &&
-            entry.parent.callee &&
-            entry.parent.callee.type === 'MemberExpression' &&
-            entry.parent.callee.property &&
-            entry.parent.callee.property.name === 'addClass'
-          )
-        })
-
-        if (isAddClassCall) {
-          node.value = sortClasses(node.value, { env })
-          return
-        }
-
         return
       }
 
@@ -969,12 +952,12 @@ function transformSvelte(ast: any, { env, changes }: TransformerContext) {
         value.data = same
           ? value.raw
           : sortClasses(value.data, {
-            env,
-            ignoreFirst: i > 0 && !/^\s/.test(value.data),
-            ignoreLast: i < attr.value.length - 1 && !/\s$/.test(value.data),
-            removeDuplicates: false,
-            collapseWhitespace: false,
-          })
+              env,
+              ignoreFirst: i > 0 && !/^\s/.test(value.data),
+              ignoreLast: i < attr.value.length - 1 && !/\s$/.test(value.data),
+              removeDuplicates: false,
+              collapseWhitespace: false,
+            })
       } else if (value.type === 'MustacheTag') {
         visit(value.expression, {
           Literal(node) {
@@ -1152,58 +1135,58 @@ export const parsers: Record<string, Parser> = {
 
   ...(base.parsers.svelte
     ? {
-      svelte: createParser('svelte', transformSvelte, {
-        staticAttrs: ['class'],
-      }),
-    }
+        svelte: createParser('svelte', transformSvelte, {
+          staticAttrs: ['class'],
+        }),
+      }
     : {}),
   ...(base.parsers.astro
     ? {
-      astro: createParser('astro', transformAstro, {
-        staticAttrs: ['class', 'className'],
-        dynamicAttrs: ['class:list', 'className'],
-      }),
-    }
+        astro: createParser('astro', transformAstro, {
+          staticAttrs: ['class', 'className'],
+          dynamicAttrs: ['class:list', 'className'],
+        }),
+      }
     : {}),
   ...(base.parsers.astroExpressionParser
     ? {
-      astroExpressionParser: createParser(
-        'astroExpressionParser',
-        transformJavaScript,
-        {
-          staticAttrs: ['class'],
-          dynamicAttrs: ['class:list'],
-        },
-      ),
-    }
+        astroExpressionParser: createParser(
+          'astroExpressionParser',
+          transformJavaScript,
+          {
+            staticAttrs: ['class'],
+            dynamicAttrs: ['class:list'],
+          },
+        ),
+      }
     : {}),
   ...(base.parsers.marko
     ? {
-      marko: createParser('marko', transformMarko, {
-        staticAttrs: ['class'],
-      }),
-    }
+        marko: createParser('marko', transformMarko, {
+          staticAttrs: ['class'],
+        }),
+      }
     : {}),
   ...(base.parsers.twig
     ? {
-      twig: createParser('twig', transformTwig, {
-        staticAttrs: ['class'],
-      }),
-    }
+        twig: createParser('twig', transformTwig, {
+          staticAttrs: ['class'],
+        }),
+      }
     : {}),
   ...(base.parsers.pug
     ? {
-      pug: createParser('pug', transformPug, {
-        staticAttrs: ['class'],
-      }),
-    }
+        pug: createParser('pug', transformPug, {
+          staticAttrs: ['class'],
+        }),
+      }
     : {}),
   ...(base.parsers['liquid-html']
     ? {
-      'liquid-html': createParser('liquid-html', transformLiquid, {
-        staticAttrs: ['class'],
-      }),
-    }
+        'liquid-html': createParser('liquid-html', transformLiquid, {
+          staticAttrs: ['class'],
+        }),
+      }
     : {}),
 }
 

tests/plugins.test.ts

@@ -235,7 +235,7 @@ let tests: PluginTest[] = [
             import './three'
             import '@one/file'
             import '@two/file'
-            export default function Foo() { return <div className="p-4 sm:p-0"></div> }
+            export default function Foo() { return <div className="sm:p-0 p-4"></div> }
           `,
           `import '@one/file'\nimport '@two/file'\n\nimport './three'\n\nexport default function Foo() {\n  return <div className="p-4 sm:p-0"></div>\n}`,
         ],
@@ -247,7 +247,7 @@ let tests: PluginTest[] = [
     tests: {
       babel: [
         [
-          `/**\n             * @param {  string   }    param0 description\n             */\n            export default function Foo(param0) { return <div className="p-4 sm:p-0"></div> }`,
+          `/**\n             * @param {  string   }    param0 description\n             */\n            export default function Foo(param0) { return <div className="sm:p-0 p-4"></div> }`,
           `/** @param {string} param0 Description */\nexport default function Foo(param0) {\n  return <div className="p-4 sm:p-0"></div>\n}`,
         ],
       ],