diff --git a/src/App/Fontifier.hs b/src/App/Fontifier.hs index 740d8cf..c23bec5 100644 --- a/src/App/Fontifier.hs +++ b/src/App/Fontifier.hs @@ -70,9 +70,10 @@ fontMap = [ (attrName "assignment" , fg Vty.blue) ] fontify :: CheckString -> Fontifications -fontify = concatApply [ assignments, invalidAccess - , strings, returns, guards - , comments, mismatchedBrackets +fontify = concatApply [ assignments, strings + , returns, guards, comments + , invalidAccess + , mismatchedBrackets , mismatchedQuotes] concatApply :: [Fontifier] -> CheckString -> Fontifications @@ -97,11 +98,13 @@ guards = slicesToFT §: "guard" §. matchGrpStripCmts 1 §~ "\\[([^ mismatchedBrackets s = concatMap (mismatched §: "err_brackets" $ s) [('(',')'),('[',']'),('{','}')] -invalidAccess s = (slicesToFT §: "err_read" $ invalidReads s) ++ - (slicesToFT §: "err_write" $ invalidWrites s) +invalidAccess s = let strip = prune $ (comments s) ++ (strings s) in -- removes strings and comments from fontification + (slicesToFT §: "err_read" $ strip $ invalidReads s) ++ + (slicesToFT §: "err_write" $ strip $ invalidWrites s) -- (alternative if easier than invalid read/invalid write separated) --- invalidAccess = slicesToFT §: "err_access" $ invAcc +-- invalidAccess s = let strip = prune $ (comments s) ++ (strings s) in +-- slicesToFT §: "err_access" $ strip $ invAcc s {--- Utility Functions ---}