Umka/go-org-orgwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support blocks with unindented content

Browse source 
list items only contain content that is indented to their respective
level. Except when that content is inside a block. To allow for this we have to
ignore the parentStop when parsing a block and just include everything until
the end of that block.
Can't think of any problems with this right now. Let's see if this comes
back to bite me.
This commit is contained in:
Niklas Fasching 2018-12-18 23:36:51 +01:00
parent ade2a1c875
commit 42dc70e7ad
6 changed files with 87 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
org/block.go
View file

@ -31,24 +31,24 @@ func (d *Document) parseBlock(i int, parentStop stopFn) (int, Node) {
name, parameters := t.content, strings.Fields(t.matches[3])
trim := trimIndentUpTo(d.tokens[i].lvl)
stop := func(d *Document, i int) bool {
return parentStop(d, i) || (d.tokens[i].kind == "endBlock" && d.tokens[i].content == name)
return i >= len(d.tokens) || (d.tokens[i].kind == "endBlock" && d.tokens[i].content == name)
}
block, consumed, i := Block{name, parameters, nil}, 0, i+1
block, i := Block{name, parameters, nil}, i+1
if isRawTextBlock(name) {
rawText := ""
for ; !stop(d, i); i++ {
rawText += trim(d.tokens[i].matches[0]) + "\n"
}
consumed = i - start
block.Children = d.parseRawInline(rawText)
} else {
consumed, block.Children = d.parseMany(i, stop)
consumed++ // line with BEGIN
consumed, nodes := d.parseMany(i, stop)
block.Children = nodes
i += consumed
}
if parentStop(d, i) {
return 0, nil
if i < len(d.tokens) && d.tokens[i].kind == "endBlock" && d.tokens[i].content == name {
return i + 1 - start, block
}
return consumed + 1, block
return 0, nil
}
func trimIndentUpTo(max int) func(string) string {