Merge pull request #952 from pe8ter/master

Identify multiline literals with single property correctly.
palantir · Feb 1, 2016 · 40c37dc · 40c37dc
2 parents e3476a7 + d97d126
commit 40c37dc
Show file tree

Hide file tree

Showing 5 changed files with 171 additions and 1 deletion.
diff --git a/src/rules/trailingCommaRule.ts b/src/rules/trailingCommaRule.ts
@@ -53,7 +53,7 @@ class TrailingCommaWalker extends Lint.RuleWalker {
     private lintNode(node: ts.Node) {
         const child = node.getChildAt(1);
         if (child != null && child.kind === ts.SyntaxKind.SyntaxList) {
-            const isMultiline = child.getText().match(/\n|\r/);
+            const isMultiline = node.getText().match(/\n|\r/);
             const option = this.getOption(isMultiline ? "multiline" : "singleline");
             const grandChildren = child.getChildren();
 

diff --git a/test/rules/trailing-comma/multiline-always/test.ts.lint b/test/rules/trailing-comma/multiline-always/test.ts.lint
@@ -14,6 +14,15 @@ var x = [{
 }];
 ~   [missing trailing comma]
 
+var s = {
+    sA: 6,
+};
+
+var t = {
+    tA: 7
+        ~ [missing trailing comma]
+}
+
 var y = {
     yA: 42,
     yB: 24,
@@ -25,6 +34,15 @@ var z = {
           ~ [missing trailing comma]
 };
 
+var ss = [
+    6,
+];
+
+var tt = [
+    7
+    ~ [missing trailing comma]
+];
+
 var yy = [
     42,
     24,
@@ -48,6 +66,15 @@ var cc = [42, 24,];
 
 var dd = [2, 1];
 
+var {
+    sA,
+} = s;
+
+var {
+    tA
+     ~ [missing trailing comma]
+} = t;
+
 var {
     yA,
     yB,
@@ -59,6 +86,15 @@ var {
        ~ [missing trailing comma]
 } = z;
 
+var [
+    ssA,
+] = ss;
+
+var [
+    ttA
+      ~ [missing trailing comma]
+] = tt;
+
 var [
     yyA,
     yyB,
@@ -78,6 +114,15 @@ var [ccA, ccB,] = cc;
 
 var [ddOne, ddTwo] = dd;
 
+import {
+    ClassS,
+} from "module";
+
+import {
+    ClassT
+         ~ [missing trailing comma]
+} from "module";
+
 import {
     ClassV,
     ClassX,

diff --git a/test/rules/trailing-comma/multiline-never/test.ts.lint b/test/rules/trailing-comma/multiline-never/test.ts.lint
@@ -14,6 +14,15 @@ var x = [{
     c: (a + b)
 }];
 
+var s = {
+    sA: 6,
+         ~ [trailing comma]
+};
+
+var t = {
+    tA: 7
+}
+
 var y = {
     yA: 42,
     yB: 24,
@@ -25,6 +34,15 @@ var z = {
     zTwo: 1
 };
 
+var ss = [
+    6,
+     ~ [trailing comma]
+];
+
+var tt = [
+    7
+];
+
 var yy = [
     42,
     24,
@@ -48,6 +66,15 @@ var cc = [42, 24,];
 
 var dd = [2, 1];
 
+var {
+    sA,
+      ~ [trailing comma]
+} = s;
+
+var {
+    tA
+} = t;
+
 var {
     yA,
     yB,
@@ -59,6 +86,15 @@ var {
     zTwo
 } = z;
 
+var [
+    ssA,
+       ~ [trailing comma]
+] = ss;
+
+var [
+    ttA
+] = tt;
+
 var [
     yyA,
     yyB,
@@ -78,6 +114,15 @@ var [ccA, ccB,] = cc;
 
 var [ddOne, ddTwo] = dd;
 
+import {
+    ClassS,
+          ~ [trailing comma]
+} from "module";
+
+import {
+    ClassT
+} from "module";
+
 import {
     ClassV,
     ClassX,

diff --git a/test/rules/trailing-comma/singleline-always/test.ts.lint b/test/rules/trailing-comma/singleline-always/test.ts.lint
@@ -12,6 +12,14 @@ var x = [{
     c: (a + b)
 }];
 
+var s = {
+    sA: 6,
+};
+
+var t = {
+    tA: 7
+}
+
 var y = {
     yA: 42,
     yB: 24,
@@ -22,6 +30,14 @@ var z = {
     zTwo: 1
 };
 
+var ss = [
+    6,
+];
+
+var tt = [
+    7
+];
+
 var yy = [
     42,
     24,
@@ -48,6 +64,14 @@ var cc = [42, 24,];
 var dd = [2, 1];
              ~   [missing trailing comma]
 
+var {
+    sA,
+} = s;
+
+var {
+    tA
+} = t;
+
 var {
     yA,
     yB,
@@ -58,6 +82,14 @@ var {
     zTwo
 } = z;
 
+var [
+    ssA,
+] = ss;
+
+var [
+    ttA
+] = tt;
+
 var [
     yyA,
     yyB,
@@ -78,6 +110,14 @@ var [ccA, ccB,] = cc;
 var [ddOne, ddTwo] = dd;
                 ~        [missing trailing comma]
 
+import {
+    ClassS,
+} from "module";
+
+import {
+    ClassT
+} from "module";
+
 import {
     ClassV,
     ClassX,

diff --git a/test/rules/trailing-comma/singleline-never/test.ts.lint b/test/rules/trailing-comma/singleline-never/test.ts.lint
@@ -12,6 +12,14 @@ var x = [{
     c: (a + b)
 }];
 
+var s = {
+    sA: 6,
+};
+
+var t = {
+    tA: 7
+}
+
 var y = {
     yA: 42,
     yB: 24,
@@ -22,6 +30,14 @@ var z = {
     zTwo: 1
 };
 
+var ss = [
+    6,
+];
+
+var tt = [
+    7
+];
+
 var yy = [
     42,
     24,
@@ -48,6 +64,14 @@ var cc = [42, 24,];
 
 var dd = [2, 1];
 
+var {
+    sA,
+} = s;
+
+var {
+    tA
+} = t;
+
 var {
     yA,
     yB,
@@ -58,6 +82,14 @@ var {
     zTwo
 } = z;
 
+var [
+    ssA,
+] = ss;
+
+var [
+    ttA
+] = tt;
+
 var [
     yyA,
     yyB,
@@ -78,6 +110,14 @@ var [ccA, ccB,] = cc;
 
 var [ddOne, ddTwo] = dd;
 
+import {
+    ClassS,
+} from "module";
+
+import {
+    ClassT
+} from "module";
+
 import {
     ClassV,
     ClassX,