Fixes whitespace check-module to properly lint and fix errors (#2825)

palantir · Jun 10, 2017 · 544a5ac · 544a5ac
1 parent 423ede6
commit 544a5ac
Show file tree

Hide file tree

Showing 35 changed files with 103 additions and 70 deletions.
diff --git a/src/formatterLoader.ts b/src/formatterLoader.ts
@@ -17,8 +17,8 @@
 
 import * as fs from "fs";
 import * as path from "path";
-import {FormatterConstructor} from "./index";
-import {camelize} from "./utils";
+import { FormatterConstructor } from "./index";
+import { camelize } from "./utils";
 
 const moduleDirectory = path.dirname(module.filename);
 const CORE_FORMATTERS_DIRECTORY = path.resolve(moduleDirectory, ".", "formatters");

diff --git a/src/formatters/checkstyleFormatter.ts b/src/formatters/checkstyleFormatter.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
 import { RuleFailure } from "../language/rule/rule";
 
 import * as Utils from "../utils";

diff --git a/src/formatters/codeFrameFormatter.ts b/src/formatters/codeFrameFormatter.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
 import { RuleFailure } from "../language/rule/rule";
 
 import codeFrame = require("babel-code-frame");

diff --git a/src/formatters/fileslistFormatter.ts b/src/formatters/fileslistFormatter.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
-import {RuleFailure} from "../language/rule/rule";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
+import { RuleFailure } from "../language/rule/rule";
 
 export class Formatter extends AbstractFormatter {
     /* tslint:disable:object-literal-sort-keys */

diff --git a/src/formatters/jsonFormatter.ts b/src/formatters/jsonFormatter.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
-import {RuleFailure} from "../language/rule/rule";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
+import { RuleFailure } from "../language/rule/rule";
 
 import * as Utils from "../utils";
 

diff --git a/src/formatters/msbuildFormatter.ts b/src/formatters/msbuildFormatter.ts
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
 import { RuleFailure } from "../language/rule/rule";
 
-import {camelize, dedent} from "../utils";
+import { camelize, dedent } from "../utils";
 
 export class Formatter extends AbstractFormatter {
     /* tslint:disable:object-literal-sort-keys */

diff --git a/src/formatters/pmdFormatter.ts b/src/formatters/pmdFormatter.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
 import { RuleFailure } from "../language/rule/rule";
 
 import * as Utils from "../utils";

diff --git a/src/formatters/proseFormatter.ts b/src/formatters/proseFormatter.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
-import {RuleFailure} from "../language/rule/rule";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
+import { RuleFailure } from "../language/rule/rule";
 
 export class Formatter extends AbstractFormatter {
     /* tslint:disable:object-literal-sort-keys */

diff --git a/src/formatters/stylishFormatter.ts b/src/formatters/stylishFormatter.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
 import { RuleFailure } from "../language/rule/rule";
 
 import * as colors from "colors";

diff --git a/src/formatters/verboseFormatter.ts b/src/formatters/verboseFormatter.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
 import { RuleFailure } from "../language/rule/rule";
 
 export class Formatter extends AbstractFormatter {

diff --git a/src/formatters/vsoFormatter.ts b/src/formatters/vsoFormatter.ts
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import {AbstractFormatter} from "../language/formatter/abstractFormatter";
-import {IFormatterMetadata} from "../language/formatter/formatter";
-import {RuleFailure} from "../language/rule/rule";
+import { AbstractFormatter } from "../language/formatter/abstractFormatter";
+import { IFormatterMetadata } from "../language/formatter/formatter";
+import { RuleFailure } from "../language/rule/rule";
 
 import * as Utils from "../utils";
 

diff --git a/src/index.ts b/src/index.ts
@@ -17,8 +17,8 @@
 
 import * as Configuration from "./configuration";
 import * as Formatters from "./formatters";
-import {FormatterConstructor} from "./language/formatter/formatter";
-import {RuleFailure} from "./language/rule/rule";
+import { FormatterConstructor } from "./language/formatter/formatter";
+import { RuleFailure } from "./language/rule/rule";
 import * as Linter from "./linter";
 import * as Rules from "./rules";
 import * as Test from "./test";

diff --git a/src/language/formatter/abstractFormatter.ts b/src/language/formatter/abstractFormatter.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import {RuleFailure} from "../rule/rule";
-import {IFormatter, IFormatterMetadata} from "./formatter";
+import { RuleFailure } from "../rule/rule";
+import { IFormatter, IFormatterMetadata } from "./formatter";
 
 export abstract class AbstractFormatter implements IFormatter {
     public static metadata: IFormatterMetadata;

diff --git a/src/language/formatter/formatter.ts b/src/language/formatter/formatter.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {RuleFailure} from "../rule/rule";
+import { RuleFailure } from "../rule/rule";
 
 export interface IFormatterMetadata {
     /**

diff --git a/src/language/rule/abstractRule.ts b/src/language/rule/abstractRule.ts
@@ -17,7 +17,7 @@
 
 import * as ts from "typescript";
 
-import {IWalker, WalkContext} from "../walker";
+import { IWalker, WalkContext } from "../walker";
 import { IOptions, IRule, IRuleMetadata, RuleFailure, RuleSeverity } from "./rule";
 
 export abstract class AbstractRule implements IRule {

diff --git a/src/language/rule/optionallyTypedRule.ts b/src/language/rule/optionallyTypedRule.ts
@@ -17,8 +17,8 @@
 
 import * as ts from "typescript";
 
-import {AbstractRule} from "./abstractRule";
-import {ITypedRule, RuleFailure} from "./rule";
+import { AbstractRule } from "./abstractRule";
+import { ITypedRule, RuleFailure } from "./rule";
 
 export abstract class OptionallyTypedRule extends AbstractRule implements ITypedRule {
     public abstract applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): RuleFailure[];

diff --git a/src/language/rule/rule.ts b/src/language/rule/rule.ts
@@ -17,8 +17,8 @@
 
 import * as ts from "typescript";
 
-import {arrayify, flatMap} from "../../utils";
-import {IWalker} from "../walker";
+import { arrayify, flatMap } from "../../utils";
+import { IWalker } from "../walker";
 
 export interface RuleConstructor {
     metadata: IRuleMetadata;

diff --git a/src/language/rule/typedRule.ts b/src/language/rule/typedRule.ts
@@ -18,8 +18,8 @@
 import * as ts from "typescript";
 
 import { showWarningOnce } from "../../error";
-import {AbstractRule} from "./abstractRule";
-import {ITypedRule, RuleFailure} from "./rule";
+import { AbstractRule } from "./abstractRule";
+import { ITypedRule, RuleFailure } from "./rule";
 
 export abstract class TypedRule extends AbstractRule implements ITypedRule {
 

diff --git a/src/language/utils.ts b/src/language/utils.ts
@@ -19,7 +19,7 @@ import * as path from "path";
 import { isBlockScopedVariableDeclarationList, isPrefixUnaryExpression } from "tsutils";
 import * as ts from "typescript";
 
-import {IDisabledInterval, RuleFailure} from "./rule/rule"; // tslint:disable-line deprecation
+import { IDisabledInterval, RuleFailure } from "./rule/rule"; // tslint:disable-line deprecation
 
 export function getSourceFile(fileName: string, source: string): ts.SourceFile {
     const normalizedName = path.normalize(fileName).replace(/\\/g, "/");

diff --git a/src/language/walker/blockScopeAwareRuleWalker.ts b/src/language/walker/blockScopeAwareRuleWalker.ts
@@ -17,10 +17,10 @@
 
 import * as ts from "typescript";
 
-import {IOptions} from "../rule/rule";
-import {isBlockScopeBoundary} from "../utils";
+import { IOptions } from "../rule/rule";
+import { isBlockScopeBoundary } from "../utils";
 // tslint:disable deprecation
-import {ScopeAwareRuleWalker} from "./scopeAwareRuleWalker";
+import { ScopeAwareRuleWalker } from "./scopeAwareRuleWalker";
 
 /**
  * @deprecated See comment on ScopeAwareRuleWalker.

diff --git a/src/language/walker/programAwareRuleWalker.ts b/src/language/walker/programAwareRuleWalker.ts
@@ -17,8 +17,8 @@
 
 import * as ts from "typescript";
 
-import {IOptions} from "../rule/rule";
-import {RuleWalker} from "./ruleWalker";
+import { IOptions } from "../rule/rule";
+import { RuleWalker } from "./ruleWalker";
 
 export class ProgramAwareRuleWalker extends RuleWalker {
     private typeChecker: ts.TypeChecker;

diff --git a/src/language/walker/ruleWalker.ts b/src/language/walker/ruleWalker.ts
@@ -17,9 +17,9 @@
 
 import * as ts from "typescript";
 
-import {Fix, IOptions, Replacement, RuleFailure} from "../rule/rule";
-import {SyntaxWalker} from "./syntaxWalker";
-import {IWalker} from "./walker";
+import { Fix, IOptions, Replacement, RuleFailure } from "../rule/rule";
+import { SyntaxWalker } from "./syntaxWalker";
+import { IWalker } from "./walker";
 
 export class RuleWalker extends SyntaxWalker implements IWalker {
     private limit: number;

diff --git a/src/language/walker/scopeAwareRuleWalker.ts b/src/language/walker/scopeAwareRuleWalker.ts
@@ -17,9 +17,9 @@
 
 import * as ts from "typescript";
 
-import {IOptions} from "../rule/rule";
-import {isScopeBoundary} from "../utils";
-import {RuleWalker} from "./ruleWalker";
+import { IOptions } from "../rule/rule";
+import { isScopeBoundary } from "../utils";
+import { RuleWalker } from "./ruleWalker";
 
 /**
  * @deprecated Prefer to manually maintain any contextual information.

diff --git a/src/language/walker/walker.ts b/src/language/walker/walker.ts
@@ -17,9 +17,9 @@
 
 import * as ts from "typescript";
 
-import {RuleFailure} from "../rule/rule";
-import {WalkContext} from "./walkContext";
-import {IWalker} from "./walker";
+import { RuleFailure } from "../rule/rule";
+import { WalkContext } from "./walkContext";
+import { IWalker } from "./walker";
 
 export interface IWalker {
     getSourceFile(): ts.SourceFile;

diff --git a/src/rules/memberOrderingRule.ts b/src/rules/memberOrderingRule.ts
@@ -19,7 +19,7 @@ import * as ts from "typescript";
 
 import { showWarningOnce } from "../error";
 import * as Lint from "../index";
-import {flatMap, mapDefined} from "../utils";
+import { flatMap, mapDefined } from "../utils";
 
 const OPTION_ORDER = "order";
 const OPTION_ALPHABETIZE = "alphabetize";

diff --git a/src/rules/noUnsafeAnyRule.ts b/src/rules/noUnsafeAnyRule.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import {isExpression} from "tsutils";
+import { isExpression } from "tsutils";
 import * as ts from "typescript";
 import * as Lint from "../index";
 

diff --git a/src/rules/whitespaceRule.ts b/src/rules/whitespaceRule.ts
@@ -146,6 +146,21 @@ function walk(ctx: Lint.WalkContext<Options>) {
                     let position: number | undefined;
                     const { name, namedBindings } = importClause;
                     if (namedBindings !== undefined) {
+                        if (namedBindings.kind !== ts.SyntaxKind.NamespaceImport) {
+                            namedBindings.elements.forEach((element, idx, arr) => {
+                                const internalName = element.name;
+                                if (internalName !== undefined) {
+                                    if (idx === arr.length - 1) {
+                                        const token = namedBindings.getLastToken();
+                                        checkForTrailingWhitespace(token.getFullStart());
+                                    }
+                                    if (idx === 0) {
+                                        const startPos = internalName.getStart() - 1;
+                                        checkForTrailingWhitespace(startPos, startPos + 1);
+                                    }
+                                }
+                            });
+                        }
                         position = namedBindings.getEnd();
                     } else if (name !== undefined) {
                         position = name.getEnd();
@@ -246,9 +261,9 @@ function walk(ctx: Lint.WalkContext<Options>) {
         checkForTrailingWhitespace(equalsGreaterThanToken.getEnd());
     }
 
-    function checkForTrailingWhitespace(position: number): void {
+    function checkForTrailingWhitespace(position: number, whiteSpacePos: number = position): void {
         if (position !== sourceFile.end && !Lint.isWhiteSpace(sourceFile.text.charCodeAt(position))) {
-            addMissingWhitespaceErrorAt(position);
+            addMissingWhitespaceErrorAt(whiteSpacePos);
         }
     }
 

diff --git a/src/test.ts b/src/test.ts
@@ -23,11 +23,11 @@ import * as path from "path";
 import * as semver from "semver";
 import * as ts from "typescript";
 
-import {Replacement} from "./language/rule/rule";
+import { Replacement } from "./language/rule/rule";
 import * as Linter from "./linter";
-import {LintError} from "./test/lintError";
+import { LintError } from "./test/lintError";
 import * as parse from "./test/parse";
-import {denormalizeWinPath, mapDefined, readBufferWithDetectedEncoding} from "./utils";
+import { denormalizeWinPath, mapDefined, readBufferWithDetectedEncoding } from "./utils";
 
 const MARKUP_FILE_EXTENSION = ".lint";
 const FIXES_FILE_EXTENSION = ".fix";

diff --git a/src/test/parse.ts b/src/test/parse.ts
@@ -15,9 +15,9 @@
  */
 
 import * as ts from "typescript";
-import {format} from "util";
+import { format } from "util";
 
-import {flatMap, mapDefined} from "../utils";
+import { flatMap, mapDefined } from "../utils";
 import {
     CodeLine,
     EndErrorLine,
@@ -28,7 +28,7 @@ import {
     parseLine,
     printLine,
 } from "./lines";
-import {errorComparator, LintError, lintSyntaxError} from "./lintError";
+import { errorComparator, LintError, lintSyntaxError } from "./lintError";
 
 let scanner: ts.Scanner | undefined;
 

diff --git a/test/formatters/codeFrameFormatterTests.ts b/test/formatters/codeFrameFormatterTests.ts
@@ -19,7 +19,7 @@ import * as colors from "colors";
 
 import * as ts from "typescript";
 
-import {IFormatter, TestUtils} from "../lint";
+import { IFormatter, TestUtils } from "../lint";
 import { createFailure } from "./utils";
 
 describe("CodeFrame Formatter", () => {

diff --git a/test/rule-tester/testData.ts b/test/rule-tester/testData.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {LintError} from "../../src/test/lintError";
+import { LintError } from "../../src/test/lintError";
 
 /* tslint:disable:object-literal-sort-keys no-consecutive-blank-lines */
 

diff --git a/test/ruleTestRunner.ts b/test/ruleTestRunner.ts
@@ -18,7 +18,7 @@ import * as colors from "colors";
 import * as glob from "glob";
 import * as path from "path";
 
-import {consoleTestResultHandler, runTest} from "../src/test";
+import { consoleTestResultHandler, runTest } from "../src/test";
 
 /* tslint:disable:no-console */
 console.log();