From ab59fd08e535b86746730314ac145beb08099c13 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sun, 10 May 2015 19:35:41 +0100
Subject: [PATCH] fix array type inferrence for file#toArray from being so
 wonky - fixes #1355

---
 src/babel/traversal/path/index.js | 2 +-
 src/babel/traversal/scope.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/babel/traversal/path/index.js b/src/babel/traversal/path/index.js
index 63e029e34c..ac219889c5 100644
--- a/src/babel/traversal/path/index.js
+++ b/src/babel/traversal/path/index.js
@@ -1048,7 +1048,7 @@ export default class TraversalPath {
     var type     = typeInfo.annotation;
     if (!type) return false;
 
-    if (type.inferred && opts.inference === false) {
+    if (typeInfo.inferred && opts.inference === false) {
       return false;
     }
 
diff --git a/src/babel/traversal/scope.js b/src/babel/traversal/scope.js
index ce75f9ece3..ab94b3d6bc 100644
--- a/src/babel/traversal/scope.js
+++ b/src/babel/traversal/scope.js
@@ -397,7 +397,7 @@ export default class Scope {
 
     if (t.isIdentifier(node)) {
       var binding = this.getBinding(node.name);
-      if (binding && binding.isTypeGeneric("Array", { inference: false })) return node;
+      if (binding && binding.constant && binding.isTypeGeneric("Array")) return node;
     }
 
     if (t.isArrayExpression(node)) {