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

fixes #13986 [backport:1.2] (#14173)

Browse source
This commit is contained in:
Andreas Rumpf 2020-04-30 19:32:03 +02:00 • committed by GitHub
commit cf3e0008b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/docgen.nim
View file

@ -86,11 +86,14 @@ proc presentationPath*(conf: ConfigRef, file: AbsoluteFile, isTitle = false): Re
result = relativeTo(file, conf.docRoot.AbsoluteDir) result = relativeTo(file, conf.docRoot.AbsoluteDir)
else: else:
bail() bail()
if isAbsolute(result.string):
result = file.string.splitPath()[1].RelativeFile
if isTitle: if isTitle:
result = result.string.nativeToUnix.RelativeFile result = result.string.nativeToUnix.RelativeFile
else: else:
result = result.string.replace("..", "@@").RelativeFile ## refs #13223 result = result.string.replace("..", "@@").RelativeFile ## refs #13223
doAssert not result.isEmpty doAssert not result.isEmpty
doAssert not isAbsolute(result.string)
proc whichType(d: PDoc; n: PNode): PSym = proc whichType(d: PDoc; n: PNode): PSym =
if n.kind == nkSym: if n.kind == nkSym:
@ -1140,7 +1143,10 @@ proc generateIndex*(d: PDoc) =
proc updateOutfile(d: PDoc, outfile: AbsoluteFile) = proc updateOutfile(d: PDoc, outfile: AbsoluteFile) =
if d.module == nil or sfMainModule in d.module.flags: # nil for eg for commandRst2Html if d.module == nil or sfMainModule in d.module.flags: # nil for eg for commandRst2Html
if d.conf.outDir.isEmpty: d.conf.outDir = d.conf.docOutDir if d.conf.outDir.isEmpty: d.conf.outDir = d.conf.docOutDir
if d.conf.outFile.isEmpty: d.conf.outFile = outfile.relativeTo(d.conf.outDir) if d.conf.outFile.isEmpty:
d.conf.outFile = outfile.relativeTo(d.conf.outDir)
if isAbsolute(d.conf.outFile.string):
d.conf.outFile = splitPath(d.conf.outFile.string)[1].RelativeFile
proc writeOutput*(d: PDoc, useWarning = false) = proc writeOutput*(d: PDoc, useWarning = false) =
runAllExamples(d) runAllExamples(d)