debug tests

ovr · Aug 8, 2013 · 0639ff8 · 0639ff8
1 parent 363bde5
commit 0639ff8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/bin/tslint-cli.js b/bin/tslint-cli.js
@@ -26771,6 +26771,7 @@ var Lint;
             DebugRule.prototype.apply = function (syntaxTree) {
                 return this.applyWithWalker(new DebugWalker(syntaxTree));
             };
+            DebugRule.FAILURE_STRING = "use of debugger statements is disallowed";
             return DebugRule;
         })(Rules.AbstractRule);
         Rules.DebugRule = DebugRule;
@@ -26785,15 +26786,12 @@ var Lint;
                 _super.prototype.visitToken.call(this, token);
             };
 
-            DebugWalker.prototype.handleToken = function (operatorToken) {
-                var failure = null;
-                var operatorKind = operatorToken.kind();
-
-                if (operatorKind === TypeScript.SyntaxKind.DebuggerKeyword) {
-                    this.addFailure(this.createFailure(this.position(), operatorToken.width(), DebugWalker.DEBUG_FAILURE));
+            DebugWalker.prototype.handleToken = function (token) {
+                if (token.kind() === TypeScript.SyntaxKind.DebuggerKeyword) {
+                    var position = this.position() + token.leadingTriviaWidth();
+                    this.addFailure(this.createFailure(position, token.width(), DebugRule.FAILURE_STRING));
                 }
             };
-            DebugWalker.DEBUG_FAILURE = "use of debugger statements is disallowed";
             return DebugWalker;
         })(Lint.RuleWalker);
     })(Lint.Rules || (Lint.Rules = {}));

diff --git a/src/rules/debugRule.ts b/src/rules/debugRule.ts
@@ -20,6 +20,8 @@
 module Lint.Rules {
 
     export class DebugRule extends AbstractRule {
+        public static FAILURE_STRING = "use of debugger statements is disallowed";
+
         public isEnabled() : boolean {
             return this.getValue() === true;
         }
@@ -30,19 +32,15 @@ module Lint.Rules {
     }
 
     class DebugWalker extends Lint.RuleWalker {
-        static DEBUG_FAILURE = "use of debugger statements is disallowed";
-
         public visitToken(token : TypeScript.ISyntaxToken): void {
             this.handleToken(token);
             super.visitToken(token);
        }
 
-        private handleToken(operatorToken: TypeScript.ISyntaxToken) {
-            var failure = null;
-            var operatorKind = operatorToken.kind();
-
-            if (operatorKind === TypeScript.SyntaxKind.DebuggerKeyword) {
-                this.addFailure(this.createFailure(this.position(), operatorToken.width(), DebugWalker.DEBUG_FAILURE));
+        private handleToken(token: TypeScript.ISyntaxToken) {
+            if (token.kind() === TypeScript.SyntaxKind.DebuggerKeyword) {
+                var position = this.position() + token.leadingTriviaWidth();
+                this.addFailure(this.createFailure(position, token.width(), DebugRule.FAILURE_STRING));
             }
         }
     }

diff --git a/test/files/rules/debug.test.ts b/test/files/rules/debug.test.ts
@@ -0,0 +1,7 @@
+var testVariable = "debugger";
+
+function testFunction(): number {
+    if (testVariable === "debugger") {
+        debugger;
+    }
+}
diff --git a/test/rules/debugger.ts b/test/rules/debugger.ts
@@ -0,0 +1,13 @@
+/// <reference path='../references.ts' />
+
+describe("<debug>", () => {
+    it("forbids debugger statements", () => {
+        var fileName = "rules/debug.test.ts"
+        var failureString = Lint.Rules.DebugRule.FAILURE_STRING;
+
+        var actualFailures = Lint.Test.applyRuleOnFile(fileName, "debug");
+        var expectedFailure = Lint.Test.createFailure(fileName, [5, 9], [5, 17], failureString);
+
+        Lint.Test.assertContainsFailure(actualFailures, expectedFailure);
+    });
+});