Merge pull request microsoft#5569 from mihailik/patch-2

mhegazy · mhegazy · commit 00aa3c8a3833 · 2015-11-11T11:46:46.000-08:00
Use ts.indexOf instead of Array.prototype.indexOf
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3799,7 +3799,7 @@ namespace ts {
             if (node.initializer) {
                 const signatureDeclaration = <SignatureDeclaration>node.parent;
                 const signature = getSignatureFromDeclaration(signatureDeclaration);
-                const parameterIndex = signatureDeclaration.parameters.indexOf(node);
+                const parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);
                 Debug.assert(parameterIndex >= 0);
                 return parameterIndex >= signature.minArgumentCount;
             }
diff --git a/src/services/formatting/tokenRange.ts b/src/services/formatting/tokenRange.ts
@@ -14,7 +14,7 @@ namespace ts.formatting {
             constructor(from: SyntaxKind, to: SyntaxKind, except: SyntaxKind[]) {
                 this.tokens = [];
                 for (let token = from; token <= to; token++) {
-                    if (except.indexOf(token) < 0) {
+                    if (ts.indexOf(except, token) < 0) {
                         this.tokens.push(token);
                     }
                 }
@@ -123,4 +123,4 @@ namespace ts.formatting {
             static TypeNames = TokenRange.FromTokens([SyntaxKind.Identifier, SyntaxKind.NumberKeyword, SyntaxKind.StringKeyword, SyntaxKind.BooleanKeyword, SyntaxKind.SymbolKeyword, SyntaxKind.VoidKeyword, SyntaxKind.AnyKeyword]);
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -3799,7 +3799,7 @@ namespace ts {`
`3799`	`3799`	`if (node.initializer) {`
`3800`	`3800`	`const signatureDeclaration = <SignatureDeclaration>node.parent;`
`3801`	`3801`	`const signature = getSignatureFromDeclaration(signatureDeclaration);`
`3802`		`- const parameterIndex = signatureDeclaration.parameters.indexOf(node);`
	`3802`	`+ const parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);`
`3803`	`3803`	`Debug.assert(parameterIndex >= 0);`
`3804`	`3804`	`return parameterIndex >= signature.minArgumentCount;`
`3805`	`3805`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace ts.formatting {`
`14`	`14`	`constructor(from: SyntaxKind, to: SyntaxKind, except: SyntaxKind[]) {`
`15`	`15`	`this.tokens = [];`
`16`	`16`	`for (let token = from; token <= to; token++) {`
`17`		`- if (except.indexOf(token) < 0) {`
	`17`	`+ if (ts.indexOf(except, token) < 0) {`
`18`	`18`	`this.tokens.push(token);`
`19`	`19`	`}`
`20`	`20`	`}`
`@@ -123,4 +123,4 @@ namespace ts.formatting {`
`123`	`123`	`static TypeNames = TokenRange.FromTokens([SyntaxKind.Identifier, SyntaxKind.NumberKeyword, SyntaxKind.StringKeyword, SyntaxKind.BooleanKeyword, SyntaxKind.SymbolKeyword, SyntaxKind.VoidKeyword, SyntaxKind.AnyKeyword]);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`		`-}`
	`126`	`+}`