runnableExamples: correctly handle multiline string litterals (#14492)
* runnableExamples: correctly handle multiline string litterals * address comments: improve doc comments + variable namings
This commit is contained in:
parent
0db148163b
commit
0a27cca4b5
5 changed files with 168 additions and 5 deletions
|
|
@ -4,8 +4,10 @@ from xmltree import addEscaped
|
|||
import ast, options, msgs
|
||||
import packages/docutils/highlite
|
||||
|
||||
# import compiler/renderer
|
||||
import renderer
|
||||
const isDebug = false
|
||||
when isDebug:
|
||||
import renderer
|
||||
import astalgo
|
||||
|
||||
proc lastNodeRec(n: PNode): PNode =
|
||||
result = n
|
||||
|
|
@ -23,6 +25,66 @@ proc isInIndentationBlock(src: string, indent: int): bool =
|
|||
if src[j] != ' ': return false
|
||||
return true
|
||||
|
||||
type LineData = object
|
||||
## keep track of which lines are starting inside a multiline doc comment.
|
||||
## We purposefully avoid re-doing parsing which is already done (we get a PNode)
|
||||
## so we don't worry about whether we're inside (nested) doc comments etc.
|
||||
## But we sill need some logic to disambiguate different multiline styles.
|
||||
conf: ConfigRef
|
||||
lineFirst: int
|
||||
lines: seq[bool]
|
||||
## lines[index] is true if line `lineFirst+index` starts inside a multiline string
|
||||
## Using a HashSet (extra dependency) would simplify but not by much.
|
||||
|
||||
proc tripleStrLitStartsAtNextLine(conf: ConfigRef, n: PNode): bool =
|
||||
# enabling TLineInfo.offsetA,offsetB would probably make this easier
|
||||
const tripleQuote = "\"\"\""
|
||||
let src = sourceLine(conf, n.info)
|
||||
let col = n.info.col
|
||||
doAssert src.continuesWith(tripleQuote, col) # sanity check
|
||||
var i = col + 3
|
||||
var onlySpace = true
|
||||
while true:
|
||||
if src.len <= i:
|
||||
doAssert src.len == i
|
||||
return onlySpace
|
||||
elif src.continuesWith(tripleQuote, i) and (src.len == i+3 or src[i+3] != '\"'):
|
||||
return false # triple lit is in 1 line
|
||||
elif src[i] != ' ': onlySpace = false
|
||||
i.inc
|
||||
|
||||
proc visitMultilineStrings(ldata: var LineData, n: PNode) =
|
||||
var cline = ldata.lineFirst
|
||||
|
||||
template setLine() =
|
||||
let index = cline - ldata.lineFirst
|
||||
if ldata.lines.len < index+1: ldata.lines.setLen index+1
|
||||
ldata.lines[index] = true
|
||||
|
||||
case n.kind
|
||||
of nkTripleStrLit:
|
||||
# same logic should be applied for any multiline token
|
||||
# we could also consider nkCommentStmt but right now we just assume doc comments,
|
||||
# unlike triple string litterals, don't de-indent from runnableExamples.
|
||||
cline = n.info.line.int
|
||||
if tripleStrLitStartsAtNextLine(ldata.conf, n):
|
||||
cline.inc
|
||||
setLine()
|
||||
for ai in n.strVal:
|
||||
case ai
|
||||
of '\n':
|
||||
cline.inc
|
||||
setLine()
|
||||
else: discard
|
||||
else:
|
||||
for i in 0..<n.safeLen:
|
||||
visitMultilineStrings(ldata, n[i])
|
||||
|
||||
proc startOfLineInsideTriple(ldata: LineData, line: int): bool =
|
||||
let index = line - ldata.lineFirst
|
||||
if index >= ldata.lines.len: false
|
||||
else: ldata.lines[index]
|
||||
|
||||
proc extractRunnableExamplesSource*(conf: ConfigRef; n: PNode): string =
|
||||
## TLineInfo.offsetA,offsetB would be cleaner but it's only enabled for nimpretty,
|
||||
## we'd need to check performance impact to enable it for nimdoc.
|
||||
|
|
@ -39,20 +101,31 @@ proc extractRunnableExamplesSource*(conf: ConfigRef; n: PNode): string =
|
|||
assert true
|
||||
]#
|
||||
first.line = n[0].info.line + 1
|
||||
# first.col = n[0].info.col + 1 # anything with `col > n[0].col` is part of runnableExamples
|
||||
|
||||
let last = n.lastNodeRec.info
|
||||
var info = first
|
||||
var indent = info.col
|
||||
let numLines = numLines(conf, info.fileIndex).uint16
|
||||
var lastNonemptyPos = 0
|
||||
|
||||
var ldata = LineData(lineFirst: first.line.int, conf: conf)
|
||||
visitMultilineStrings(ldata, n[^1])
|
||||
when isDebug:
|
||||
debug(n)
|
||||
for i in 0..<ldata.lines.len:
|
||||
echo (i+ldata.lineFirst, ldata.lines[i])
|
||||
|
||||
for line in first.line..numLines: # bugfix, see `testNimDocTrailingExample`
|
||||
info.line = line
|
||||
let src = sourceLine(conf, info)
|
||||
if line > last.line and not isInIndentationBlock(src, indent):
|
||||
let special = startOfLineInsideTriple(ldata, line.int)
|
||||
if line > last.line and not special and not isInIndentationBlock(src, indent):
|
||||
break
|
||||
if line > first.line: result.add "\n"
|
||||
if src.len > indent:
|
||||
if special:
|
||||
result.add src
|
||||
lastNonemptyPos = result.len
|
||||
elif src.len > indent:
|
||||
result.add src[indent..^1]
|
||||
lastNonemptyPos = result.len
|
||||
result.setLen lastNonemptyPos
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue