lyz/org-rw
1
0
Fork 0
forked from kenkeiras/org-rw
Code Pull Requests Actions Activity

Improve DOM aggregation of CodeBlocks.

Browse Source
This commit is contained in:
Sergio Martínez Portela 2022-05-07 23:02:18 +02:00
parent cfce08eed0
commit afd02f55d4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org_rw/org_rw.py
View File

@ -326,13 +326,12 @@ class Headline:
indentation_tree = [] indentation_tree = []
for line in sorted(everything, key=get_line): for line in sorted(everything, key=get_line):
print("#-", current_node)
print("=>", line)
if isinstance(current_node, dom.CodeBlock): if isinstance(current_node, dom.CodeBlock):
if ( if (
isinstance(line, DelimiterLine) isinstance(line, DelimiterLine)
and line.delimiter_type == DelimiterLineType.END_SRC and line.delimiter_type == DelimiterLineType.END_SRC
): ):
tree.append(current_node)
current_node = None current_node = None
else: else:
current_node.append(line) current_node.append(line)
@ -351,7 +350,6 @@ class Headline:
current_node.append(dom.Text(line)) current_node.append(dom.Text(line))
else: else:
if type(current_node) not in NON_FINISHED_GROUPS: if type(current_node) not in NON_FINISHED_GROUPS:
print("Parent: {}\nValue: {}".format(current_node, line))
assert type(current_node) in NON_FINISHED_GROUPS assert type(current_node) in NON_FINISHED_GROUPS
current_node = None current_node = None
contents = [] contents = []
@ -363,7 +361,6 @@ class Headline:
tree.append(current_node) tree.append(current_node)
indentation_tree = [current_node] indentation_tree = [current_node]
if not isinstance(current_node, dom.ListGroupNode): if not isinstance(current_node, dom.ListGroupNode):
print("Parent: {}\nValue: {}".format(current_node, line))
assert isinstance(current_node, dom.ListGroupNode) assert isinstance(current_node, dom.ListGroupNode)
if len(indentation_tree) > 0 and ( if len(indentation_tree) > 0 and (
@ -1881,11 +1878,19 @@ class OrgDocReader:
line_count = len(lines) line_count = len(lines)
reader = enumerate(lines) reader = enumerate(lines)
in_drawer = False in_drawer = False
in_block = False
for lnum, line in reader: for lnum, line in reader:
linenum = lnum + 1 linenum = lnum + 1
try: try:
if m := HEADLINE_RE.match(line): if in_block:
if m := END_SRC_RE.match(line):
self.add_end_src_line(linenum, m)
in_block = False
else:
self.add_raw_line(linenum, line)
elif m := HEADLINE_RE.match(line):
self.add_headline(linenum, m) self.add_headline(linenum, m)
elif m := LIST_ITEM_RE.match(line): elif m := LIST_ITEM_RE.match(line):
self.add_list_item_line(linenum, m) self.add_list_item_line(linenum, m)
@ -1894,8 +1899,10 @@ class OrgDocReader:
# Org-babel # Org-babel
elif m := BEGIN_SRC_RE.match(line): elif m := BEGIN_SRC_RE.match(line):
self.add_begin_src_line(linenum, m) self.add_begin_src_line(linenum, m)
in_block = True
elif m := END_SRC_RE.match(line): elif m := END_SRC_RE.match(line):
self.add_end_src_line(linenum, m) self.add_end_src_line(linenum, m)
in_block = False
# Generic properties # Generic properties
elif m := KEYWORDS_RE.match(line): elif m := KEYWORDS_RE.match(line):
self.add_keyword_line(linenum, m) self.add_keyword_line(linenum, m)