Fix issue #140 (#168)

* Fix issue #140 The problem was caused by `getTokensCombinedText` returning an incorrect slice which caused the multiline check to fail. * tweak formatting
palantir · Jun 11, 2018 · 483a579 · 483a579
1 parent 09be714
commit 483a579
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/rules/jsxCurlySpacingRule.ts b/src/rules/jsxCurlySpacingRule.ts
@@ -124,14 +124,10 @@ function walk(ctx: Lint.WalkContext<string | undefined>): void {
 }
 
 function getTokensCombinedText(firstToken: ts.Node, nextToken: ts.Node) {
-    const parentNodeText = nextToken.parent!.getText();
-    const firstTokenText = firstToken.getText();
-    const secondTokenText = nextToken.getText();
-    const secondTokenTextLocation = parentNodeText.indexOf(secondTokenText);
-    const firstTokenTextLocation = parentNodeText.indexOf(firstTokenText);
-    const combinedTokeText = parentNodeText.slice(
-        firstTokenTextLocation,
-        secondTokenTextLocation + secondTokenText.length,
+    const parent = nextToken.parent!;
+    const combinedTokeText = parent.getText().slice(
+        firstToken.getStart() - parent.getStart(),
+        nextToken.getStart() + nextToken.getWidth() - parent.getStart(),
     );
 
     return combinedTokeText;

diff --git a/test/rules/jsx-curly-spacing/never/test.tsx.fix b/test/rules/jsx-curly-spacing/never/test.tsx.fix
@@ -57,3 +57,10 @@ const failH = <App foo={{ bar:baz }} {...baz}>
 
 const passI = <App foo={/* comment */
                    /* comment 2 */ should_not_matter_because_multiline}/>
+
+const passJ = <App foo={({ bar }) =>
+                  bar ? (
+                    <div></div>
+                  ) : null
+                }
+              />
diff --git a/test/rules/jsx-curly-spacing/never/test.tsx.lint b/test/rules/jsx-curly-spacing/never/test.tsx.lint
@@ -89,3 +89,10 @@ const failH = <App foo={{ bar:baz }} {...baz}>
 
 const passI = <App foo={/* comment */
                    /* comment 2 */ should_not_matter_because_multiline}/>
+
+const passJ = <App foo={({ bar }) =>
+                  bar ? (
+                    <div></div>
+                  ) : null
+                }
+              />