Fix globbing

Author: fsoikin

dist/npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whine",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "PureScript linter, extensible, with configurable rules, and one-off escape hatches",
   "keywords": ["purescript", "lint"],
   "author": "Fyodor Soikin <name.fa@gmail.com>",

dist/vscode-extension/package.json

@@ -3,7 +3,7 @@
   "publisher": "collegevine",
   "displayName": "Whine at PureScript",
   "description": "PureScript linter, extensible, with configurable rules, and one-off escape hatches",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "repository": "https://github.com/collegevine/purescript-whine",
   "engines": {
     "vscode": "^1.95.0"

spago.yaml

@@ -43,7 +43,7 @@ package:
     main: Test.Main
     dependencies: []
   publish:
-    version: 0.0.15
+    version: 0.0.16
     license: MIT
     location:
       githubOwner: collegevine

src/Whine/Runner/Glob.purs

@@ -10,3 +10,6 @@ foreign import test :: Globs -> FilePath -> Boolean
 
 isEmptyGlobs :: Globs -> Boolean
 isEmptyGlobs { include, exclude } = null include && null exclude
+
+emptyGlobs :: Globs
+emptyGlobs = { include: [], exclude: [] }

src/Whine/Whine.purs

@@ -81,8 +81,7 @@ checkFile rules path = do
   case eText of
     Left err ->
       tell
-        [
-          { message: "Failed to read the file: " <> Err.message err
+        [ { message: "Failed to read the file: " <> Err.message err
           , source: Nothing
           , muted: false
           , rule: ""
@@ -130,7 +129,9 @@ checkModule rules { path, text } =
       guard $ any (isIntersecting source) rs
       pure true
 
-    isExcludedByPath v = fromMaybe false do
-      rule <- Map.lookup v.rule rules
-      let pathIsOk = Glob.isEmptyGlobs rule.globs || Glob.test rule.globs path
-      pure $ not pathIsOk
+    isExcludedByPath v =
+      let globs = Map.lookup v.rule rules <#> _.globs # fromMaybe Glob.emptyGlobs
+          included = null globs.include || Glob.test { include: globs.include, exclude: [] } path
+          excluded = Glob.test { include: globs.exclude, exclude: [] } path
+      in
+        excluded || not included