diff options
| -rw-r--r-- | haddock-api/resources/html/index.js | 3 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml.hs | 19 |
2 files changed, 13 insertions, 9 deletions
diff --git a/haddock-api/resources/html/index.js b/haddock-api/resources/html/index.js index da1b8cf6..6d5b2bfc 100644 --- a/haddock-api/resources/html/index.js +++ b/haddock-api/resources/html/index.js @@ -82,7 +82,8 @@ var App = createClass({ threshold: 0.4, caseSensitive: true, includeScore: true, - keys: ["name"] + tokenize: true, + keys: ["name", "module"] }), moduleResults: [] }); diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs index 0297f9e7..80469929 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml.hs @@ -374,19 +374,22 @@ ppJsonIndex odir maybe_source_url maybe_wiki_url unicode qual_opt ifaces = do mdl = ifaceMod iface goExport :: Module -> Qualification -> ExportItem DocName -> [Value] - goExport mdl qual item = - case processExport True links_info unicode qual item of - Nothing -> [] - Just html -> - [ Object - [ "display_html" .= String (showHtmlFragment html) + goExport mdl qual item + | Just item_html <- processExport True links_info unicode qual item + = [ Object + [ "display_html" .= String (showHtmlFragment item_html) , "name" .= String (intercalate " " (map nameString names)) , "module" .= String (moduleString mdl) , "link" .= String (fromMaybe "" (listToMaybe (map (nameLink mdl) names))) ] - ] + ] + | otherwise = [] where - names = exportName item + names = exportName item ++ exportSubs item + + exportSubs :: ExportItem DocName -> [DocName] + exportSubs ExportDecl { expItemSubDocs } = map fst expItemSubDocs + exportSubs _ = [] exportName :: ExportItem DocName -> [DocName] exportName ExportDecl { expItemDecl } = getMainDeclBinder $ unLoc expItemDecl |