let/const

src/typing/constraint_js.ml

@@ -682,11 +682,15 @@ module Scope = struct
 
     and implicit_let_kinds =
       | ClassNameBinding
+      | CatchParamBinding
+      | FunctionBinding
 
     let string_of_value_kind = function
     | Const -> "const"
     | Let None -> "let"
     | Let (Some ClassNameBinding) -> "class"
+    | Let (Some CatchParamBinding) -> "catch"
+    | Let (Some FunctionBinding) -> "function"
     | Var -> "var"
 
     type value_binding = {
@@ -765,6 +769,13 @@ module Scope = struct
         else Value { v with specific = make_specific v.general }
       | Type _ -> entry
 
+    let is_lex = function
+      | Type _ -> false
+      | Value v ->
+        match v.kind with
+        | Const -> true
+        | Let _ -> true
+        | _ -> false
   end
 
   (* keys for refinements *)
@@ -904,6 +915,10 @@ module Scope = struct
     | Some f -> scope |> update_entries (Entry.havoc ~name f)
     | None -> ()
 
+  let is_lex scope =
+    match scope.kind with
+    | LexScope -> true
+    | _ -> false
 end
 
 (***************************************)

src/typing/constraint_js.mli

@@ -289,7 +289,10 @@ module Scope: sig
     val string_of_state: state -> string
 
     type value_kind = Const | Let of implicit_let_kinds option | Var
-    and implicit_let_kinds = ClassNameBinding
+    and implicit_let_kinds =
+      | ClassNameBinding
+      | CatchParamBinding
+      | FunctionBinding
 
     val string_of_value_kind: value_kind -> string
 
@@ -327,6 +330,8 @@ module Scope: sig
 
     val string_of_kind: t -> string
     val havoc: ?name:string -> (Type.t -> Type.t) -> string -> t -> t
+
+    val is_lex: t -> bool
   end
 
   module Key: sig
@@ -379,6 +384,7 @@ module Scope: sig
 
   val havoc: ?name: string -> ?make_specific: (Type.t -> Type.t) -> t -> unit
 
+  val is_lex: t -> bool
 end
 
 (***************************************)