Skip to content

show else prefix for instance chain items in docs #3715

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

Open
csicar wants to merge 7 commits into
base: master
Choose a base branch
from
Open

show else prefix for instance chain items in docs #3715

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55b58fa
Pretty much workging else
csicar Oct 4, 2020
0cd378e
Nice Rendering
csicar Oct 4, 2020
7943881
references working
csicar Oct 4, 2020
b288c68
Cleanup `Single`
csicar Oct 4, 2020
3b5560f
Cleanup render
csicar Oct 4, 2020
b843afc
Improved comments handling
csicar Oct 4, 2020
b8805c8
Fix warnings
csicar Oct 4, 2020
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
Prev Previous commit
Next Next commit
Nice Rendering
  • Loading branch information
@csicar
csicar committed Oct 4, 2020
commit 0cd378eb7e11393a9311c300b54fb101202a20bf
13 changes: 8 additions & 5 deletions src/Language/PureScript/Docs/AsHtml.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,15 +179,18 @@ renderChildren r xs = ul $ mapM_ item xs
where
item decl =
li ! A.id (v (T.drop 1 (fragment decl))) $ do
case renderCode decl of
[el] -> el
els -> ul $ for_ els $ \el ->
li el
case Render.renderChildDeclaration decl of
Render.RenderedAsCode renderedCode -> renderCode renderedCode
Render.RenderedAsStructure struct ->
ul $ for_ struct $ \(title, el) ->
li ! A.id (v (T.drop 1 (subFragement decl title))) $ (renderCode el)
for_ (cdeclComments decl) $ \coms ->
H.div ! A.class_ "decl__child_comments" $ renderMarkdown coms

fragment decl = makeFragment (childDeclInfoNamespace (cdeclInfo decl)) (cdeclTitle decl)
renderCode codes = code <$> codeAsHtml r <$> Render.renderChildDeclaration codes
subFragement decl title = makeFragment (childDeclInfoNamespace (cdeclInfo decl)) title
renderCode = code . codeAsHtml r
--codes = code <$> codeAsHtml r <$> Render.renderChildDeclaration codes

codeAsHtml :: HtmlRenderContext -> RenderedCode -> Html
codeAsHtml r = outputWith elemAsHtml
Expand Down
4 changes: 3 additions & 1 deletion src/Language/PureScript/Docs/AsMarkdown.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ childToString f decl@ChildDeclaration{..} =
ChildPartOfInstanceChain _ ->
str
where
str = T.unlines $ (" - "<>) <$> codeToString <$> Render.renderChildDeclaration decl
str = case Render.renderChildDeclaration decl of
Render.RenderedAsCode code -> codeToString code
Render.RenderedAsStructure structure -> T.unlines $ (" - "<>) <$> codeToString <$> snd <$> structure

data First
= First
Expand Down
30 changes: 21 additions & 9 deletions src/Language/PureScript/Docs/Render.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,34 @@ renderDeclaration Declaration{..} =
, aliasName for declTitle
]

renderChildDeclaration :: ChildDeclaration -> [RenderedCode]
data RenderedChildDeclaration
= RenderedAsCode RenderedCode
| RenderedAsStructure [(Text, RenderedCode)]
deriving (Show, Eq, Ord)

renderChildDeclaration :: ChildDeclaration -> RenderedChildDeclaration
renderChildDeclaration ChildDeclaration{..} =
traceShowId $ case cdeclInfo of
ChildInstanceChain instances ->
List.intersperse keywordElse $ mintersperse sp <$> renderChildInstance <$> instances
RenderedAsStructure $ renderInstanceChain <$> instances
-- List.intersperse keywordElse $ mintersperse sp <$> renderChildInstance <$> instances
ChildPartOfInstanceChain childInstance ->
[mintersperse sp $ renderChildInstance childInstance]
RenderedAsCode $ mintersperse sp $ renderChildInstance childInstance
ChildDataConstructor args ->
[mintersperse sp $ [ dataCtor' cdeclTitle ]
++ map renderTypeAtom args]
RenderedAsCode $ mintersperse sp $
[ dataCtor' cdeclTitle ]
++ map renderTypeAtom args

ChildTypeClassMember ty ->
[ mintersperse sp $ [ ident' cdeclTitle
, syntax "::"
, renderType ty
]]
RenderedAsCode $ mintersperse sp $
[ ident' cdeclTitle
, syntax "::"
, renderType ty
]

where
renderInstanceChain inst =
(icTitle inst, mintersperse sp $ renderChildInstance $ inst)

renderChildInstance :: ChildInstanceChainInfo -> [RenderedCode]
renderChildInstance (ChildInstanceChainInfo{..}) =
Expand Down