Skip to content

Commit d248358

Browse files
authored
Merge pull request #10781 from Microsoft/update-preferConstRule
Update prefer const rule
2 parents 874846a + 1fe7d3f commit d248358

File tree

2 files changed

+3
-35
lines changed

2 files changed

+3
-35
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"ts-node": "latest",
7878
"tsd": "latest",
7979
"tslint": "next",
80-
"typescript": "2.1.0-dev.20160906"
80+
"typescript": "next"
8181
},
8282
"scripts": {
8383
"pretest": "jake tests",

scripts/tslint/preferConstRule.ts

+2-34
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,12 @@ export class Rule extends Lint.Rules.AbstractRule {
99
}
1010
}
1111

12-
function isBindingPattern(node: ts.Node): node is ts.BindingPattern {
13-
return !!node && (node.kind === ts.SyntaxKind.ArrayBindingPattern || node.kind === ts.SyntaxKind.ObjectBindingPattern);
14-
}
15-
16-
function walkUpBindingElementsAndPatterns(node: ts.Node): ts.Node {
17-
while (node && (node.kind === ts.SyntaxKind.BindingElement || isBindingPattern(node))) {
18-
node = node.parent;
19-
}
20-
21-
return node;
22-
}
23-
24-
function getCombinedNodeFlags(node: ts.Node): ts.NodeFlags {
25-
node = walkUpBindingElementsAndPatterns(node);
26-
27-
let flags = node.flags;
28-
if (node.kind === ts.SyntaxKind.VariableDeclaration) {
29-
node = node.parent;
30-
}
31-
32-
if (node && node.kind === ts.SyntaxKind.VariableDeclarationList) {
33-
flags |= node.flags;
34-
node = node.parent;
35-
}
36-
37-
if (node && node.kind === ts.SyntaxKind.VariableStatement) {
38-
flags |= node.flags;
39-
}
40-
41-
return flags;
42-
}
43-
4412
function isLet(node: ts.Node) {
45-
return !!(getCombinedNodeFlags(node) & ts.NodeFlags.Let);
13+
return !!(ts.getCombinedNodeFlags(node) & ts.NodeFlags.Let);
4614
}
4715

4816
function isExported(node: ts.Node) {
49-
return !!(getCombinedNodeFlags(node) & ts.NodeFlags.Export);
17+
return !!(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export);
5018
}
5119

5220
function isAssignmentOperator(token: ts.SyntaxKind): boolean {

0 commit comments

Comments
 (0)