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

docgen: nicer indentation

Browse source
This commit is contained in:
Araq 2019-01-24 08:23:24 +01:00
commit 46d5fb9ed7
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
compiler/docgen.nim
View file

@ -144,28 +144,28 @@ proc newDocumentor*(filename: AbsoluteFile; cache: IdentCache; conf: ConfigRef,
initStrTable result.types initStrTable result.types
result.onTestSnippet = result.onTestSnippet =
proc (gen: var RstGenerator; filename, cmd: string; status: int; content: string) = proc (gen: var RstGenerator; filename, cmd: string; status: int; content: string) =
var d = TDocumentor(gen) var d = TDocumentor(gen)
var outp: AbsoluteFile var outp: AbsoluteFile
if filename.len == 0: if filename.len == 0:
inc(d.id) inc(d.id)
let nameOnly = splitFile(d.filename).name let nameOnly = splitFile(d.filename).name
let subdir = getNimcacheDir(conf) / RelativeDir(nameOnly) let subdir = getNimcacheDir(conf) / RelativeDir(nameOnly)
createDir(subdir) createDir(subdir)
outp = subdir / RelativeFile(nameOnly & "_snippet_" & $d.id & ".nim") outp = subdir / RelativeFile(nameOnly & "_snippet_" & $d.id & ".nim")
elif isAbsolute(filename): elif isAbsolute(filename):
outp = AbsoluteFile filename outp = AbsoluteFile filename
else: else:
# Nim's convention: every path is relative to the file it was written in: # Nim's convention: every path is relative to the file it was written in:
outp = splitFile(d.filename).dir.AbsoluteDir / RelativeFile(filename) outp = splitFile(d.filename).dir.AbsoluteDir / RelativeFile(filename)
# Include the current file if we're parsing a nim file # Include the current file if we're parsing a nim file
let importStmt = if d.isPureRst: "" else: "import \"$1\"\n" % [d.filename] let importStmt = if d.isPureRst: "" else: "import \"$1\"\n" % [d.filename]
writeFile(outp, importStmt & content) writeFile(outp, importStmt & content)
let c = if cmd.startsWith("nim "): os.getAppFilename() & cmd.substr(3) let c = if cmd.startsWith("nim "): os.getAppFilename() & cmd.substr(3)
else: cmd else: cmd
let c2 = c % quoteShell(outp) let c2 = c % quoteShell(outp)
rawMessage(conf, hintExecuting, c2) rawMessage(conf, hintExecuting, c2)
if execShellCmd(c2) != status: if execShellCmd(c2) != status:
rawMessage(conf, errGenerated, "executing of external program failed: " & c2) rawMessage(conf, errGenerated, "executing of external program failed: " & c2)
result.emitted = initIntSet() result.emitted = initIntSet()
result.destFile = getOutFile2(conf, relativeTo(filename, conf.projectPath), result.destFile = getOutFile2(conf, relativeTo(filename, conf.projectPath),
outExt, RelativeDir"htmldocs", false) outExt, RelativeDir"htmldocs", false)