From 3cffe47eea73571f571949b577a235ee1ef85c37 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Mon, 8 Jun 2015 01:00:01 +0100
Subject: [PATCH] fix NodePath#isGenericType method name

---
 .../transformation/transformers/es6/parameters.rest.js      | 2 +-
 .../transformation/transformers/es6/template-literals.js    | 2 +-
 .../transformation/transformers/optimisation/flow.for-of.js | 2 +-
 src/babel/traversal/path/resolution.js                      | 6 +++---
 src/babel/traversal/scope/index.js                          | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/babel/transformation/transformers/es6/parameters.rest.js b/src/babel/transformation/transformers/es6/parameters.rest.js
index bf4d02210e..7cd88691b3 100644
--- a/src/babel/transformation/transformers/es6/parameters.rest.js
+++ b/src/babel/transformation/transformers/es6/parameters.rest.js
@@ -33,7 +33,7 @@ var memberExpressionOptimisationVisitor = {
       // if we know that this member expression is referencing a number then we can safely
       // optimise it
       var prop = this.parentPath.get("property");
-      if (prop.isTypeAnnotation("Number")) {
+      if (prop.isGenericType("Number")) {
         state.candidates.push(this);
         return;
       }
diff --git a/src/babel/transformation/transformers/es6/template-literals.js b/src/babel/transformation/transformers/es6/template-literals.js
index c1cc69b80b..4fd265fe2b 100644
--- a/src/babel/transformation/transformers/es6/template-literals.js
+++ b/src/babel/transformation/transformers/es6/template-literals.js
@@ -16,7 +16,7 @@ function crawl(path) {
   if (path.is("_templateLiteralProduced")) {
     crawl(path.get("left"));
     crawl(path.get("right"));
-  } else if (!path.isTypeAnnotation("String") && !path.isTypeAnnotation("Number")) {
+  } else if (!path.isGenericType("String") && !path.isGenericType("Number")) {
     path.replaceWith(t.callExpression(t.identifier("String"), [path.node]));
   }
 }
diff --git a/src/babel/transformation/transformers/optimisation/flow.for-of.js b/src/babel/transformation/transformers/optimisation/flow.for-of.js
index e87cfae969..8401d330e0 100644
--- a/src/babel/transformation/transformers/optimisation/flow.for-of.js
+++ b/src/babel/transformation/transformers/optimisation/flow.for-of.js
@@ -5,7 +5,7 @@ export var metadata = {
 };
 
 export function ForOfStatement(node, parent, scope, file) {
-  if (this.get("right").isTypeAnnotation("Array")) {
+  if (this.get("right").isGenericType("Array")) {
     return _ForOfStatementArray.call(this, node, scope, file);
   }
 }
diff --git a/src/babel/traversal/path/resolution.js b/src/babel/traversal/path/resolution.js
index 5a74d1bd8f..80fa332d02 100644
--- a/src/babel/traversal/path/resolution.js
+++ b/src/babel/traversal/path/resolution.js
@@ -244,10 +244,10 @@ export function _getTypeAnnotation(force?: boolean): ?Object {
       var right = this.get("right");
       var left  = this.get("left");
 
-      if (left.isTypeAnnotation("Number") && right.isTypeAnnotation("Number")) {
+      if (left.isGenericType("Number") && right.isGenericType("Number")) {
         // both numbers so this will be a number
         return t.numberTypeAnnotation();
-      } else if (left.isTypeAnnotation("String") || right.isTypeAnnotation("String")) {
+      } else if (left.isGenericType("String") || right.isGenericType("String")) {
         // one is a string so the result will be a string
         return t.stringTypeAnnotation();
       }
@@ -333,7 +333,7 @@ export function _getTypeAnnotation(force?: boolean): ?Object {
  * Description
  */
 
-export function isTypeAnnotation(genericName: string): boolean {
+export function isGenericType(genericName: string): boolean {
   var type = this.getTypeAnnotation();
 
   if (t.isGenericTypeAnnotation(type) && t.isIdentifier(type.id, { name: genericName })) {
diff --git a/src/babel/traversal/scope/index.js b/src/babel/traversal/scope/index.js
index 93fbb2b1f6..bbf90a1479 100644
--- a/src/babel/traversal/scope/index.js
+++ b/src/babel/traversal/scope/index.js
@@ -406,7 +406,7 @@ export default class Scope {
 
     if (t.isIdentifier(node)) {
       var binding = this.getBinding(node.name);
-      if (binding && binding.constant && binding.path.isTypeAnnotation("Array")) return node;
+      if (binding && binding.constant && binding.path.isGenericType("Array")) return node;
     }
 
     if (t.isArrayExpression(node)) {