af4af9b · elk · git.iko.soy

Get markdown to work properly

commitaf4af9b1618bb2477f3b7fc80db746c24d2c5324 authorEvan Czaplicki <info@elm-lang.org> dateSun 15 Jun 2014, 14:24 (12 years ago) parent866b997

2 files changed+6−4

unifiedsplit

compiler/Generate/JavaScript.hs+3−3

@@ -183,7 +183,7 @@ expression (A region expr) =

183183

184184 Markdown uid doc es ->

185185 do es' <- mapM expression es

186− return $ obj ["Text","markdown"] `call` (string md : string uid : es')

186+ return $ Var.value "Text" "markdown" `call` (string md : string uid : es')

187187 where

188188 pad = "<div style=\"height:0;width:0;\"> </div>"

189189 md = pad ++ MD.toHtml doc ++ pad

@@ -356,8 +356,8 @@ generate modul =

356356 case value of

357357 Var.Alias _ -> []

358358 Var.Value x | Help.isOp x -> []

359− | otherwise -> [x]

360− Var.ADT _ (Var.Listing ctors _) -> ctors

359+ | otherwise -> [Var.varName x]

360+ Var.ADT _ (Var.Listing ctors _) -> map Var.varName ctors

361361

362362 assign path expr =

363363 case path of

compiler/Transform/Canonicalize.hs+3−1

@@ -235,7 +235,9 @@ expression env (A.A ann expr) =

235235 branch (p,b) = (,) <$> format (pattern env p)

236236 <*> expression (update p env) b

237237

238− Markdown uid md es -> Markdown uid md <$> mapM go es

238+ Markdown uid md es ->

239+ do Env.uses "Text"

240+ Markdown uid md <$> mapM go es

239241

240242 PortIn name st -> PortIn name <$> tipe' env st

241243