fix missing autoimported types (#214)

hhvm · Sep 9, 2019 · c60088b · c60088b
1 parent fe48e74
commit c60088b
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 22 deletions.
diff --git a/src/ResolvedTypeKind.hack b/src/ResolvedTypeKind.hack
@@ -12,4 +12,6 @@ namespace Facebook\HHAST;
 enum ResolvedTypeKind: string {
   GENERIC_PARAMETER = 'generic_parameter';
   QUALIFIED_TYPE = 'qualified_type';
+  QUALIFIED_AUTOIMPORTED_TYPE = 'qualified_autoimported_type';
+  CALLABLE = 'callable';
 }
diff --git a/src/__Private/Resolution/resolve_name.hack b/src/__Private/Resolution/resolve_name.hack
@@ -26,27 +26,6 @@ function resolve_name(
     'Call on the class name without generics',
   );
 
-  $autoimports = keyset[
-    'Awaitable',
-    'ConstMap',
-    'ConstSet',
-    'ConstVector',
-    'Container',
-    'ImmMap',
-    'ImmSet',
-    'ImmVector',
-    'KeyedContainer',
-    'KeyedTraversable',
-    'Map',
-    'Set',
-    'Stringish',
-    'Traversable',
-    'Vector',
-  ];
-  if (C\contains_key($autoimports, $name)) {
-    return 'HH\\'.$name;
-  }
-
   $ns = get_current_namespace($root, $node);
 
   if (Str\contains($name, '\\')) {

diff --git a/src/resolve_type.hack b/src/resolve_type.hack
@@ -17,7 +17,64 @@ function resolve_type(
   Script $root,
   Node $node,
 ): shape('kind' => ResolvedTypeKind, 'name' => string) {
-  $uses = Resolution\get_current_uses($root, $node);
+  if ($type === 'callable') {
+    // Super special case. It's not a legal type anymore but still supported by
+    // runtime.
+    return shape(
+      'kind' => ResolvedTypeKind::CALLABLE,
+      'name' => 'callable',
+    );
+  }
+
+  // From hhvm/hphp/hack/src/parser/namespaces.ml
+  $autoimports = keyset[
+    'AsyncFunctionWaitHandle',
+    'AsyncGenerator',
+    'AsyncGeneratorWaitHandle',
+    'AsyncIterator',
+    'AsyncKeyedIterator',
+    'Awaitable',
+    'AwaitAllWaitHandle',
+    'Collection',
+    'ConditionWaitHandle',
+    'Container',
+    'ExternalThreadEventWaitHandle',
+    'IMemoizeParam',
+    'ImmMap',
+    'ImmSet',
+    'ImmVector',
+    'InvariantException',
+    'Iterable',
+    'Iterator',
+    'KeyedContainer',
+    'KeyedIterable',
+    'KeyedIterator',
+    'KeyedTraversable',
+    'Map',
+    'ObjprofObjectStats',
+    'ObjprofPathsStats',
+    'ObjprofStringStats',
+    'Pair',
+    'RescheduleWaitHandle',
+    'ResumableWaitHandle',
+    'Set',
+    'Shapes',
+    'SleepWaitHandle',
+    'StaticWaitHandle',
+    'Traversable',
+    'TypeStructure',
+    'TypeStructureKind',
+    'Vector',
+    'WaitableWaitHandle',
+    'XenonSample',
+  ];
+
+  if (C\contains_key($autoimports, $type)) {
+    return shape(
+      'kind' => ResolvedTypeKind::QUALIFIED_AUTOIMPORTED_TYPE,
+      'name' => 'HH\\'.$type,
+    );
+  }
 
   if (C\contains_key(Resolution\get_current_generics($root, $node), $type)) {
     // Generic type names don't belong to a namespace, nothing to resolve.
@@ -27,6 +84,8 @@ function resolve_type(
     );
   }
 
+  $uses = Resolution\get_current_uses($root, $node);
+
   if (C\contains_key($uses['types'], $type)) {
     return shape(
       'kind' => ResolvedTypeKind::QUALIFIED_TYPE,