Merge pull request #4650 from unisonweb/cp/speedup-docs-to-html

Speed up docs.to-html by not using root-branch
unisonweb · Jan 30, 2024 · 54f64a5 · 54f64a5
2 parents 44e2c21 + b7c8bb8
commit 54f64a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/unison-cli/src/Unison/Codebase/Editor/HandleInput.hs b/unison-cli/src/Unison/Codebase/Editor/HandleInput.hs
@@ -560,9 +560,9 @@ loop e = do
               Cli.respond $ Output.MarkdownOut (Text.intercalate "\n---\n" mdText)
             DocsToHtmlI namespacePath' sourceDirectory -> do
               Cli.Env {codebase, sandboxedRuntime} <- ask
-              rootBranch <- Cli.getRootBranch
-              absPath <- Path.unabsolute <$> Cli.resolvePath' namespacePath'
-              _evalErrs <- liftIO $ (Backend.docsInBranchToHtmlFiles sandboxedRuntime codebase rootBranch absPath sourceDirectory)
+              absPath <- Cli.resolvePath' namespacePath'
+              branch <- liftIO $ Codebase.getBranchAtPath codebase absPath
+              _evalErrs <- liftIO $ (Backend.docsInBranchToHtmlFiles sandboxedRuntime codebase branch sourceDirectory)
               pure ()
             AliasTermI src' dest' -> do
               Cli.Env {codebase} <- ask

diff --git a/unison-share-api/src/Unison/Server/Backend.hs b/unison-share-api/src/Unison/Server/Backend.hs
@@ -911,13 +911,11 @@ docsInBranchToHtmlFiles ::
   Rt.Runtime Symbol ->
   Codebase IO Symbol Ann ->
   Branch IO ->
-  Path ->
   FilePath ->
   -- Returns any doc evaluation errors which may have occurred.
   -- Note that all docs will still be rendered even if there are errors.
   IO [Rt.Error]
-docsInBranchToHtmlFiles runtime codebase root currentPath directory = do
-  let currentBranch = Branch.getAt' currentPath root
+docsInBranchToHtmlFiles runtime codebase currentBranch directory = do
   let allTerms = (R.toList . Branch.deepTerms . Branch.head) currentBranch
   -- ignores docs inside lib namespace, recursively
   let notLib (_, name) = "lib" `notElem` Name.segments name