From e05fcb76317cd32d2d31fae685dcc3f2726ce9a3 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Mon, 9 Jul 2018 10:03:32 +0100 Subject: [PATCH] Do not parse dune-project files in ignored directories Signed-off-by: Jeremie Dimino --- src/file_tree.ml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/file_tree.ml b/src/file_tree.ml index 50b1b252..e93c7b93 100644 --- a/src/file_tree.ml +++ b/src/file_tree.ml @@ -206,15 +206,15 @@ let load ?(extra_ignored_subtrees=Path.Set.empty) path = ~compare:(fun (a, _, _) (b, _, _) -> String.compare a b) sub_dirs in - let project = - match Dune_project.load ~dir:path ~files with - | Some x -> x - | None -> project - in - let dune_file, ignored_subdirs = + let project, dune_file, ignored_subdirs = if ignored then - (None, String.Set.empty) + (project, None, String.Set.empty) else + let project = + match Dune_project.load ~dir:path ~files with + | Some x -> x + | None -> project + in let dune_file, ignored_subdirs = match List.filter ["dune"; "jbuild"] ~f:(String.Set.mem files) with | [] -> (None, String.Set.empty) @@ -238,7 +238,7 @@ let load ?(extra_ignored_subtrees=Path.Set.empty) path = else ignored_subdirs in - (dune_file, ignored_subdirs) + (project, dune_file, ignored_subdirs) in let sub_dirs = List.fold_left sub_dirs ~init:String.Map.empty