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

fixes #8419 fixes #8420 ; workaround #6071 workaround nim-lang/website#98 (#8423)

Browse source 
add --git.devel option to override doc generated "edit" links; add --nimCompiler option to nimweb
This commit is contained in:
Timothee Cour 2018-07-30 05:02:18 -07:00 • committed by Andreas Rumpf
commit c0f78ec012
5 changed files with 70 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/docgen.nim
View file

@ -517,12 +517,11 @@ proc genItem(d: PDoc, n, nameNode: PNode, k: TSymKind) =
path = path[cwd.len+1 .. ^1].replace('\\', '/')
let gitUrl = getConfigVar(d.conf, "git.url")
if gitUrl.len > 0:
var commit = getConfigVar(d.conf, "git.commit")
if commit.len == 0: commit = "master"
let commit = getConfigVar(d.conf, "git.commit", "master")
let develBranch = getConfigVar(d.conf, "git.devel", "devel")
dispA(d.conf, seeSrcRope, "$1", "", [ropeFormatNamedVars(d.conf, docItemSeeSrc,
["path", "line", "url", "commit"], [rope path,
rope($n.info.line), rope gitUrl,
rope commit])])
["path", "line", "url", "commit", "devel"], [rope path,
rope($n.info.line), rope gitUrl, rope commit, rope develBranch])])
add(d.section[k], ropeFormatNamedVars(d.conf, getConfigVar(d.conf, "doc.item"),
["name", "header", "desc", "itemID", "header_plain", "itemSym",