update no-unexpected-multiline

eslint · Jun 17, 2020 · 6c6bd95 · 6c6bd95
1 parent a31e04c
commit 6c6bd95
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 7 deletions.
diff --git a/lib/rules/no-unexpected-multiline.js b/lib/rules/no-unexpected-multiline.js
@@ -4,12 +4,6 @@
  */
 "use strict";
 
-//------------------------------------------------------------------------------
-// Requirements
-//------------------------------------------------------------------------------
-
-const astUtils = require("./utils/ast-utils");
-
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -49,7 +43,10 @@ module.exports = {
          * @private
          */
         function checkForBreakAfter(node, messageId) {
-            const openParen = sourceCode.getTokenAfter(node, astUtils.isNotClosingParenToken);
+            const openParen = sourceCode.getTokenAfter(
+                node,
+                t => !(t.type === "Punctuator" && (t.value === ")" || t.value === "?."))
+            );
             const nodeExpressionEnd = sourceCode.getTokenBefore(openParen);
 
             if (openParen.loc.start.line !== nodeExpressionEnd.loc.end.line) {

diff --git a/tests/lib/rules/no-unexpected-multiline.js b/tests/lib/rules/no-unexpected-multiline.js
@@ -122,6 +122,16 @@ ruleTester.run("no-unexpected-multiline", rule, {
                 >\`multiline\`;
             `,
             parser: require.resolve("../../fixtures/parsers/typescript-parsers/tagged-template-with-generic/tagged-template-with-generic-3")
+        },
+
+        // Optional chaining
+        {
+            code: "var a = b\n  ?.(x || y).doSomething()",
+            parserOptions: { ecmaVersion: 2020 }
+        },
+        {
+            code: "var a = b\n  ?.[a, b, c].forEach(doSomething)",
+            parserOptions: { ecmaVersion: 2020 }
         }
     ],
     invalid: [
@@ -303,6 +313,30 @@ ruleTester.run("no-unexpected-multiline", rule, {
                     messageId: "taggedTemplate"
                 }
             ]
+        },
+
+        // Optional chaining
+        {
+            code: "var a = b?.\n(x || y).doSomething()",
+            parserOptions: { ecmaVersion: 2020 },
+            errors: [{
+                messageId: "function",
+                line: 2,
+                column: 1,
+                endLine: 2,
+                endColumn: 2
+            }]
+        },
+        {
+            code: "var a = b?.\n  [a, b, c].forEach(doSomething)",
+            parserOptions: { ecmaVersion: 2020 },
+            errors: [{
+                line: 2,
+                column: 3,
+                endLine: 2,
+                endColumn: 4,
+                messageId: "property"
+            }]
         }
     ]
 });