ditkrg/todo-to-issue-action
4
0
Fork 0
mirror of https://github.com/ditkrg/todo-to-issue-action.git synced 2026-01-22 22:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve TODO line number accuracy

Browse Source
This commit is contained in:
alstr 2020-03-20 15:26:26 +00:00
parent 7ba5bb18df
commit 308e66824c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
main.py
View File

@ -34,8 +34,8 @@ def main():
header_pattern = re.compile(r'(?<=diff\s--git\s).+') header_pattern = re.compile(r'(?<=diff\s--git\s).+')
hunk_start_pattern = re.compile(r'((?<=^@@\s).+(?=\s@@))') hunk_start_pattern = re.compile(r'((?<=^@@\s).+(?=\s@@))')
line_num_pattern = re.compile(r'(?<=\+).+') line_num_pattern = re.compile(r'(?<=\+).+')
addition_pattern = re.compile(r'(?<=^\+\s).+') addition_pattern = re.compile(r'(?<=^\+).*')
deletion_pattern = re.compile(r'(?<=^-\s).+') deletion_pattern = re.compile(r'(?<=^-).*')
todo_pattern = re.compile(r'(?<=' + label + r'\s).+') todo_pattern = re.compile(r'(?<=' + label + r'\s).+')
comment_pattern = re.compile(r'(?<=' + comment_marker + r'\s).+') comment_pattern = re.compile(r'(?<=' + comment_marker + r'\s).+')
@ -45,9 +45,8 @@ def main():
# Read the diff file one line at a time, checking for additions/deletions in each hunk. # Read the diff file one line at a time, checking for additions/deletions in each hunk.
with StringIO(diff) as diff_file: with StringIO(diff) as diff_file:
curr_file = None curr_file = None
hunk_start = None
hunk_index = None
recording = False recording = False
line_counter = None
for n, line in enumerate(diff_file): for n, line in enumerate(diff_file):
# First look for a diff header so we can determine the file the changes relate to. # First look for a diff header so we can determine the file the changes relate to.
@ -62,7 +61,7 @@ def main():
hunk = hunk_search.group(0) hunk = hunk_search.group(0)
line_nums = line_num_pattern.search(hunk).group(0).split(',') line_nums = line_num_pattern.search(hunk).group(0).split(',')
hunk_start = int(line_nums[0]) hunk_start = int(line_nums[0])
hunk_index = n line_counter = hunk_start
else: else:
# Look for additions and deletions (specifically TODOs) within each hunk. # Look for additions and deletions (specifically TODOs) within each hunk.
addition_search = addition_pattern.search(line) addition_search = addition_pattern.search(line)
@ -78,10 +77,9 @@ def main():
'todo': todo, 'todo': todo,
'body': todo, 'body': todo,
'file': curr_file, 'file': curr_file,
'line_num': hunk_start + (n - hunk_index - 1) 'line_num': line_counter
} }
new_issues.append(new_issue) new_issues.append(new_issue)
continue
elif recording: elif recording:
# If we are recording, check if the current line continues the last. # If we are recording, check if the current line continues the last.
comment_search = comment_pattern.search(addition) comment_search = comment_pattern.search(addition)
@ -89,7 +87,8 @@ def main():
comment = comment_search.group(0).lstrip() comment = comment_search.group(0).lstrip()
last_issue = new_issues[len(new_issues) - 1] last_issue = new_issues[len(new_issues) - 1]
last_issue['body'] += '\n' + comment last_issue['body'] += '\n' + comment
continue line_counter += 1
continue
else: else:
deletion_search = deletion_pattern.search(line) deletion_search = deletion_pattern.search(line)
if deletion_search: if deletion_search:
@ -97,6 +96,8 @@ def main():
todo_search = todo_pattern.search(deletion) todo_search = todo_pattern.search(deletion)
if todo_search: if todo_search:
closed_issues.append(todo_search.group(0)) closed_issues.append(todo_search.group(0))
else:
line_counter += 1
if recording: if recording:
recording = False recording = False