jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #11953; jsondoc creates no files unless the htmldocs dir is created (#20198)

Browse source 
* fixes #11953; jsondoc creates no files unless the htmldocs dir is created

* target

* fixes runner
This commit is contained in:
ringabout 2022-08-21 08:09:48 +08:00 • committed by GitHub
commit d8d86e07c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/docgen.nim
View file

@ -1617,6 +1617,8 @@ proc writeOutputJson*(d: PDoc, useWarning = false) =
if optStdout in d.conf.globalOptions: if optStdout in d.conf.globalOptions:
write(stdout, $content) write(stdout, $content)
else: else:
let dir = d.destFile.splitFile.dir
createDir(dir)
var f: File var f: File
if open(f, d.destFile, fmWrite): if open(f, d.destFile, fmWrite):
write(f, $content) write(f, $content)

16
tests/misc/trunner.nim
View file

@ -232,6 +232,22 @@ sub/mmain.idx""", context
doAssert doSomething["col"].getInt == 0 doAssert doSomething["col"].getInt == 0
doAssert doSomething["code"].getStr == "proc doSomething(x, y: int): int {.raises: [], tags: [], forbids: [].}" doAssert doSomething["code"].getStr == "proc doSomething(x, y: int): int {.raises: [], tags: [], forbids: [].}"
block: # nim jsondoc # bug #11953
let file = testsDir / "misc/mjsondoc.nim"
let destDir = testsDir / "misc/htmldocs"
removeDir(destDir)
defer: removeDir(destDir)
let (msg, exitCode) = execCmdEx(fmt"{nim} jsondoc {file}")
doAssert exitCode == 0, msg
let data = parseJson(readFile(destDir / "mjsondoc.json"))["entries"]
doAssert data.len == 4
let doSomething = data[0]
doAssert doSomething["name"].getStr == "doSomething"
doAssert doSomething["type"].getStr == "skProc"
doAssert doSomething["line"].getInt == 1
doAssert doSomething["col"].getInt == 0
doAssert doSomething["code"].getStr == "proc doSomething(x, y: int): int {.raises: [], tags: [], forbids: [].}"
block: # further issues with `--backend` block: # further issues with `--backend`
let file = testsDir / "misc/mbackend.nim" let file = testsDir / "misc/mbackend.nim"