Remove scanAllTokens and SkippableTokenAwareRuleWalker

src/language/utils.ts

@@ -33,19 +33,6 @@ export function doesIntersect(failure: RuleFailure, disabledIntervals: IDisabled
     });
 }
 
-/** @deprecated use forEachToken instead */
-export function scanAllTokens(scanner: ts.Scanner, callback: (s: ts.Scanner) => void) {
-    let lastStartPos = -1;
-    while (scanner.scan() !== ts.SyntaxKind.EndOfFileToken) {
-        const startPos = scanner.getStartPos();
-        if (startPos === lastStartPos) {
-            break;
-        }
-        lastStartPos = startPos;
-        callback(scanner);
-    }
-}
-
 /**
  * @returns true if any modifier kinds passed along exist in the given modifiers array
  */

src/language/walker/index.ts

@@ -19,7 +19,6 @@ export * from "./blockScopeAwareRuleWalker";
 export * from "./programAwareRuleWalker";
 export * from "./ruleWalker";
 export * from "./scopeAwareRuleWalker";
-export * from "./skippableTokenAwareRuleWalker";
 export * from "./syntaxWalker";
 export * from "./walkContext";
 export * from "./walker";

src/rules/noImportSideEffectRule.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import * as utils from "tsutils";
 import * as ts from "typescript";
 
 import * as Lint from "../index";
@@ -50,29 +51,26 @@ export class Rule extends Lint.Rules.AbstractRule {
     public static FAILURE_STRING = "import with explicit side-effect";
 
     public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-        return this.applyWithWalker(new NoImportSideEffectWalker(sourceFile, this.getOptions()));
+        const patternConfig = this.ruleArguments[this.ruleArguments.length - 1];
+        const ignorePattern = patternConfig && new RegExp(patternConfig[OPTION_IGNORE_MODULE]);
+        return this.applyWithFunction(sourceFile, walk, ignorePattern);
     }
 }
 
-class NoImportSideEffectWalker extends Lint.SkippableTokenAwareRuleWalker {
-    private scanner: ts.Scanner;
-    private ignorePattern: RegExp | null;
+function walk(ctx: Lint.WalkContext<RegExp | undefined>): void {
+    const { options: ignorePattern, sourceFile } = ctx;
+    for (const statement of sourceFile.statements) {
+        if (!utils.isImportDeclaration(statement)) {
+            continue;
+        }
 
-    constructor(sourceFile: ts.SourceFile, options: Lint.IOptions) {
-        super(sourceFile, options);
-        const patternConfig = this.getOptions().pop();
-        this.ignorePattern = patternConfig ? new RegExp(patternConfig[OPTION_IGNORE_MODULE]) : null;
-        this.scanner = ts.createScanner(ts.ScriptTarget.ES5, false, ts.LanguageVariant.Standard, sourceFile.text);
-    }
+        const { importClause, moduleSpecifier } = statement;
+        if (importClause || !utils.isStringLiteral(moduleSpecifier)) {
+            continue;
+        }
 
-    public visitImportDeclaration(node: ts.ImportDeclaration) {
-        const importClause = node.importClause;
-        if (importClause === undefined) {
-            const specifier = node.moduleSpecifier.getText();
-            if (this.ignorePattern === null || !this.ignorePattern.test(specifier.substring(1, specifier.length - 1))) {
-                this.addFailureAtNode(node, Rule.FAILURE_STRING);
-            }
+        if (!ignorePattern || !ignorePattern.test(moduleSpecifier.text)) {
+            ctx.addFailureAtNode(statement, Rule.FAILURE_STRING);
         }
-        super.visitImportDeclaration(node);
     }
 }