kenkeiras/org-rw
1
0
Fork 1
Code Issues 3 Pull Requests 1 Actions Releases Wiki Activity

Fix as_dom of Text found in a result after a list.

Browse Source
This commit is contained in:
Sergio Martínez Portela 2022-11-04 00:14:13 +01:00
parent bf10c51e61
commit ccebe90ea8
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
org_rw/org_rw.py
View File

@ -376,18 +376,32 @@ class Headline:
current_node.append(dom.PropertyNode(line.key, line.value)) current_node.append(dom.PropertyNode(line.key, line.value))
elif isinstance(line, Text): elif isinstance(line, Text):
if isinstance(current_node, dom.BlockNode): tree_up = list(indentation_tree)
current_node.append(dom.Text(line)) while len(tree_up) > 0:
elif isinstance(current_node, dom.DrawerNode): node = tree_up[-1]
current_node.append(dom.Text(line)) if (isinstance(node, dom.BlockNode)
or isinstance(node, dom.DrawerNode)
):
node.append(dom.Text(line))
current_node = node
contents = []
break
elif ((not isinstance(node, dom.TableNode)) and
(type(node) not in NON_FINISHED_GROUPS)
):
raise NotImplementedError('Not implemented node type: {} (headline_id={}, line={}, doc={})'.format(
node,
self.id,
line.linenum,
self.doc.path,
))
else:
tree_up.pop(-1)
else: else:
if isinstance(current_node, dom.TableNode):
pass # No problem here
elif type(current_node) not in NON_FINISHED_GROUPS:
raise NotImplementedError('Not implemented node type: {}'.format(current_node))
current_node = None current_node = None
contents = [] contents = []
tree.append(dom.Text(text_to_dom(line.contents, line))) tree.append(dom.Text(text_to_dom(line.contents, line)))
indentation_tree = tree_up
elif isinstance(line, ListItem): elif isinstance(line, ListItem):
if (current_node is None if (current_node is None
@ -434,7 +448,7 @@ class Headline:
) )
> len(line.indentation) > len(line.indentation)
): ):
rem = indentation_tree.pop() rem = indentation_tree.pop(-1)
if len(indentation_tree) == 0: if len(indentation_tree) == 0:
indentation_tree.append(rem) indentation_tree.append(rem)
current_node = rem current_node = rem
@ -515,8 +529,6 @@ class Headline:
tree_up.pop(-1) tree_up.pop(-1)
else: else:
raise Exception('Unexpected node ({}) on headline (id={}), line {}'.format(current_node, self.id, linenum)) raise Exception('Unexpected node ({}) on headline (id={}), line {}'.format(current_node, self.id, linenum))
if self.id == 'd07fcf27-d6fc-41e3-a9d0-b2e2902aec23':
print("Found node:", current_node)
current_node = None current_node = None
elif content.strip().upper() == ":RESULTS:": elif content.strip().upper() == ":RESULTS:":
assert current_node is None assert current_node is None