test: this is not experimental feature

zackad · Dec 18, 2024 · e48f91d · e48f91d
1 parent 1aa277a
commit e48f91d
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 32 deletions.
diff --git a/src/index.js b/src/index.js
@@ -103,12 +103,6 @@ const options = {
         category: "Global",
         default: false,
         description: "Output the Twig block name in the 'endblock' tag"
-    },
-    experimentalMethodChainIndentation: {
-        type: "boolean",
-        category: "Global",
-        default: false,
-        description: "Experimental: Fix indentation for chained method call"
     }
 };
 

diff --git a/src/print/CallExpression.js b/src/print/CallExpression.js
@@ -22,8 +22,6 @@ const printCallExpression = (node, path, print) => {
         // Optimization: No line break between "(" and "{" if
         // there is exactly one object parameter
         parts.push(mappedArguments[0], ")");
-    } else if (options.experimentalMethodChainIndentation) {
-        parts.push(indent([join([", "], mappedArguments)]), ")");
     } else {
         parts.push(
             indent([softline, join([",", line], mappedArguments)]),

diff --git a/src/print/MemberExpression.js b/src/print/MemberExpression.js
@@ -5,19 +5,13 @@ import {
     wrapExpressionIfNeeded
 } from "../util/index.js";
 
-const { group, softline, indent } = doc.builders;
+const { group } = doc.builders;
 
 const printMemberExpression = (node, path, print) => {
     node[EXPRESSION_NEEDED] = false;
     node[STRING_NEEDS_QUOTES] = true;
     const parts = [path.call(print, "object")];
-    if (node.computed) {
-        parts.push("[");
-    } else if (options.experimentalMethodChainIndentation) {
-        parts.push(indent([softline, "."]));
-    } else {
-        parts.push(".");
-    }
+    parts.push(node.computed ? "[" : ".");
     parts.push(path.call(print, "property"));
     if (node.computed) {
         parts.push("]");

diff --git a/tests/Experimental/experimental.spec.js b/tests/Experimental/experimental.spec.js
diff --git a/...__snapshots__/chain_indentation.snap.twig → ...__snapshots__/chain_indentation.snap.twig b/...__snapshots__/chain_indentation.snap.twig → ...__snapshots__/chain_indentation.snap.twig
@@ -1,11 +1,25 @@
-<a class="task-edit"
+<a
+    class="task-edit"
     href="{{
         ea_url()
             .setDashboard('App\\Controller\\Dashboard\\DashboardController')
             .setController('App\\Controller\\Dashboard\\CRUD\\TacheCrudController')
             .setAction('edit')
             .setEntityId(tache.id)
             .set('sort', null)
-    }}">
+    }}"
+>
     <i class="fa-solid fa-edit"></i>
 </a>
+
+{{
+    craft
+        .entries
+        .section('news')
+        .section('news')
+        .orderBy('postDate DESC')
+        .limit(10)
+        .all(a.b)
+}}
+
+{{ craft.entries.all() }}
diff --git a/tests/Experimental/chain_indentation.twig → tests/Expressions/chain_indentation.twig b/tests/Experimental/chain_indentation.twig → tests/Expressions/chain_indentation.twig
diff --git a/tests/Expressions/jsfmt.spec.js b/tests/Expressions/jsfmt.spec.js
@@ -91,4 +91,14 @@ describe("Expressions", () => {
         });
         await expect(actual).toMatchFileSnapshot(snapshotFile);
     });
+
+    it("Properly indent chain method", async () => {
+        const { actual, snapshotFile } = await run_spec(import.meta.url, {
+            source: "chain_indentation.twig",
+            formatOptions: {
+                experimentalMethodChainIndentation: true
+            }
+        });
+        await expect(actual).toMatchFileSnapshot(snapshotFile);
+    });
 });