Skip to content

Commit 34504be

Browse files
committed
break this out to a shared method
1 parent 499f07b commit 34504be

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

file_diffs.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ def diff_content(self):
6868
content = self.view.substr(sublime.Region(0, self.view.size()))
6969
return content
7070

71+
def prep_content(self, ab, file_name, default_name):
72+
content = ab.splitlines(True)
73+
if file_name is None:
74+
file_name = default_name
75+
content = [line.replace("\r\n", "\n").replace("\r", "\n") for line in content]
76+
return (content, file_name)
77+
7178
def run_diff(self, a, b, from_file, to_file, external_diff_tool):
72-
def prep_content(ab, file_name, default_name):
73-
content = ab.splitlines(True)
74-
if file_name is None:
75-
file_name = default_name
76-
content = [line.replace("\r\n", "\n").replace("\r", "\n") for line in content]
77-
return (content, file_name)
78-
79-
(from_content, from_file) = prep_content(a,from_file,'from_file')
80-
(to_content, to_file) = prep_content(b,to_file,'to_file')
79+
(from_content, from_file) = self.prep_content(a, from_file, 'from_file')
80+
(to_content, to_file) = self.prep_content(b, to_file, 'to_file')
8181

8282
diffs = list(difflib.unified_diff(from_content, to_content, from_file, to_file))
8383

0 commit comments

Comments
 (0)