fix: multi-line decorators now behave appropriately

NullVoxPopuli · Mar 24, 2020 · c5bf6be · c5bf6be
1 parent 387a983
commit c5bf6be
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -51,6 +51,9 @@ jobs:
     - uses: volta-cli/action@v1
 
     - uses: wagoid/commitlint-github-action@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+
     # - run: yarn && volta install @commitlint/cli
     # - run: |
     #     git log --pretty=format:%B master...$GITHUB_REF

diff --git a/lib/rules/decorator-position.js b/lib/rules/decorator-position.js
@@ -183,7 +183,7 @@ function normalizeConfig(config, intent) {
 // ///////////////////////////////////
 
 function linePositioning(decorator, key) {
-  const decoratorLine = decorator.expression.loc.start.line;
+  const decoratorLine = decorator.expression.loc.end.line;
   const keyLine = key.loc.start.line;
   const onDifferentLines = decoratorLine !== keyLine;
   const onSameLine = decoratorLine === keyLine;

diff --git a/tests/lib/rules/decorator-position.js b/tests/lib/rules/decorator-position.js
@@ -79,6 +79,16 @@ ruleTester.run('JS: decorator-position', rule, {
         },
       ],
     },
+    {
+      code: stripIndent`
+        class Foo {
+          @foo({
+            bigDecorator: true,
+          }) foo;
+        }
+      `,
+      options: [{ onSameLine: ['@foo'] }],
+    },
   ],
   invalid: [
     {
@@ -139,6 +149,25 @@ ruleTester.run('JS: decorator-position', rule, {
         }
       `,
     },
+    {
+      code: stripIndent`
+        class Foo {
+          @foo({
+            bigDecorator: true,
+          }) foo;
+        }
+      `,
+      options: [{ onDifferentLines: ['@foo'] }],
+      errors: [{ message: 'Expected @foo to be on the line above.' }],
+      output: stripIndent`
+        class Foo {
+          @foo({
+            bigDecorator: true,
+          })
+          foo;
+        }
+      `,
+    },
   ],
 });