fix: minor highlightItem regression

Author: head-gardener

src/Action/Search.hs

@@ -88,7 +88,7 @@ targetResultDisplay link color qs Target{..} = unHTML $ unwords $
         highlightFull = hyperlinkCode targetURL . ansiHighlight qs
 
 ansiHighlight :: [Query] -> String -> String
-ansiHighlight = highlightItem id ((dull ++) . (++ rst)) ((bold ++) . (++ rst))
+ansiHighlight = highlightItem id id ((dull ++) . (++ rst)) ((bold ++) . (++ rst))
     where
         dull = setSGRCode [SetColor Foreground Dull Yellow]
         bold = setSGRCode [SetColor Foreground Vivid Yellow]

src/Action/Server.hs

@@ -257,7 +257,7 @@ showURL _ _ x = x
 
 
 displayItem :: [Query] -> String -> Markup
-displayItem = highlightItem H.preEscapedString H.string (H.b . H.string)
+displayItem = highlightItem H.string H.preEscapedString H.string (H.b . H.string)
 
 action_server_test_ :: IO ()
 action_server_test_ = do

src/Input/Item.hs

@@ -190,22 +190,22 @@ item_test = testing "Input.Item.Target JSON (encode . decode = id) " $ do
     (Left  e ) -> False
     (Right t') -> t == t'
 
-highlightItem:: Monoid m => (String -> m) -> (String -> m) -> (String -> m) -> [Query] -> String -> m
-highlightItem plain dull bold qs x
+highlightItem:: Monoid m => (String -> m) -> (String -> m) -> (String -> m) -> (String -> m) -> [Query] -> String -> m
+highlightItem plain safe dull bold qs x
     | Just (pre,x) <- stripInfix "<s0>" x, Just (name,post) <- stripInfix "</s0>" x
-        = plain pre <> highlight (unescapeHTML name) <> plain post
+        = safe pre <> highlight (unescapeHTML name) <> safe post
     | otherwise = plain x
     where
-        highlight = mconcatMap (\xs@((b,_):_) -> let s = map snd xs in if b then bold s else dull s) .
-                    groupOn fst . (\x -> zip (mapIsInQueries x) x)
+        highlight x = mconcatMap (\xs@((b,_):_) -> let s = map snd xs in if b then bold s else dull s) $
+                    groupOn fst $ zip (findQueries x) x
             where
                 -- generates a bool mask, which is only true for charachters that compose given queries
                 -- e.g. [ "query" "ya" ] -> [ "AqUeRyAA" ] -> 01111110
-                mapIsInQueries :: String -> [Bool]
-                mapIsInQueries (x:xs) | m > 0 = replicate m True ++ (mapIsInQueries $ drop (m - 1) xs)
+                findQueries :: String -> [Bool]
+                findQueries (x:xs) | m > 0 = replicate m True ++ drop (m - 1) (findQueries xs)
                     where m = maximum $ 0 : [length y | QueryName y <- qs, lower y `isPrefixOf` lower (x:xs)]
-                mapIsInQueries (x:xs) = False : mapIsInQueries xs
-                mapIsInQueries [] = []
+                findQueries (x:xs) = False : findQueries xs
+                findQueries [] = []
 
 ---------------------------------------------------------------------
 -- HSE CONVERSION