Skip to content

Commit

Permalink
Stop looking at .js files
Browse files Browse the repository at this point in the history
Summary: It was only used by a step removed in {D5139671}. I looked at remaining steps and I think nothing else needs it.

Reviewed By: dlreeves

Differential Revision: D6731028

fbshipit-source-id: 80d3a9dc7166b3325fc3230e7e7f3d6431c15e81
  • Loading branch information
dabek authored and hhvm-bot committed Jan 23, 2018
1 parent 225c0a5 commit dde9e77
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 11 deletions.
1 change: 0 additions & 1 deletion hphp/hack/src/server/serverEnv.ml
Expand Up @@ -124,7 +124,6 @@ let file_filter f =
(* Filter the relative path *) (* Filter the relative path *)
let f = Relative_path.strip_root_if_possible f in let f = Relative_path.strip_root_if_possible f in
(FindUtils.is_php f && not (FilesToIgnore.should_ignore f)) (FindUtils.is_php f && not (FilesToIgnore.should_ignore f))
|| FindUtils.is_js f


let list_files env oc = let list_files env oc =
let acc = List.fold_right let acc = List.fold_right
Expand Down
5 changes: 0 additions & 5 deletions hphp/hack/src/server/serverEnvBuild.ml
Expand Up @@ -28,11 +28,6 @@ let watchman_expression_terms = [
J.strlist ["suffix"; "hh"]; J.strlist ["suffix"; "hh"];
J.strlist ["suffix"; "hhi"]; J.strlist ["suffix"; "hhi"];
J.strlist ["suffix"; "xhp"]; J.strlist ["suffix"; "xhp"];
(* FIXME: This is clearly wrong, but we do it to match the
* behavior on the server-side. We need to investigate if
* tracking js files is truly necessary.
*)
J.strlist ["suffix"; "js"];
]; ];
]; ];
J.pred "not" @@ [ J.pred "not" @@ [
Expand Down
4 changes: 0 additions & 4 deletions hphp/hack/src/utils/findUtils.ml
Expand Up @@ -30,10 +30,6 @@ let is_php path =
not (is_dot_file path) && not (is_dot_file path) &&
List.exists extensions (Filename.check_suffix path) List.exists extensions (Filename.check_suffix path)


let is_js path =
not (is_dot_file path) &&
Filename.check_suffix path ".js"

(** Returns whether one of the ancestral directories of path has the given (** Returns whether one of the ancestral directories of path has the given
* name. *) * name. *)
let rec has_ancestor path ancestor_name = let rec has_ancestor path ancestor_name =
Expand Down
2 changes: 1 addition & 1 deletion hphp/hack/src/utils/findUtils.mli
Expand Up @@ -8,6 +8,6 @@
* *
*) *)


val is_dot_file: string -> bool
val is_php: string -> bool val is_php: string -> bool
val is_js: string -> bool
val has_ancestor: string -> string -> bool val has_ancestor: string -> string -> bool

0 comments on commit dde9e77

Please sign in to comment.