Fix class attributes not counting towards attribute wrapping (#503)

src/printer.ts

@@ -829,6 +829,15 @@ export class PugPrinter {
         switch (tempToken.name) {
           case 'class':
           case 'id': {
+            // If classes or IDs are defined as attributes and not converted to literals, count them toward attribute wrapping.
+            if (
+              (tempToken.name === 'class' &&
+                this.options.pugClassNotation !== 'literal') ||
+              (tempToken.name === 'id' &&
+                this.options.pugIdNotation !== 'literal')
+            ) {
+              numNormalAttributes++;
+            }
             hasLiteralAttributes = true;
             const val: string = tempToken.val.toString();
             if (isQuoted(val)) {

tests/options/pugWrapAttributesThreshold/withAsIsClassNotation/formatted.pug

@@ -0,0 +1,10 @@
+div(class="class")
+div(
+  class="class",
+  attribute="value"
+)
+.class(attribute="value")
+.class(
+  attribute="value",
+  another-attribute="another value"
+)

tests/options/pugWrapAttributesThreshold/withAsIsClassNotation/unformatted.pug

@@ -0,0 +1,4 @@
+div(class="class")
+div(class="class" attribute="value")
+div.class(attribute="value")
+div.class(attribute="value" another-attribute="another value")

tests/options/pugWrapAttributesThreshold/withAsIsClassNotation/with-as-is-class-notation.test.ts

@@ -0,0 +1,17 @@
+import { compareFiles } from 'tests/common';
+import { describe, expect, it } from 'vitest';
+
+describe('Options', () => {
+  describe('pugWrapAttributesThreshold', () => {
+    it('should count attribute classes toward wrapping if pugClassNotation === as-is', async () => {
+      const { actual, expected } = await compareFiles(import.meta.url, {
+        formatOptions: {
+          pugWrapAttributesThreshold: 1,
+          pugClassNotation: 'as-is',
+        },
+      });
+
+      expect(actual).toBe(expected);
+    });
+  });
+});

tests/options/pugWrapAttributesThreshold/withAsIsIdNotation/formatted.pug

@@ -0,0 +1,10 @@
+div(id="foo")
+div(
+  id="foo",
+  attribute="value"
+)
+#foo(attribute="value")
+#foo(
+  attribute="value",
+  another-attribute="another value"
+)

tests/options/pugWrapAttributesThreshold/withAsIsIdNotation/unformatted.pug

@@ -0,0 +1,4 @@
+div(id="foo")
+div(id="foo" attribute="value")
+div#foo(attribute="value")
+div#foo(attribute="value" another-attribute="another value")

tests/options/pugWrapAttributesThreshold/withAsIsIdNotation/with-as-is-id-notation.test.ts

@@ -0,0 +1,17 @@
+import { compareFiles } from 'tests/common';
+import { describe, expect, it } from 'vitest';
+
+describe('Options', () => {
+  describe('pugWrapAttributesThreshold', () => {
+    it('should count attribute IDs toward wrapping if pugIdNotation === as-is', async () => {
+      const { actual, expected } = await compareFiles(import.meta.url, {
+        formatOptions: {
+          pugWrapAttributesThreshold: 1,
+          pugIdNotation: 'as-is',
+        },
+      });
+
+      expect(actual).toBe(expected);
+    });
+  });
+});

tests/options/pugWrapAttributesThreshold/withAttributeClassNotation/formatted.pug

@@ -0,0 +1,5 @@
+div(class="class")
+div(
+  class="class",
+  attribute="value"
+)

tests/options/pugWrapAttributesThreshold/withAttributeClassNotation/unformatted.pug

@@ -0,0 +1,2 @@
+div(class="class")
+div(class="class" attribute="value")

tests/options/pugWrapAttributesThreshold/withAttributeClassNotation/with-attribute-class-notation.test.ts

@@ -0,0 +1,17 @@
+import { compareFiles } from 'tests/common';
+import { describe, expect, it } from 'vitest';
+
+describe('Options', () => {
+  describe('pugWrapAttributesThreshold', () => {
+    it('should count attribute classes toward wrapping if pugClassNotation === attribute', async () => {
+      const { actual, expected } = await compareFiles(import.meta.url, {
+        formatOptions: {
+          pugWrapAttributesThreshold: 1,
+          pugClassNotation: 'attribute',
+        },
+      });
+
+      expect(actual).toBe(expected);
+    });
+  });
+});