fix markdown test

anoma · Dec 18, 2023 · 06c7f57 · 06c7f57
1 parent 1fbc8bd
commit 06c7f57
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/src/Juvix/Compiler/Backend/Html/Translation/FromTyped/Source.hs b/src/Juvix/Compiler/Backend/Html/Translation/FromTyped/Source.hs
@@ -348,7 +348,7 @@ putTag ann x = case ann of
 nameIdAttr :: (Members '[Reader HtmlOptions] r) => S.NameId -> Sem r AttributeValue
 nameIdAttr nid = do
   pfx <- unpack <$> asks (^. htmlOptionsIdPrefix)
-  return $ fromString $ pfx <> show nid
+  return $ fromString $ pfx <> show (pretty nid)
 
 moduleDocRelativePath :: (Members '[Reader HtmlOptions] r) => TopModulePath -> Sem r (Path Rel File)
 moduleDocRelativePath m = do

diff --git a/src/Juvix/Compiler/Backend/Markdown/Translation/FromTyped/Source.hs b/src/Juvix/Compiler/Backend/Markdown/Translation/FromTyped/Source.hs
@@ -153,9 +153,7 @@ go = do
                   else
                     MkTextBlock
                       TextBlock
-                        { _textBlock =
-                            Text.replace "\n" "<br/>" $
-                              resHtml,
+                        { _textBlock = Text.replace "\n" "<br/>" resHtml,
                           _textBlockInterval = j ^. juvixCodeBlockInterval
                         }
           let newState =

diff --git a/test/BackendMarkdown/Positive.hs b/test/BackendMarkdown/Positive.hs
@@ -4,8 +4,6 @@ import Base
 import Juvix.Compiler.Backend.Markdown.Translation.FromTyped.Source
 import Juvix.Compiler.Concrete qualified as Concrete
 import Juvix.Compiler.Concrete.Translation.FromParsed.Analysis.Scoping qualified as Scoper
-import Juvix.Compiler.Pipeline.Loader.PathResolver
-import Juvix.Compiler.Pipeline.Setup
 
 data PosTest = PosTest
   { _name :: String,
@@ -36,17 +34,8 @@ testDescr PosTest {..} =
       _testRoot = _dir,
       _testAssertion = Steps $ \step -> do
         entryPoint <- testDefaultEntryPointIO _dir _file
-        step "Parsing"
-        PipelineResult p _ <- snd <$> testRunIO entryPoint upToParsing
-        step "Scoping"
-        PipelineResult s _ <-
-          snd
-            <$> testRunIO
-              entryPoint
-              ( do
-                  void (entrySetup defaultDependenciesConfig)
-                  runReader p Concrete.fromParsed
-              )
+        step "Parsing & Scoping"
+        PipelineResult s _ <- snd <$> testRunIO entryPoint upToScoping
         let m = s ^. Scoper.resultModule
         let opts =
               ProcessJuvixBlocksArgs