Fix format on projects that contain subprojects

src/Juvix/Compiler/Concrete/Translation/FromParsed/Analysis/PathResolver.hs

@@ -90,7 +90,7 @@ mkPackageInfo mpackageEntry _packageRoot = do
   return PackageInfo {..}
   where
     juvixAccum :: Path Abs Dir -> [Path Rel Dir] -> [Path Rel File] -> [Path Abs File] -> Sem r ([Path Abs File], Recurse Rel)
-    juvixAccum cd _ files acc = return (newJuvixFiles <> acc, RecurseFilter (\hasJuvixYaml d -> not hasJuvixYaml || not (isHiddenDirectory d)))
+    juvixAccum cd _ files acc = return (newJuvixFiles <> acc, RecurseFilter (\hasJuvixYaml d -> not hasJuvixYaml && not (isHiddenDirectory d)))
       where
         newJuvixFiles :: [Path Abs File]
         newJuvixFiles = [cd <//> f | f <- files, isJuvixFile f]

src/Juvix/Data/Effect/Files.hs

@@ -48,13 +48,18 @@ walkDirRel handler topdir = do
       walktree curdir = do
         let fullDir :: Path Abs Dir = topdir <//> curdir
         (subdirs, files) <- listDirRel fullDir
-        let hasJuvixYaml = juvixYamlFile `elem` files
         action <- raise (handler fullDir subdirs files)
         case action of
           RecurseNever -> return ()
-          RecurseFilter fi ->
-            let ds = map (curdir <//>) (filter (fi hasJuvixYaml) subdirs)
-             in mapM_ walkAvoidLoop ds
+          RecurseFilter fi -> do
+            ds <- filterM filterSubdirs subdirs
+            mapM_ (walkAvoidLoop . (curdir <//>)) ds
+            where
+              filterSubdirs :: Path Rel Dir -> Sem (State (HashSet Uid) ': r) Bool
+              filterSubdirs d = do
+                hasJuvixYaml <- fileExists' (topdir <//> curdir <//> d <//> juvixYamlFile)
+                return (fi hasJuvixYaml d)
+
       checkLoop :: Path Abs Dir -> Sem (State (HashSet Uid) ': r) Bool
       checkLoop dir = do
         visited <- get

src/Juvix/Formatter.hs

@@ -88,7 +88,7 @@ formatProject p = do
     handler cd _ files _ = do
       let juvixFiles = [cd <//> f | f <- files, isJuvixFile f]
       res <- combineResults <$> mapM format juvixFiles
-      return (res, RecurseFilter (\hasJuvixYaml d -> not (hasJuvixYaml && isHiddenDirectory d)))
+      return (res, RecurseFilter (\hasJuvixYaml d -> not hasJuvixYaml && not (isHiddenDirectory d)))
 
 formatPath :: Member ScopeEff r => Path Abs File -> Sem r (NonEmpty AnsiText)
 formatPath p = do

tests/smoke/Commands/format.smoke.yaml

@@ -95,6 +95,22 @@ tests:
       contains: 'Foo.juvix'
     exit-status: 1
 
+  - name: format-ignore-subproject
+    command:
+      shell:
+        - bash
+      script: |
+        temp=$(mktemp -d)
+        trap 'rm -rf -- "$temp"' EXIT
+        touch $temp/juvix.yaml
+        cp positive/Format.juvix $temp
+        mkdir $temp/sub
+        touch $temp/sub/juvix.yaml
+        cp positive/Format.juvix $temp/sub
+        juvix format $temp
+    stdout: ''
+    exit-status: 0
+
   - name: format-dir-containing-unformatted-check-no-stdout
     command:
       shell: