fixes more errors

harryi3t · Jan 8, 2017 · 92f8356 · 92f8356
1 parent 68948c2
commit 92f8356
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/lib/rules/on-newline.js b/lib/rules/on-newline.js
@@ -47,8 +47,12 @@ function indent(num) {
 
 function fixIndentation(node, arg, fixer) {
   var colToIndent = 0;
+  if (!node.callee) {
+    console.log(node);
+    return;
+  }
   if (node.type === 'ReturnStatement' ||
-    areOnSameLine(node.callee.property, node)) {
+    areOnSameLine(node.callee.property || node.callee, node)) {
     colToIndent = node.loc.start.column + INDENT_LEVEL;
   }
   else
@@ -71,7 +75,7 @@ function callExpressionRule(context, callNode, returnNode) {
           var functionLine = arg.loc.start.line;
           var parentLine = callNode.callee.loc.end.line;
 
-          if (args.length > 1)
+          if (index > 0)
             parentLine = args[index - 1].loc.end.line;
 
           if (functionLine === parentLine) {

diff --git a/tests/lib/rules/on-newline.js b/tests/lib/rules/on-newline.js
@@ -103,3 +103,24 @@ ruleTester.run('callback where callee is MemberExpression', rule, {
     errors: onNewLineErrors
   }]
 });
+
+ruleTester.run('callback where callee is Identifier ' +
+  'and CallExpression has multiple arguments', rule, {
+  valid: [{
+    code:
+      'setTimeout(                                             \n\
+        function () {                                          \n\
+                                                               \n\
+        },                                                     \n\
+        1000                                                   \n\
+      );'
+
+  }],
+  invalid: [{
+    code:
+      'setTimeout(function () {                                 \n\
+                                                                \n\
+      }, 1000);',
+    errors: onNewLineErrors
+  }]
+});