fix handling of multifile tests in the ocaml version of get_package_for_file

Summary: Aligns the ocaml implementation of `get_package_for_file` with the rust version in package_info_impl.rs.  The option `support_multifile_tests` is used to strip the enclosing file prefix in multifile tests, eg `test.php--foo.php` -> `foo.php` (relied upon for package matching in the test suite).

Reviewed By: DavidSnider

Differential Revision: D94274344

fbshipit-source-id: 3bac932ebf6dc64893637a9349ffe86bc5364e52

Author: vassilmladenov

hphp/hack/src/naming/naming.ml

@@ -335,6 +335,8 @@ let fun_def_of_stmts ctx stmts : Nast.fun_def option =
     let fd_package =
       let pos_suffix = Relative_path.suffix (Pos.filename pos) in
       Package_info.get_package_for_file
+        ~support_multifile_tests:
+          popt.ParserOptions.package_support_multifile_tests
         popt.ParserOptions.package_info
         pos_suffix
       |> Option.map ~f:(fun pkg ->

hphp/hack/src/package/package_info.ml

@@ -57,7 +57,15 @@ let from_packages (packages : Package.t list) : t =
   in
   { existing_packages; include_path_to_package_map }
 
-let get_package_for_file (info : t) (path : string) : Package.t option =
+let get_package_for_file ~support_multifile_tests (info : t) (path : string) :
+    Package.t option =
+  let path =
+    if support_multifile_tests then
+      let re = Str.regexp "[^/]*--" in
+      Str.replace_first re "" path
+    else
+      path
+  in
   Option.map
     ~f:snd
     (List.find

hphp/hack/src/package/package_info.mli

@@ -17,4 +17,5 @@ val get_package : t -> string -> Package.t option
 
 val package_exists : t -> string -> bool
 
-val get_package_for_file : t -> string -> Package.t option
+val get_package_for_file :
+  support_multifile_tests:bool -> t -> string -> Package.t option

hphp/hack/src/typing/typing_packages.ml

@@ -129,9 +129,12 @@ let can_access_by_package_rules
           Some (Aast_defs.PackageOverride _) )
         when package_includes current_pkg target_pkg ->
         let target_package_before_override =
+          let tcopt = Env.get_tcopt env in
           Option.map
             (Package_info.get_package_for_file
-               (Env.get_tcopt env |> TypecheckerOptions.package_info)
+               ~support_multifile_tests:
+                 (TypecheckerOptions.package_support_multifile_tests tcopt)
+               (TypecheckerOptions.package_info tcopt)
                (Relative_path.suffix target_file))
             ~f:Package.get_package_name
         in

hphp/hack/src/typing/write_symbol_info/package_utils.ml

@@ -24,6 +24,9 @@ let get_package ctx path text =
     let package_name =
       match
         Package_info.get_package_for_file
+          ~support_multifile_tests:
+            (Provider_context.get_tcopt ctx
+            |> TypecheckerOptions.package_support_multifile_tests)
           (Provider_context.get_package_info ctx)
           path
       with

hphp/hack/test/package/package_access_lint/lint_into_override_02.php.exp

@@ -1,4 +1,4 @@
-warning: Lint[5655] This is a cross-boundary edge. Although the callee is already in the caller package pkg1 via __PackageOverride('pkg1'), cross-boundary edges contribute to the bloating of pkg1 and SHOULD BE REMOVED. Either move the callee into the caller's package via hg mv, use __RequirePackage (if the whole function should only be invoked from pkg1) or gate this reference via a package check (if this portion of the function is meant to be gated by an environment check). [1]
+warning: Lint[5655] This is a cross-boundary edge. Although the callee is already in the caller package pkg1 via __PackageOverride('pkg1'), cross-boundary edges contribute to the bloating of pkg1 and SHOULD BE REMOVED. Either move the callee into the caller's package via hg mv, use __RequirePackage (if the whole function should only be invoked from pkg2) or gate this reference via a package check (if this portion of the function is meant to be gated by an environment check). [1]
 
 lint_into_override_02.php--bar.php:6:10
     4 | class D2 {

hphp/hack/test/package/package_access_lint/lint_into_override_03.php.exp

@@ -1,4 +1,4 @@
-warning: Lint[5655] This is a cross-boundary edge. Although the callee is already in the caller package pkg2 via __PackageOverride('pkg1'), cross-boundary edges contribute to the bloating of pkg1 and SHOULD BE REMOVED. Either move the callee into the caller's package via hg mv, use __RequirePackage (if the whole function should only be invoked from pkg1) or gate this reference via a package check (if this portion of the function is meant to be gated by an environment check). [1]
+warning: Lint[5655] This is a cross-boundary edge. Although the callee is already in the caller package pkg2 via __PackageOverride('pkg1'), cross-boundary edges contribute to the bloating of pkg1 and SHOULD BE REMOVED. Either move the callee into the caller's package via hg mv, use __RequirePackage (if the whole function should only be invoked from pkg3) or gate this reference via a package check (if this portion of the function is meant to be gated by an environment check). [1]
 
 lint_into_override_03.php--warning_03b.php:6:10
     4 | class D3 {