From ea7d2dff2c848d57447fe273ab684d573b5a841d Mon Sep 17 00:00:00 2001 From: Armin Friedl Date: Sun, 28 Aug 2016 19:35:55 +0200 Subject: [PATCH 1/2] added invalidAccess stub to fontify functions --- src/App/Fontifier.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App/Fontifier.hs b/src/App/Fontifier.hs index 2b18060..740d8cf 100644 --- a/src/App/Fontifier.hs +++ b/src/App/Fontifier.hs @@ -70,9 +70,9 @@ fontMap = [ (attrName "assignment" , fg Vty.blue) ] fontify :: CheckString -> Fontifications -fontify = concatApply [ assignments, strings - , returns, guards, comments - , mismatchedBrackets +fontify = concatApply [ assignments, invalidAccess + , strings, returns, guards + , comments, mismatchedBrackets , mismatchedQuotes] concatApply :: [Fontifier] -> CheckString -> Fontifications From ff7506927b654da5ce1885506d6c253faa93b385 Mon Sep 17 00:00:00 2001 From: Armin Friedl Date: Sun, 28 Aug 2016 21:14:27 +0200 Subject: [PATCH 2/2] return font doesn't overwrite invalidAssignment stub now --- src/App/Fontifier.hs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 ---}