Merge pull request #10810 from Microsoft/handle_omitted_expression

Andy · web-flow · commit b052d69dd878 · 2016-09-09T09:02:31.000-07:00
Handle `OmittedExpression` nodes in binding patterns
diff --git a/scripts/tslint/preferConstRule.ts b/scripts/tslint/preferConstRule.ts
@@ -93,11 +93,16 @@ class PreferConstWalker extends Lint.RuleWalker {
 
     private visitBindingPatternIdentifiers(pattern: ts.BindingPattern) {
         for (const element of pattern.elements) {
-            if (element.name.kind === ts.SyntaxKind.Identifier) {
-                this.markAssignment(element.name as ts.Identifier);
+            if (element.kind !== ts.SyntaxKind.BindingElement) {
+                continue;
+            }
+
+            const name = (<ts.BindingElement>element).name;
+            if (name.kind === ts.SyntaxKind.Identifier) {
+                this.markAssignment(name as ts.Identifier);
             }
             else {
-                this.visitBindingPatternIdentifiers(element.name as ts.BindingPattern);
+                this.visitBindingPatternIdentifiers(name as ts.BindingPattern);
             }
         }
     }
@@ -191,7 +196,9 @@ class PreferConstWalker extends Lint.RuleWalker {
 
     private collectBindingPatternIdentifiers(value: ts.VariableDeclaration, pattern: ts.BindingPattern, table: ts.MapLike<DeclarationUsages>) {
         for (const element of pattern.elements) {
-            this.collectNameIdentifiers(value, element.name, table);
+            if (element.kind === ts.SyntaxKind.BindingElement) {
+                this.collectNameIdentifiers(value, (<ts.BindingElement>element).name, table);
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -93,11 +93,16 @@ class PreferConstWalker extends Lint.RuleWalker {`
`93`	`93`
`94`	`94`	`private visitBindingPatternIdentifiers(pattern: ts.BindingPattern) {`
`95`	`95`	`for (const element of pattern.elements) {`
`96`		`- if (element.name.kind === ts.SyntaxKind.Identifier) {`
`97`		`- this.markAssignment(element.name as ts.Identifier);`
	`96`	`+ if (element.kind !== ts.SyntaxKind.BindingElement) {`
	`97`	`+ continue;`
	`98`	`+ }`
	`99`	`+`
	`100`	`+ const name = (<ts.BindingElement>element).name;`
	`101`	`+ if (name.kind === ts.SyntaxKind.Identifier) {`
	`102`	`+ this.markAssignment(name as ts.Identifier);`
`98`	`103`	`}`
`99`	`104`	`else {`
`100`		`- this.visitBindingPatternIdentifiers(element.name as ts.BindingPattern);`
	`105`	`+ this.visitBindingPatternIdentifiers(name as ts.BindingPattern);`
`101`	`106`	`}`
`102`	`107`	`}`
`103`	`108`	`}`
`@@ -191,7 +196,9 @@ class PreferConstWalker extends Lint.RuleWalker {`
`191`	`196`
`192`	`197`	`private collectBindingPatternIdentifiers(value: ts.VariableDeclaration, pattern: ts.BindingPattern, table: ts.MapLike<DeclarationUsages>) {`
`193`	`198`	`for (const element of pattern.elements) {`
`194`		`- this.collectNameIdentifiers(value, element.name, table);`
	`199`	`+ if (element.kind === ts.SyntaxKind.BindingElement) {`
	`200`	`+ this.collectNameIdentifiers(value, (<ts.BindingElement>element).name, table);`
	`201`	`+ }`
`195`	`202`	`}`
`196`	`203`	`}`
`197`	`204`	`}`