Sync changes to upstream

Author: gabelevi

PATENTS

@@ -2,12 +2,12 @@ Additional Grant of Patent Rights Version 2
 
 "Software" means the Flow software distributed by Facebook, Inc.
 
-Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
-(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
+Facebook, Inc. ("Facebook") hereby grants to each recipient of the Software
+("you") a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
 (subject to the termination provision below) license under any Necessary
 Claims, to make, have made, use, sell, offer to sell, import, and otherwise
 transfer the Software. For avoidance of doubt, no license is granted under
-Facebook's rights in any patent claims that are infringed by (i) modifications
+Facebook’s rights in any patent claims that are infringed by (i) modifications
 to the Software made by you or any third party or (ii) the Software in
 combination with any software or other technology.
 

hack/client/clientCheck.ml

@@ -10,6 +10,7 @@
 
 open ClientEnv
 open ClientExceptions
+open Utils
 
 let connect args =
   let ic, oc = ClientUtils.connect args.root in
@@ -217,6 +218,13 @@ let rec main args retries =
         exit 0
     | MODE_LINT fnl ->
         let ic, oc = connect args in
+        let fnl = List.fold_left begin fun acc fn ->
+          match Sys_utils.realpath fn with
+          | Some path -> path :: acc
+          | None ->
+              prerr_endlinef "Could not find file '%s'" fn;
+              acc
+        end [] fnl in
         ServerMsg.cmd_to_channel oc (ServerMsg.LINT fnl);
         let results : ServerLint.result = Marshal.from_channel ic in
         ClientLint.go results args.output_json;

hack/format/format_hack.ml

@@ -844,12 +844,14 @@ let next_non_ws_token env =
 (* Helpers to look ahead. *)
 (*****************************************************************************)
 
-let try_word env word f = wrap env begin function
-  | Tword when !(env.last_str) = word ->
+let try_words env wordl f = wrap env begin function
+  | Tword when List.mem !(env.last_str) wordl ->
       f env
   | _ -> back env
 end
 
+let try_word env word f = try_words env [word] f
+
 let try_token env tok f = wrap env begin function
   | tok' when tok = tok' ->
       f env
@@ -1203,7 +1205,15 @@ and name env =
 
 and name_loop env =
   match token env with
-  | Tpercent | Tcolon | Tminus | Tword | Tbslash ->
+  (* names can contain colons, but cannot end with them *)
+  | Tcolon when attempt env begin fun env ->
+      match token env with
+        | Tword -> true
+        | _ -> false
+    end ->
+      last_token env;
+      name_loop env
+  | Tpercent | Tminus | Tword | Tbslash ->
       last_token env;
       name_loop env
   | _ ->
@@ -1283,7 +1293,7 @@ and hint env = wrap env begin function
           return_type env
       | _ ->
           name_loop env;
-          as_constraint env;
+          typevar_constraint env;
           hint_parameter env
       )
   | Tlp ->
@@ -1294,6 +1304,14 @@ and hint env = wrap env begin function
       back env
 end
 
+and typevar_constraint env =
+  try_words env ["as"; "super"] begin fun env ->
+    space env;
+    last_token env;
+    space env;
+    hint env
+  end;
+
 and as_constraint env =
   try_word env "as" begin fun env ->
     space env;

hack/hh_single_type_check.ml

@@ -43,10 +43,10 @@ let builtins = "<?hh // decl\n"^
   "interface KeyedContainer<Tk, Tv> extends Container<Tv>, KeyedTraversable<Tk,Tv> {}\n"^
   "interface KeyedIterator<Tk, Tv> extends KeyedTraversable<Tk, Tv>, Iterator<Tv> {}\n"^
   "interface KeyedIterable<Tk, Tv> extends KeyedTraversable<Tk, Tv>, Iterable<Tv> {}\n"^
-  "interface Awaitable<T> {"^
+  "interface Awaitable<+T> {"^
   "  public function getWaitHandle(): WaitHandle<T>;"^
   "}\n"^
-  "interface WaitHandle<T> extends Awaitable<T> {}\n"^
+  "interface WaitHandle<+T> extends Awaitable<T> {}\n"^
   "interface ConstVector<+Tv> extends KeyedIterable<int, Tv>, KeyedContainer<int, Tv>{"^
   "  public function map<Tu>((function(Tv): Tu) $callback): ConstVector<Tu>;"^
   "}\n"^
@@ -82,7 +82,7 @@ let builtins = "<?hh // decl\n"^
   "final class Set<Tv> implements ConstSet<Tv> {}\n"^
   "final class ImmSet<Tv> implements ConstSet<Tv> {}\n"^
   "class Exception { public function __construct(string $x) {} }\n"^
-  "class Generator<Tk, Tv, Ts> implements KeyedIterator<Tk, Tv> {\n"^
+  "class Generator<+Tk, +Tv, -Ts> implements KeyedIterator<Tk, Tv> {\n"^
   "  public function next(): void;\n"^
   "  public function current(): Tv;\n"^
   "  public function key(): Tk;\n"^
@@ -97,7 +97,7 @@ let builtins = "<?hh // decl\n"^
   "interface Countable { public function count(): int; }\n"^
   "interface AsyncIterator<Tv> {}\n"^
   "interface AsyncKeyedIterator<Tk, Tv> extends AsyncIterator<Tv> {}\n"^
-  "class AsyncGenerator<Tk, Tv, Ts> implements AsyncKeyedIterator<Tk, Tv> {\n"^
+  "class AsyncGenerator<+Tk, +Tv, -Ts> implements AsyncKeyedIterator<Tk, Tv> {\n"^
   "  public function next(): Awaitable<?(Tk, Tv)> {}\n"^
   "  public function send(?Ts $v): Awaitable<?(Tk, Tv)> {}\n"^
   "  public function raise(Exception $e): Awaitable<?(Tk, Tv)> {}"^
@@ -272,7 +272,8 @@ let handle_mode mode filename nenv files_info errors lint_errors ai_results =
       Relative_path.Map.iter begin fun fn fileinfo ->
         if fn = builtins_filename then () else begin
           let result = ServerColorFile.get_level_list
-            (fun () -> ignore (ServerIdeUtils.check_defs fileinfo); fn) in
+            (fun () -> ignore (ServerIdeUtils.check_defs
+              TypecheckerOptions.default fileinfo); fn) in
           print_colored fn result;
         end
       end files_info
@@ -305,7 +306,7 @@ let handle_mode mode filename nenv files_info errors lint_errors ai_results =
   | Suggest
   | Errors ->
       let errors = Relative_path.Map.fold begin fun _ fileinfo errors ->
-        errors @ ServerIdeUtils.check_defs fileinfo
+        errors @ ServerIdeUtils.check_defs TypecheckerOptions.default fileinfo
       end files_info errors in
       if mode = Suggest
       then Relative_path.Map.iter suggest_and_print files_info;
@@ -348,11 +349,11 @@ let main_hack { filename; mode; } =
               consider_names_just_for_autoload = false }
           end parsed_files in
 
-        (* Note that nenv.Naming.itcopt remains TypecheckerOptions.empty *)
+        (* Note that nenv.Naming.itcopt remains TypecheckerOptions.default *)
         let nenv = Relative_path.Map.fold begin fun fn fileinfo nenv ->
           let {FileInfo.funs; classes; typedefs; consts; _} = fileinfo in
           Naming.make_env nenv ~funs ~classes ~typedefs ~consts
-        end files_info Naming.empty in
+        end files_info (Naming.empty TypecheckerOptions.default) in
 
         let all_classes =
           Relative_path.Map.fold begin fun fn {FileInfo.classes; _} acc ->

hack/js/hh_ide.ml

@@ -47,7 +47,7 @@ let error el =
 
 let type_fun x fn =
   try
-    let tenv = Typing_env.empty fn in
+    let tenv = Typing_env.empty TypecheckerOptions.permissive fn in
     let fun_ = Naming_heap.FunHeap.find_unsafe x in
     Typing.fun_def tenv x fun_;
   with Not_found ->
@@ -56,7 +56,7 @@ let type_fun x fn =
 let type_class x fn =
   try
     let class_ = Naming_heap.ClassHeap.find_unsafe x in
-    let tenv = Typing_env.empty fn in
+    let tenv = Typing_env.empty TypecheckerOptions.permissive fn in
     Typing.class_def tenv x class_
   with Not_found ->
     ()
@@ -111,7 +111,8 @@ let declare_file fn content =
     then begin
       let funs, classes, typedefs, consts = make_funs_classes ast in
       Hashtbl.replace globals fn (is_php, funs, classes);
-      let nenv = Naming.make_env Naming.empty ~funs ~classes ~typedefs ~consts in
+      let nenv = Naming.empty TypecheckerOptions.permissive in
+      let nenv = Naming.make_env nenv ~funs ~classes ~typedefs ~consts in
       let all_classes = List.fold_right begin fun (_, cname) acc ->
         SMap.add cname (Relative_path.Set.singleton fn) acc
       end classes SMap.empty in
@@ -120,7 +121,7 @@ let declare_file fn content =
       SSet.iter begin fun cname ->
         match Naming_heap.ClassHeap.get cname with
         | None -> ()
-        | Some c -> Typing_decl.class_decl TypecheckerOptions.empty c
+        | Some c -> Typing_decl.class_decl (Naming.typechecker_options nenv) c
       end sub_classes
     end
     else Hashtbl.replace globals fn (false, [], [])
@@ -168,9 +169,8 @@ let hh_check fn =
         begin fun () ->
         let ast = Parser_heap.ParserHeap.find_unsafe fn in
         let funs, classes, typedefs, consts = make_funs_classes ast in
-        let nenv =
-          Naming.make_env Naming.empty ~funs ~classes ~typedefs ~consts
-        in
+        let nenv = Naming.empty TypecheckerOptions.permissive in
+        let nenv = Naming.make_env nenv ~funs ~classes ~typedefs ~consts in
         let all_classes = List.fold_right begin fun (_, cname) acc ->
           SMap.add cname (Relative_path.Set.singleton fn) acc
         end classes SMap.empty in
@@ -183,6 +183,12 @@ let hh_check fn =
           error [l]
         end
 
+let permissive_empty_envs fn =
+  let tcopt = TypecheckerOptions.permissive in
+  let nenv = Naming.empty tcopt in
+  let tenv = Typing_env.empty tcopt fn in
+  (nenv, tenv)
+
 let hh_auto_complete fn =
   let fn = Relative_path.create Relative_path.Root fn in
   AutocompleteService.attach_hooks();
@@ -192,15 +198,14 @@ let hh_auto_complete fn =
       List.iter begin fun def ->
         match def with
         | Ast.Fun f ->
-            let nenv = Naming.empty in
-            let tenv = Typing_env.empty fn in
+            let nenv, tenv = permissive_empty_envs fn in
             let f = Naming.fun_ nenv f in
             Typing.fun_def tenv (snd f.Nast.f_name) f
         | Ast.Class c ->
-            let nenv = Naming.empty in
-            let tenv = Typing_env.empty fn in
+            let nenv, tenv = permissive_empty_envs fn in
+            let tcopt = Naming.typechecker_options nenv in
             let c = Naming.class_ nenv c in
-            Typing_decl.class_decl TypecheckerOptions.empty c;
+            Typing_decl.class_decl tcopt c;
             let res = Typing.class_def tenv (snd c.Nast.c_name) c in
             res
         | _ -> ()
@@ -239,13 +244,11 @@ let hh_get_method_at_position fn line char =
       List.iter begin fun def ->
         match def with
         | Ast.Fun f ->
-            let nenv = Naming.empty in
-            let tenv = Typing_env.empty fn in
+            let nenv, tenv = permissive_empty_envs fn in
             let f = Naming.fun_ nenv f in
             Typing.fun_def tenv (snd f.Nast.f_name) f
         | Ast.Class c ->
-            let nenv = Naming.empty in
-            let tenv = Typing_env.empty fn in
+            let nenv, tenv = permissive_empty_envs fn in
             let c = Naming.class_ nenv c in
             let res = Typing.class_def tenv (snd c.Nast.c_name) c in
             res
@@ -321,16 +324,17 @@ let hh_find_lvar_refs file line char =
   try
     let get_result = FindLocalsService.attach_hooks line char in
     let ast = Parser_heap.ParserHeap.find_unsafe file in
+    let tcopt = TypecheckerOptions.permissive in
     Errors.ignore_ begin fun () ->
       (* We only need to name to find references to locals *)
       List.iter begin fun def ->
         match def with
         | Ast.Fun f ->
-            let nenv = Naming.empty in
+            let nenv = Naming.empty tcopt in
             let _ = Naming.fun_ nenv f in
             ()
         | Ast.Class c ->
-            let nenv = Naming.empty in
+            let nenv = Naming.empty tcopt in
             let _ = Naming.class_ nenv c in
             ()
         | _ -> ()
@@ -434,12 +438,14 @@ let hh_arg_info fn line char =
   let _, funs, classes = Hashtbl.find globals fn in
   Errors.ignore_ begin fun () ->
     List.iter begin fun (_, f_name) ->
-      let tenv = Typing_env.empty fn in
+      let tcopt = TypecheckerOptions.permissive in
+      let tenv = Typing_env.empty tcopt fn in
       let f = Naming_heap.FunHeap.find_unsafe f_name in
       Typing.fun_def tenv f_name f
     end funs;
     List.iter begin fun (_, c_name) ->
-      let tenv = Typing_env.empty fn in
+      let tcopt = TypecheckerOptions.permissive in
+      let tenv = Typing_env.empty tcopt fn in
       let c = Naming_heap.ClassHeap.find_unsafe c_name in
       Typing.class_def tenv c_name c
     end classes;