ahamilton/diff-edit
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source 
- Use a key map like in the editor.
This commit is contained in:
Andrew Hamilton 2022-01-07 18:21:18 +10:00
parent 51bfa36a5d
commit cd88668f17
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
diff_edit/__init__.py
View file

@ -245,9 +245,11 @@ class DiffEditor:
self.right_editor.on_mouse_drag(x - right_x - 1, y)
def update_diff(self):
self.diff = difflib.SequenceMatcher(
a=self.left_editor.text_widget,
b=self.right_editor.text_widget).get_opcodes()
self.diff = difflib.SequenceMatcher(a=self.left_editor.text_widget,
b=self.right_editor.text_widget).get_opcodes()
def toggle_highlights(self):
self.show_sub_highlights = not self.show_sub_highlights
def jump_to_next_diff(self):
y = self.editors[0].cursor_y
@ -284,16 +286,8 @@ class DiffEditor:
editor_.cycle_syntax_highlighting()
def on_keyboard_input(self, term_code):
if term_code == terminal.ALT_o:
self.switch_editor()
elif term_code == terminal.ALT_h:
self.show_sub_highlights = not self.show_sub_highlights
elif term_code == terminal.ALT_DOWN:
self.jump_to_next_diff()
elif term_code == terminal.ALT_UP:
self.jump_to_previous_diff()
elif term_code == terminal.ALT_c:
self.cycle_syntax_highlighting()
if term_code in self.KEY_MAP:
self.KEY_MAP[term_code](self)
else:
self.editors[0].on_keyboard_input(term_code)
self.diff = None
@ -354,6 +348,10 @@ class DiffEditor:
return fill3.join_horizontal(
[left_appearance] + self.divider_appearance(height) + [right_appearance])
KEY_MAP = {terminal.ALT_o: switch_editor, terminal.ALT_h: toggle_highlights,
terminal.ALT_DOWN: jump_to_next_diff, terminal.ALT_UP: jump_to_previous_diff,
terminal.ALT_c: cycle_syntax_highlighting}
def check_arguments():
arguments = docopt.docopt(USAGE)