Fixed whitespace rule for trivial for cases. (#3132)

palantir · Aug 15, 2017 · b6e4328 · b6e4328
1 parent 1197e15
commit b6e4328
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/src/rules/noInvalidTemplateStringsRule.ts b/src/rules/noInvalidTemplateStringsRule.ts
@@ -54,7 +54,7 @@ function walk(ctx: Lint.WalkContext<void>) {
  * Finds instances of '${'
  */
  const findTemplateString = new RegExp(/\$\{/);
- 
+
  const index = node.text.search(findTemplateString);
  if (index !== -1) {
  /**

diff --git a/src/rules/whitespaceRule.ts b/src/rules/whitespaceRule.ts
@@ -265,11 +265,24 @@ function walk(ctx: Lint.WalkContext<Options>) {
  }
  break;
  case ts.SyntaxKind.CommaToken:
- case ts.SyntaxKind.SemicolonToken:
  if (options.separator) {
  prevTokenShouldBeFollowedByWhitespace = true;
  }
  break;
+ case ts.SyntaxKind.SemicolonToken:
+ if (!options.separator) {
+ break;
+ }
+
+ const nextPosition = range.pos + 1;
+ const semicolonInTrivialFor = parent.kind === ts.SyntaxKind.ForStatement &&
+ nextPosition !== sourceFile.end &&
+ (sourceFile.text[nextPosition] === ";" || sourceFile.text[nextPosition] === ")");
+
+ if (!semicolonInTrivialFor) {
+ prevTokenShouldBeFollowedByWhitespace = true;
+ }
+ break;
  case ts.SyntaxKind.EqualsToken:
  if (options.decl && parent.kind !== ts.SyntaxKind.JsxAttribute) {
  prevTokenShouldBeFollowedByWhitespace = true;

diff --git a/test/rules/whitespace/all/test.ts.fix b/test/rules/whitespace/all/test.ts.fix
@@ -21,6 +21,9 @@ module M {
  goto: console.log("hi");
  }
 
+ for (x = 2; x--;) {}
+ for (;;) {}
+
  while (i < 1) {
  ++i;
  }

diff --git a/test/rules/whitespace/all/test.ts.lint b/test/rules/whitespace/all/test.ts.lint
@@ -43,6 +43,9 @@ module M {
  ~ [missing whitespace]
  }
 
+ for (x = 2; x--;) {}
+ for (;;) {}
+
  while(i < 1){
  ~ [missing whitespace]
  ~ [missing whitespace]