Merge branch 'master' of github.com:palantir/tslint into no-unnecessa…

…ry-else
palantir · Feb 16, 2019 · 0f7d798 · 0f7d798
2 parents 89c814e + 9785477
commit 0f7d798
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/rules/banRule.ts b/src/rules/banRule.ts
@@ -94,6 +94,7 @@ export class Rule extends Lint.Rules.AbstractRule {
                 { name: ["it", "only"], message: "don't focus tests" },
                 { name: ["chai", "assert", "equal"], message: "Use 'strictEqual' instead." },
                 { name: ["*", "forEach"], message: "Use a regular for loop instead." },
+                { name: ["*", "_id", "toString"], message: "Use 'toHexString' instead." },
             ],
         ],
         type: "functionality",
@@ -167,14 +168,14 @@ class BanFunctionWalker extends Lint.AbstractWalker<Options> {
     }
 
     private checkForObjectMethodBan(expression: ts.PropertyAccessExpression) {
-        for (const ban of this.options.methods) {
+        outer: for (const ban of this.options.methods) {
             if (expression.name.text !== ban.name) {
                 continue;
             }
             let current = expression.expression;
             for (let i = ban.object.length - 1; i > 0; --i) {
                 if (!isPropertyAccessExpression(current) || current.name.text !== ban.object[i]) {
-                    continue;
+                    continue outer;
                 }
                 current = current.expression;
             }

diff --git a/test/rules/ban/test.ts.lint b/test/rules/ban/test.ts.lint
@@ -24,6 +24,7 @@ fit("some text", () => {});
 someObject.fit()
 chai.assert.equal(1, "1");
 ~~~~~~~~~~~~~~~~~ [err % ('chai.assert.equal', "Use 'strictEqual' instead.")]
+chai.equal(1, "1");
 assert.equal(1, "1");
 foo.assert.equal(1, "1");
 someObject.chai.assert.equal(1, "1");
@@ -33,5 +34,8 @@ arr.forEach(() => {});
 ~~~~~~~~~~~ [err % ('*.forEach', 'Use a regular for loop instead.')]
 someObject.someProperty.forEach(() => {});
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [err % ('*.forEach', 'Use a regular for loop instead.')]
+someObject._id.toString();
+~~~~~~~~~~~~~~~~~~~~~~~ [err % ('*._id.toString', "Use 'toHexString' instead.")]
+someObject.toString();
 
 [err]: Calls to '%s' are not allowed.
diff --git a/test/rules/ban/tslint.json b/test/rules/ban/tslint.json
@@ -10,7 +10,8 @@
       {"name": ["_", "map"]},
       ["_", "filter", "Use the native JavaScript 'myArray.filter' instead."],
       {"name": ["*", "forEach"], "message": "Use a regular for loop instead."},
-      {"name": ["chai", "assert", "equal"], "message": "Use 'strictEqual' instead."}
+      {"name": ["chai", "assert", "equal"], "message": "Use 'strictEqual' instead."},
+      {"name": ["*", "_id", "toString"], "message": "Use 'toHexString' instead."}
     ]
   }
 }