Fix Jsx formatting error and added tests

Author: armanio123

src/compiler/scanner.ts

@@ -2273,12 +2273,6 @@ namespace ts {
 
             while (pos < end) {
 
-                // We want to keep track of the last non-whitespace (but including
-                // newlines character for hitting the end of the JSX Text region)
-                if (!isWhiteSpaceSingleLine(char)) {
-                    lastNonWhitespace = pos;
-                }
-
                 char = text.charCodeAt(pos);
                 if (char === CharacterCodes.openBrace) {
                     break;
@@ -2297,7 +2291,8 @@ namespace ts {
                     error(Diagnostics.Unexpected_token_Did_you_mean_or_rbrace, pos, 1);
                 }
 
-                if (lastNonWhitespace > 0) lastNonWhitespace++;
+                // We want to track the last character that is not whitespace to mark the end position of the token.
+                if (!isWhiteSpaceLike(char)) lastNonWhitespace = pos;
 
                 // FirstNonWhitespace is 0, then we only see whitespaces so far. If we see a linebreak, we want to ignore that whitespaces.
                 // i.e (- : whitespace)
@@ -2315,8 +2310,9 @@ namespace ts {
                 pos++;
             }
 
-            const endPosition = lastNonWhitespace === -1 ? pos : lastNonWhitespace;
-            tokenValue = text.substring(startPos, endPosition);
+            if(lastNonWhitespace !== -1) pos = lastNonWhitespace + 1;
+
+            tokenValue = text.substring(startPos, pos);
 
             return firstNonWhitespace === -1 ? SyntaxKind.JsxTextAllWhiteSpaces : SyntaxKind.JsxText;
         }

src/services/formatting/formatting.ts

@@ -759,15 +759,22 @@ namespace ts.formatting {
                 if (child.kind === SyntaxKind.JsxText) {
                     const range: TextRange = { pos: child.getStart(), end: child.getEnd() };
                     if (range.pos !== range.end) { // don't indent zero-width jsx text
-                        const siblings = parent.getChildren(sourceFile);
-                        const currentIndex = findIndex(siblings, arg => arg.pos === child.pos);
-                        const previousNode = siblings[currentIndex - 1];
+                        let tempNode: Node
+                        let previousNode: Node | undefined;
+                        forEachChild(parent, childNode => {
+                            if (childNode.pos === child.pos) {
+                                previousNode = tempNode;
+                                return true;
+                            }
+                            tempNode = childNode;
+                        });
+
                         if (previousNode) {
                             // The jsx text needs no indentation whatsoever if it ends on the same line the previous sibling ends on
                             if (sourceFile.getLineAndCharacterOfPosition(range.end).line !== sourceFile.getLineAndCharacterOfPosition(previousNode.end).line) {
                                 // The first line is (already) "indented" if the text starts on the same line as the previous sibling element ends on
                                 const firstLineIsIndented = sourceFile.getLineAndCharacterOfPosition(range.pos).line === sourceFile.getLineAndCharacterOfPosition(previousNode.end).line;
-                                indentMultilineCommentOrJsxText(range, childIndentation.indentation, firstLineIsIndented, /*indentFinalLine*/ false, /*jsxStyle*/ true);
+                                indentMultilineCommentOrJsxText(range, childIndentation.indentation, firstLineIsIndented, /*indentFinalLine*/ true, /*jsxStyle*/ true);
                             }
                         }
                     }

src/services/formatting/formattingScanner.ts

@@ -124,13 +124,7 @@ namespace ts.formatting {
         }
 
         function shouldRescanJsxText(node: Node): boolean {
-            const isJSXText = isJsxText(node);
-            if (isJSXText) {
-                const containingElement = findAncestor(node.parent, p => isJsxElement(p));
-                if (!containingElement) return false; // should never happen
-                return !isParenthesizedExpression(containingElement.parent);
-            }
-            return false;
+            return isJsxText(node);
         }
 
         function shouldRescanSlashToken(container: Node): boolean {
@@ -160,7 +154,7 @@ namespace ts.formatting {
                 shouldRescanTemplateToken(n) ? ScanAction.RescanTemplateToken :
                 shouldRescanJsxIdentifier(n) ? ScanAction.RescanJsxIdentifier :
                 shouldRescanJsxText(n) ? ScanAction.RescanJsxText :
-                shouldRescanJsxAttributeValue(n) ? ScanAction.RescanJsxAttributeValue :
+                shouldRescanJsxAttributeValue(n) ? ScanAction.RescanJsxAttributeValue : 
                 ScanAction.Scan;
 
             if (lastTokenInfo && expectedScanAction === lastScanAction) {

tests/cases/fourslash/formattingJsxTexts.ts renamed to tests/cases/fourslash/formattingJsxTexts1.ts

@@ -0,0 +1,79 @@
+/// <reference path='fourslash.ts' />
+
+//@Filename: file.tsx
+//// const a = (
+////     <div>
+////   foo
+////           </div>
+//// );
+//// 
+//// const b = (
+////     <div>
+////   {     foo  }
+////           </div>
+//// );
+//// 
+//// const c = (
+////     <div>
+////     foo
+////   {     foobar  }
+////   bar
+////           </div>
+//// );
+//// 
+//// const d = 
+////     <div>
+////   foo
+////           </div>;
+//// 
+//// const e = 
+////     <div>
+////   {     foo  }
+////           </div>
+//// 
+//// const f = 
+////     <div>
+////     foo
+////   {     foobar  }
+////   bar
+////           </div>
+
+format.document();
+
+verify.currentFileContentIs(
+`const a = (
+    <div>
+        foo
+    </div>
+);
+
+const b = (
+    <div>
+        {foo}
+    </div>
+);
+
+const c = (
+    <div>
+        foo
+        {foobar}
+        bar
+    </div>
+);
+
+const d =
+    <div>
+        foo
+    </div>;
+
+const e =
+    <div>
+        {foo}
+    </div>
+
+const f =
+    <div>
+        foo
+        {foobar}
+        bar
+    </div>`);