From 8e6f6a4060734689577429e38a2577b5accecaf5 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 8 Sep 2016 08:34:33 -0700 Subject: [PATCH 1/3] Update preferConstRule to use getCombined*X*Flags now that they are exported. --- package.json | 2 +- scripts/tslint/preferConstRule.ts | 24 ++---------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 3297788667c..1f943f89788 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "ts-node": "latest", "tsd": "latest", "tslint": "next", - "typescript": "2.1.0-dev.20160906" + "typescript": "next" }, "scripts": { "pretest": "jake tests", diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index 1d316692468..bc484728420 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -21,32 +21,12 @@ function walkUpBindingElementsAndPatterns(node: ts.Node): ts.Node { return node; } -function getCombinedNodeFlags(node: ts.Node): ts.NodeFlags { - node = walkUpBindingElementsAndPatterns(node); - - let flags = node.flags; - if (node.kind === ts.SyntaxKind.VariableDeclaration) { - node = node.parent; - } - - if (node && node.kind === ts.SyntaxKind.VariableDeclarationList) { - flags |= node.flags; - node = node.parent; - } - - if (node && node.kind === ts.SyntaxKind.VariableStatement) { - flags |= node.flags; - } - - return flags; -} - function isLet(node: ts.Node) { - return !!(getCombinedNodeFlags(node) & ts.NodeFlags.Let); + return !!(ts.getCombinedNodeFlags(node) & ts.NodeFlags.Let); } function isExported(node: ts.Node) { - return !!(getCombinedNodeFlags(node) & ts.NodeFlags.Export); + return !!(ts.getCombinedModifierFlags(node) & ts.ModifierFlags.Export); } function isAssignmentOperator(token: ts.SyntaxKind): boolean { From b142bfce7c29124dd10a4261d97b7ebfdf16472f Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 8 Sep 2016 08:36:39 -0700 Subject: [PATCH 2/3] Remove another unused function in preferConstRule --- scripts/tslint/preferConstRule.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index bc484728420..b1394c3bd1f 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -13,14 +13,6 @@ function isBindingPattern(node: ts.Node): node is ts.BindingPattern { return !!node && (node.kind === ts.SyntaxKind.ArrayBindingPattern || node.kind === ts.SyntaxKind.ObjectBindingPattern); } -function walkUpBindingElementsAndPatterns(node: ts.Node): ts.Node { - while (node && (node.kind === ts.SyntaxKind.BindingElement || isBindingPattern(node))) { - node = node.parent; - } - - return node; -} - function isLet(node: ts.Node) { return !!(ts.getCombinedNodeFlags(node) & ts.NodeFlags.Let); } From 1fe7d3f4764693603e80501997163a903c30862f Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders Date: Thu, 8 Sep 2016 08:37:36 -0700 Subject: [PATCH 3/3] Yep, another unused function in preferConstRule --- scripts/tslint/preferConstRule.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts index b1394c3bd1f..60d771863be 100644 --- a/scripts/tslint/preferConstRule.ts +++ b/scripts/tslint/preferConstRule.ts @@ -9,10 +9,6 @@ export class Rule extends Lint.Rules.AbstractRule { } } -function isBindingPattern(node: ts.Node): node is ts.BindingPattern { - return !!node && (node.kind === ts.SyntaxKind.ArrayBindingPattern || node.kind === ts.SyntaxKind.ObjectBindingPattern); -} - function isLet(node: ts.Node) { return !!(ts.getCombinedNodeFlags(node) & ts.NodeFlags.Let); }