From d54b58d2f3ffdc8346c5ee2877b7d90b9e9b23fd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 Apr 2018 19:50:40 +0530 Subject: [PATCH] ... --- kittens/diff/collect.py | 6 ++++++ kittens/diff/render.py | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/kittens/diff/collect.py b/kittens/diff/collect.py index d74dc2baa..81a0aee7f 100644 --- a/kittens/diff/collect.py +++ b/kittens/diff/collect.py @@ -103,6 +103,12 @@ def data_for_path(path): return ans +@lru_cache(maxsize=1024) +def lines_for_path(path): + data = data_for_path(path) + return data.splitlines() + + @lru_cache(maxsize=1024) def hash_for_path(path): md5(data_for_path(path)).digest() diff --git a/kittens/diff/render.py b/kittens/diff/render.py index 013f632dd..07c24e37b 100644 --- a/kittens/diff/render.py +++ b/kittens/diff/render.py @@ -7,7 +7,7 @@ from gettext import gettext as _ from kitty.fast_data_types import truncate_point_for_length -from .collect import data_for_path, path_name_map +from .collect import data_for_path, lines_for_path, path_name_map from .config import formats @@ -111,10 +111,15 @@ def split_to_size(line, width): def lines_for_diff(left_path, right_path, hunks, args, columns, margin_size): - available_cols = columns // 2 - margin_size - for hunk_num, hunk in enumerate(hunks): - for line_num, (left, right) in enumerate(zip(hunk.left_lines, hunk.right_lines)): - pass + raise NotImplementedError('TODO') + lines_for_path() + # available_cols = columns // 2 - margin_size + # + # for hunk_num, hunk in enumerate(hunks): + # for line_num, (left, right) in enumerate(zip(hunk.left_lines, hunk.right_lines)): + # left_line_number, left_is_ + # left_line = lines_for_path(left_path)[ + # left_lines, right_lines = list(split_to_size(left_line, available_cols)), list(split_to_size( def render_diff(collection, diff_map, args, columns):