wip-fixing consuming whitespace in children

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit c1ea3034d5d0 · 2017-04-11T15:35:06.000-07:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -2457,7 +2457,7 @@ namespace ts {
             let indentation: number;
             for (const line of lines) {
                 for (let i = 0; i < line.length && (indentation === undefined || i < indentation); i++) {
-                    if (!isWhiteSpace(line.charCodeAt(i))) {
+                    if (!isWhiteSpaceLike(line.charCodeAt(i))) {
                         if (indentation === undefined || i < indentation) {
                             indentation = i;
                             break;
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -366,7 +366,7 @@ namespace ts {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
 
-    export function isWhiteSpace(ch: number): boolean {
+    export function isWhiteSpaceLike(ch: number): boolean {
         return isWhiteSpaceSingleLine(ch) || isLineBreak(ch);
     }
 
@@ -510,7 +510,7 @@ namespace ts {
                       break;
 
                   default:
-                      if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpace(ch))) {
+                      if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpaceLike(ch))) {
                           pos++;
                           continue;
                       }
@@ -691,7 +691,7 @@ namespace ts {
                     }
                     break scan;
                 default:
-                    if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpace(ch))) {
+                    if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpaceLike(ch))) {
                         if (hasPendingCommentRange && isLineBreak(ch)) {
                             pendingHasTrailingNewLine = true;
                         }
@@ -1750,7 +1750,7 @@ namespace ts {
                 if (isLineBreak(char) && firstNonWhitespace === 0) {
                     firstNonWhitespace = -1;
                 }
-                else if (!isWhiteSpaceSingleLine(char)) {
+                else if (!isWhiteSpaceLike(char) && (char !== CharacterCodes.openBrace || char !== CharacterCodes.lessThan)) {
                     firstNonWhitespace = pos;
                 }
                 pos++;
diff --git a/src/services/formatting/smartIndenter.ts b/src/services/formatting/smartIndenter.ts
@@ -54,7 +54,7 @@ namespace ts.formatting {
                 let current = position;
                 while (current > 0) {
                     const char = sourceFile.text.charCodeAt(current);
-                    if (!isWhiteSpace(char)) {
+                    if (!isWhiteSpaceLike(char)) {
                         break;
                     }
                     current--;
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -608,7 +608,7 @@ namespace ts.textChanges {
             if (force || !isTrivia(s)) {
                 this.lastNonTriviaPosition = this.writer.getTextPos();
                 let i = 0;
-                while (isWhiteSpace(s.charCodeAt(s.length - i - 1))) {
+                while (isWhiteSpaceLike(s.charCodeAt(s.length - i - 1))) {
                     i++;
                 }
                 // trim trailing whitespaces
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1381,7 +1381,7 @@ namespace ts {
     }
 
     export function getFirstNonSpaceCharacterPosition(text: string, position: number) {
-        while (isWhiteSpace(text.charCodeAt(position))) {
+        while (isWhiteSpaceLike(text.charCodeAt(position))) {
             position += 1;
         }
         return position;

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ namespace ts {`
`366`	`366`	`return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);`
`367`	`367`	`}`
`368`	`368`
`369`		`- export function isWhiteSpace(ch: number): boolean {`
	`369`	`+ export function isWhiteSpaceLike(ch: number): boolean {`
`370`	`370`	`return isWhiteSpaceSingleLine(ch) \|\| isLineBreak(ch);`
`371`	`371`	`}`
`372`	`372`
`@@ -510,7 +510,7 @@ namespace ts {`
`510`	`510`	`break;`
`511`	`511`
`512`	`512`	`default:`
`513`		`- if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpace(ch))) {`
	`513`	`+ if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpaceLike(ch))) {`
`514`	`514`	`pos++;`
`515`	`515`	`continue;`
`516`	`516`	`}`
`@@ -691,7 +691,7 @@ namespace ts {`
`691`	`691`	`}`
`692`	`692`	`break scan;`
`693`	`693`	`default:`
`694`		`- if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpace(ch))) {`
	`694`	`+ if (ch > CharacterCodes.maxAsciiCharacter && (isWhiteSpaceLike(ch))) {`
`695`	`695`	`if (hasPendingCommentRange && isLineBreak(ch)) {`
`696`	`696`	`pendingHasTrailingNewLine = true;`
`697`	`697`	`}`
`@@ -1750,7 +1750,7 @@ namespace ts {`
`1750`	`1750`	`if (isLineBreak(char) && firstNonWhitespace === 0) {`
`1751`	`1751`	`firstNonWhitespace = -1;`
`1752`	`1752`	`}`
`1753`		`- else if (!isWhiteSpaceSingleLine(char)) {`
	`1753`	`+ else if (!isWhiteSpaceLike(char) && (char !== CharacterCodes.openBrace \|\| char !== CharacterCodes.lessThan)) {`
`1754`	`1754`	`firstNonWhitespace = pos;`
`1755`	`1755`	`}`
`1756`	`1756`	`pos++;`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ namespace ts.formatting {`
`54`	`54`	`let current = position;`
`55`	`55`	`while (current > 0) {`
`56`	`56`	`const char = sourceFile.text.charCodeAt(current);`
`57`		`- if (!isWhiteSpace(char)) {`
	`57`	`+ if (!isWhiteSpaceLike(char)) {`
`58`	`58`	`break;`
`59`	`59`	`}`
`60`	`60`	`current--;`
Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ namespace ts.textChanges {`
`608`	`608`	`if (force \|\| !isTrivia(s)) {`
`609`	`609`	`this.lastNonTriviaPosition = this.writer.getTextPos();`
`610`	`610`	`let i = 0;`
`611`		`- while (isWhiteSpace(s.charCodeAt(s.length - i - 1))) {`
	`611`	`+ while (isWhiteSpaceLike(s.charCodeAt(s.length - i - 1))) {`
`612`	`612`	`i++;`
`613`	`613`	`}`
`614`	`614`	`// trim trailing whitespaces`
Original file line number	Diff line number	Diff line change
`@@ -1381,7 +1381,7 @@ namespace ts {`
`1381`	`1381`	`}`
`1382`	`1382`
`1383`	`1383`	`export function getFirstNonSpaceCharacterPosition(text: string, position: number) {`
`1384`		`- while (isWhiteSpace(text.charCodeAt(position))) {`
	`1384`	`+ while (isWhiteSpaceLike(text.charCodeAt(position))) {`
`1385`	`1385`	`position += 1;`
`1386`	`1386`	`}`
`1387`	`1387`	`return position;`