Skip to content

Commit 6eaa610

Browse files
committed
fix(selectorNames): fix type validation issue
1 parent ad2c4b4 commit 6eaa610

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"typings": "^0.6.8"
3636
},
3737
"peerDependencies": {
38-
"tslint": "^3.3.0",
39-
"typescript": "^1.7.5"
38+
"tslint": "^3.5.0",
39+
"typescript": "~1.8.0"
4040
},
4141
"dependencies": {
4242
"sprintf-js": "^1.0.3"

src/selectorNameBase.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ class SelectorNameValidatorWalker extends Lint.RuleWalker {
7171
(<ts.ObjectLiteralExpression>arg).properties.filter(prop => (<any>prop.name).text === 'selector')
7272
.forEach(prop => {
7373
let p = <any>prop;
74-
let type = this.typeChecker.getTypeAtLocation(p.initializer);
75-
if (type.flags === ts.TypeFlags.String && !this.rule.validate(p.initializer.text)) {
74+
if (p.initializer.kind === ts.SyntaxKind.StringLiteral && !this.rule.validate(p.initializer.text)) {
7675
let error = this.rule.getFailureString({ selector: p.initializer.text, className });
7776
this.addFailure(this.createFailure(p.initializer.getStart(), p.initializer.getWidth(), error));
7877
}

test/testHelper.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ function lint(ruleName: string, source: string, options): tslint.LintResult {
3333
}
3434

3535
export function assertFailure(ruleName: string, source: string, fail: IExpectedFailure, options = null) {
36-
let result = lint(ruleName, source, options);
36+
let result;
37+
try {
38+
result = lint(ruleName, source, options);
39+
} catch (e) {
40+
console.log(e.stack);
41+
}
3742
chai.assert(result.failureCount > 0, 'no failures');
3843
result.failures.forEach(ruleFail => {
3944
chai.assert.equal(fail.message, ruleFail.getFailure(), 'error messages dont\'t match');

0 commit comments

Comments
 (0)