Ignore node_modules when searching recursively

CHANGELOG.md

@@ -8,7 +8,6 @@ Syntax changes:
   - End-of-line `--` comments are now kept on their original line when appropriate
   - `--` comments in the middle of binary operator sequences no longer push the following expression to the next line
   - `--` comments can be use to create sections in record expressions
-  - `elm-format --validate` (meant for use in CI scripts) now reports errors as JSON
   - For Windows, CRLF newlines no longer corrupt literal strings
 
 Bug fixes:
@@ -18,6 +17,10 @@ Bug fixes:
   - Record expressions with a trailing comma are no longer allowed (and comments are now handled correctly)
   - Block comments containing only multiple lines of whitespace no longer crash elm-format
 
+Other changes:
+  - `elm-format --validate` (meant for use in CI scripts) now reports errors as JSON
+  - When recursively searching a directory, `node_modules` folders are ignored
+
 
 ## 0.5.2-alpha
 

src/ElmFormat/Filesystem.hs

@@ -32,16 +32,24 @@ fileList :: FileStore f => FilePath -> Free f [FilePath]
 fileList =
   let
       children path =
-          if hasntFilename "elm-stuff" path then
+          if isSkippable path then
+              return []
+          else
               do
                   directory <- doesDirectoryExist path
                   if directory then listDir path else return []
-          else
-              return []
   in
       collectFiles children
 
 
+isSkippable :: FilePath -> Bool
+isSkippable path =
+    or
+        [ hasFilename "elm-stuff" path
+        , hasFilename "node_modules" path
+        , hasFilename ".git" path
+        ]
+
 hasExtension :: String -> FilePath -> Bool
 hasExtension ext path =
     pack ext `isSuffixOf` pack path
@@ -52,6 +60,9 @@ findAllElmFiles inputFile =
     filter (hasExtension ".elm") <$> fileList inputFile
 
 
-hasntFilename :: String -> FilePath -> Bool
-hasntFilename name path =
-      not (isSuffixOf (pack $ '/' : name) (pack path) || name == path)
+hasFilename :: String -> FilePath -> Bool
+hasFilename name path =
+    or
+        [ isSuffixOf (pack $ '/' : name) (pack path)
+        , name == path
+        ]