Merge pull request #46 from leanprover/lake

Lake integration
main
Henrik Böving 2022-03-06 18:55:29 +01:00 committed by GitHub
commit 5e2e30c4f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 66 additions and 55 deletions

View File

@ -5,6 +5,7 @@ Authors: Henrik Böving
-/ -/
import Lean import Lean
import Lake
import DocGen4.Process import DocGen4.Process
import Std.Data.HashMap import Std.Data.HashMap
@ -12,40 +13,25 @@ namespace DocGen4
open Lean System Std IO open Lean System Std IO
def getLakePath : IO FilePath := do def lakeSetup (imports : List String) : IO (Except UInt32 (Lake.Workspace × String)) := do
match (← IO.getEnv "LAKE") with let (leanInstall?, lakeInstall?) ← Lake.findInstall?
| some path => pure $ System.FilePath.mk path let res ← StateT.run Lake.Cli.loadWorkspace {leanInstall?, lakeInstall?} |>.toIO'
| none => match res with
let lakePath := (←findSysroot?) / "bin" / "lake" | Except.ok (ws, options) =>
pure $ lakePath.withExtension System.FilePath.exeExtension let lean := leanInstall?.get!
if lean.githash ≠ Lean.githash then
-- Modified from the LSP Server IO.println s!"WARNING: This doc-gen was built with Lean: {Lean.githash} but the project is running on: {lean.githash}"
def lakeSetupSearchPath (lakePath : System.FilePath) (imports : List String) : IO Lean.SearchPath := do let lake := lakeInstall?.get!
let args := "print-paths" :: imports let ctx ← Lake.mkBuildContext ws lean lake
let cmdStr := " ".intercalate (toString lakePath :: args) ws.root.buildImportsAndDeps imports |>.run Lake.LogMethods.eio ctx
let lakeProc ← Process.spawn { initSearchPath (←findSysroot) ws.leanPaths.oleanPath
stdin := Process.Stdio.null pure $ Except.ok (ws, lean.githash)
stdout := Process.Stdio.piped | Except.error rc => pure $ Except.error rc
stderr := Process.Stdio.piped
cmd := lakePath.toString
args := args.toArray
}
let stdout := String.trim (← lakeProc.stdout.readToEnd)
let stderr := String.trim (← lakeProc.stderr.readToEnd)
match (← lakeProc.wait) with
| 0 =>
let stdout := stdout.split (· == '\n') |>.getLast!
let Except.ok (paths : LeanPaths) ← pure (Json.parse stdout >>= fromJson?)
| throw $ userError s!"invalid output from `{cmdStr}`:\n{stdout}\nstderr:\n{stderr}"
initSearchPath (← findSysroot?) paths.oleanPath
paths.oleanPath.mapM realPathNormalized
| 2 => pure [] -- no lakefile.lean
| _ => throw $ userError s!"`{cmdStr}` failed:\n{stdout}\nstderr:\n{stderr}"
def load (imports : List Name) : IO AnalyzerResult := do def load (imports : List Name) : IO AnalyzerResult := do
let env ← importModules (List.map (Import.mk · false) imports) Options.empty let env ← importModules (List.map (Import.mk · false) imports) Options.empty
-- TODO parameterize maxHeartbeats -- TODO parameterize maxHeartbeats
IO.println "Processing modules" IO.println "Processing modules"
Prod.fst <$> (Meta.MetaM.toIO process { maxHeartbeats := 100000000, options := ⟨[(`pp.tagAppFns, true)]⟩ } { env := env} {} {}) Prod.fst <$> Meta.MetaM.toIO process { maxHeartbeats := 100000000, options := ⟨[(`pp.tagAppFns, true)]⟩ } { env := env} {} {}
end DocGen4 end DocGen4

View File

@ -4,6 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Henrik Böving Authors: Henrik Böving
-/ -/
import Lean import Lean
import Lake
import DocGen4.Process import DocGen4.Process
import DocGen4.Output.Base import DocGen4.Output.Base
import DocGen4.Output.Index import DocGen4.Output.Index
@ -25,12 +26,8 @@ Three link types from git supported:
TODO: This function is quite brittle and very github specific, we can TODO: This function is quite brittle and very github specific, we can
probably do better. probably do better.
-/ -/
def getGithubBaseUrl : IO String := do def getGithubBaseUrl (gitUrl : String) : String := Id.run do
let out ← IO.Process.output {cmd := "git", args := #["remote", "get-url", "origin"]} let mut url := gitUrl
if out.exitCode != 0 then
throw <| IO.userError <| "git exited with code " ++ toString out.exitCode
let mut url := out.stdout.trimRight
if url.startsWith "git@" then if url.startsWith "git@" then
url := url.drop 15 url := url.drop 15
url := url.dropRight 4 url := url.dropRight 4
@ -40,30 +37,51 @@ def getGithubBaseUrl : IO String := do
else else
pure url pure url
def getCommit : IO String := do def getProjectGithubUrl : IO String := do
let out ← IO.Process.output {cmd := "git", args := #["remote", "get-url", "origin"]}
if out.exitCode != 0 then
throw <| IO.userError <| "git exited with code " ++ toString out.exitCode
pure out.stdout.trimRight
def getProjectCommit : IO String := do
let out ← IO.Process.output {cmd := "git", args := #["rev-parse", "HEAD"]} let out ← IO.Process.output {cmd := "git", args := #["rev-parse", "HEAD"]}
if out.exitCode != 0 then if out.exitCode != 0 then
throw <| IO.userError <| "git exited with code " ++ toString out.exitCode throw <| IO.userError <| "git exited with code " ++ toString out.exitCode
pure out.stdout.trimRight pure out.stdout.trimRight
def sourceLinker : IO (Name → Option DeclarationRange → String) := do def sourceLinker (ws : Lake.Workspace) (leanHash : String): IO (Name → Option DeclarationRange → String) := do
let baseUrl ← getGithubBaseUrl -- Compute a map from package names to source URL
let commit ← getCommit let mut gitMap := Std.mkHashMap
pure λ name range => let projectBaseUrl := getGithubBaseUrl (←getProjectGithubUrl)
let parts := name.components.map Name.toString let projectCommit ← getProjectCommit
gitMap := gitMap.insert ws.root.name (projectBaseUrl, projectCommit)
for pkg in ws.packageArray do
for dep in pkg.dependencies do
let value := match dep.src with
| Lake.Source.git url commit => (getGithubBaseUrl url, commit)
-- TODO: What do we do here if linking a source is not possible?
| _ => ("https://example.com", "master")
gitMap := gitMap.insert dep.name value
pure $ λ module range =>
let parts := module.components.map Name.toString
let path := (parts.intersperse "/").foldl (· ++ ·) "" let path := (parts.intersperse "/").foldl (· ++ ·) ""
let r := name.getRoot let root := module.getRoot
let basic := if r == `Lean r == `Init r == `Std then let basic := if root == `Lean root == `Init root == `Std then
s!"https://github.com/leanprover/lean4/blob/{githash}/src/{path}.lean" s!"https://github.com/leanprover/lean4/blob/{leanHash}/src/{path}.lean"
else else
s!"{baseUrl}/blob/{commit}/{path}.lean" match ws.packageForModule? module with
| some pkg =>
let (baseUrl, commit) := gitMap.find! pkg.name
s!"{baseUrl}/blob/{commit}/{path}.lean"
| none => "https://example.com"
match range with match range with
| some range => s!"{basic}#L{range.pos.line}-L{range.endPos.line}" | some range => s!"{basic}#L{range.pos.line}-L{range.endPos.line}"
| none => basic | none => basic
def htmlOutput (result : AnalyzerResult) (root : String) : IO Unit := do def htmlOutput (result : AnalyzerResult) (root : String) (ws : Lake.Workspace) (leanHash: String) : IO Unit := do
let config := { root := root, result := result, currentName := none, sourceLinker := ←sourceLinker} let config := { root := root, result := result, currentName := none, sourceLinker := ←sourceLinker ws leanHash}
let basePath := FilePath.mk "." / "build" / "doc" let basePath := FilePath.mk "." / "build" / "doc"
let indexHtml := ReaderT.run index config let indexHtml := ReaderT.run index config
let findHtml := ReaderT.run find config let findHtml := ReaderT.run find config

View File

@ -7,12 +7,15 @@ open DocGen4 Lean Cli
def runDocGenCmd (p : Parsed) : IO UInt32 := do def runDocGenCmd (p : Parsed) : IO UInt32 := do
let root := p.positionalArg! "root" |>.as! String let root := p.positionalArg! "root" |>.as! String
let modules : List String := p.variableArgsAs! String |>.toList let modules : List String := p.variableArgsAs! String |>.toList
let path ← lakeSetupSearchPath (←getLakePath) modules let res ← lakeSetup modules
IO.println s!"Loading modules from: {path}" match res with
let doc ← load $ modules.map Name.mkSimple | Except.ok (ws, leanHash) =>
IO.println "Outputting HTML" IO.println s!"Loading modules from: {←searchPathRef.get}"
htmlOutput doc root let doc ← load $ modules.map Name.mkSimple
pure 0 IO.println "Outputting HTML"
htmlOutput doc root ws leanHash
pure 0
| Except.error rc => pure rc
def docGenCmd : Cmd := `[Cli| def docGenCmd : Cmd := `[Cli|
"doc-gen4" VIA runDocGenCmd; ["0.0.1"] "doc-gen4" VIA runDocGenCmd; ["0.0.1"]

View File

@ -16,6 +16,10 @@ package «doc-gen4» {
{ {
name := `Cli name := `Cli
src := Source.git "https://github.com/mhuisi/lean4-cli" "1f8663e3dafdcc11ff476d74ef9b99ae5bdaedd3" src := Source.git "https://github.com/mhuisi/lean4-cli" "1f8663e3dafdcc11ff476d74ef9b99ae5bdaedd3"
},
{
name := `lake
src := Source.git "https://github.com/leanprover/lake" "9378575b5575f49a185d50130743a190a9be2f82"
} }
] ]
} }

View File

@ -1 +1 @@
leanprover/lean4:nightly-2022-02-27 leanprover/lean4:nightly-2022-03-06