Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add a link to definition package in results #424

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add a link to definition package in results #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 40 additions & 28 deletions src/Handler/Search.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,35 +200,44 @@ searchResultToJSON result@SearchResult{..} = do
SourcePackage pn v ->
(Bower.runPackageName pn, v)

moduleRoute :: SearchResult -> Text -> Route App
moduleRoute SearchResult{..} =
case srSource of
SourceBuiltin ->
BuiltinDocsR
SourcePackage pkgName version ->
PackageVersionModuleDocsR
(PathPackageName pkgName)
(PathVersion version)

routeToModule :: SearchResult -> Text -> (Route App, Maybe Text)
routeToModule result modName =
( moduleRoute result modName
, Nothing
)

routeToPackage :: SearchResult -> (Route App, Maybe a)
routeToPackage SearchResult{..} =
( case srSource of
SourcePackage pkgName _ ->
PackageR (PathPackageName pkgName)
SourceBuiltin ->
-- this shouldn't happen
HomeR
, Nothing
)

routeResult :: SearchResult -> (Route App, Maybe Text)
routeResult SearchResult{..} =
routeResult result@SearchResult{..} =
case srInfo of
PackageResult _ ->
( case srSource of
SourcePackage pkgName _ ->
PackageR (PathPackageName pkgName)
SourceBuiltin ->
-- this shouldn't happen
HomeR
, Nothing
)
routeToPackage result
ModuleResult modName ->
( moduleRoute modName
, Nothing
)
routeToModule result modName
DeclarationResult ns modName declTitle _ ->
( moduleRoute modName
( moduleRoute result modName
, Just $ drop 1 $ makeFragment ns declTitle
)
where
moduleRoute =
case srSource of
SourceBuiltin ->
BuiltinDocsR
SourcePackage pkgName version ->
PackageVersionModuleDocsR
(PathPackageName pkgName)
(PathVersion version)

-- | Like Prelude.take, except also returns a Bool indicating whether the
-- original list has any additional elements after the returned prefix.
Expand Down Expand Up @@ -306,15 +315,18 @@ searchResultHtml fr r =
$of PackageResult _
$of ModuleResult _
<span .result__actions__item>
<span .badge.badge--package title="Package">P
#{pkgName}
<a href=#{fr $ routeToPackage r}>
<span .badge.badge--package title="Package">P
#{pkgName}
$of DeclarationResult _ moduleName _ _
<span .result__actions__item>
<span .badge.badge--package title="Package">P
#{pkgName}
<a href=#{fr $ routeToPackage r}>
<span .badge.badge--package title="Package">P
#{pkgName}
<span .result__actions__item>
<span .badge.badge--module title="Module">M
#{moduleName}
<a href=#{fr $ routeToModule r moduleName}>
<span .badge.badge--module title="Module">M
#{moduleName}
|]
where
pkgName =
Expand Down