Repository navigation
Expand file tree
/
Copy pathcommand_update_diff_view.py
More file actions
153 lines (139 loc) · 7.11 KB
/
Copy pathcommand_update_diff_view.py
File metadata and controls
153 lines (139 loc) · 7.11 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
from .core.diff_view import get_diff_view
from .core.git_commands import Git, GitStatus, remove_first_lines
from typing import List, Optional
import sublime
import sublime_plugin
import difflib as dl
import re
import os
def update_diff_view(view: sublime.View, git_status: Optional[GitStatus]):
window = view.window()
if not window:
return
git = Git(window)
views = window.views()
diff_view = get_diff_view(views)
if not diff_view:
return
if git_status is None:
diff_view.erase_regions('git_diff_view.add_bg')
diff_view.erase_regions('git_diff_view.removed_bg')
diff_view.erase_regions('git_diff_view.add_char')
diff_view.erase_regions('git_diff_view.remove_char')
diff_view.run_command('git_diff_view_update_view', {'content': 'No diff'})
return
modification_type = git_status['modification_type']
file_name = git_status['file_name']
# enable editing the file for editing
diff_output = ''
if 'MM' == modification_type:
diff_view.set_syntax_file('Packages/Diff/Diff.sublime-syntax')
diff_output = (
"Staged\n" +
"======\n" +
git.diff_file_staged(file_name) +
"Unstaged\n" +
"========\n" +
git.diff_file_unstaged(file_name)
)
elif 'M' in modification_type:
diff_view.set_syntax_file('Packages/Diff/Diff.sublime-syntax')
diff_output = remove_first_lines(git.diff_file(file_name), 4)
elif 'U' in modification_type:
diff_view.set_syntax_file('Packages/Diff/Diff.sublime-syntax')
diff_output = remove_first_lines(git.diff_file(file_name), 4)
elif 'A' in modification_type:
diff_view.set_syntax_file('Packages/Diff/Diff.sublime-syntax')
diff_output = remove_first_lines(git.diff_file(file_name), 5)
elif 'R' in modification_type:
diff_view.set_syntax_file('Packages/Diff/Diff.sublime-syntax')
diff_output = remove_first_lines(git.diff_file(file_name), 4)
elif 'C' in modification_type:
diff_view.set_syntax_file('Packages/Diff/Diff.sublime-syntax')
diff_output = remove_first_lines(git.diff_file(file_name), 4)
elif '?' in modification_type:
syntax = get_syntax(file_name, view)
diff_view.set_syntax_file(syntax or 'Packages/GitDiffView/syntax/GitUntracked.sublime-syntax')
diff_output = git.show_added_file(file_name)
elif 'D' in modification_type:
diff_view.set_syntax_file('Packages/Diff/Diff.sublime-syntax')
diff_output = remove_first_lines(git.diff_file(file_name), 5)
diff_view.run_command('git_diff_view_update_view', {'content': diff_output})
add_diff_highlights(diff_view)
visible_regions = diff_view.visible_region()
if (visible_regions.end() - visible_regions.begin()) < 10: # when switching from a larger diff to view a smaller diff, the smaller diff will not be visible, so we scroll to top
diff_view.set_viewport_position((0, 0))
def add_diff_highlights(diff_view: sublime.View) -> None:
# st_bug_first_call_to_find_all_will_not_work_correctly = diff_view.find_all('') # haha, one new ST bug :D, without this line, the bellow diff_view.find_all will not work. Looks like the first call to diff_view.find_all will not work correctly.
added_lines = diff_view.find_all('^\\+.*')
removed_lines = diff_view.find_all('^\\-.*')
add_changes: List[sublime.Region] = []
remove_changes: List[sublime.Region] = []
plus_minus_sign_offset = 1
# TODO: The way diffs are found is probably not the best... PRs to improve this are welcome
diffs = list(dl.ndiff(
[diff_view.substr(sublime.Region(r.begin() + plus_minus_sign_offset, r.end())) for r in removed_lines],
[diff_view.substr(sublime.Region(r.begin() + plus_minus_sign_offset, r.end())) for r in added_lines]))
start_find_pt = 0
for i, diff in enumerate(diffs):
is_change = diff.startswith('?')
if is_change:
look_text = diffs[i-1][2:] #+ + font-size: 0.9em dsa;
diff_text = diff[2:] #? ^ ++++
look_region = diff_view.find(re.escape(look_text), start_find_pt)
if look_region is None:
continue
row, _ = diff_view.rowcol(look_region.begin())
# for debugging
# print('look text', look_text)
# print('diff text', diff_text)
addition_matches = re.finditer(r'\++', diff_text)
for i in addition_matches:
start, end = i.span(0)
start_point = diff_view.text_point(row, start + plus_minus_sign_offset)
end_point = diff_view.text_point(row, end + plus_minus_sign_offset)
add_changes.append(sublime.Region(start_point, end_point))
removal_matches = re.finditer(r'\-+', diff_text)
for i in removal_matches:
start, end = i.span(0)
start_point = diff_view.text_point(row, start + plus_minus_sign_offset)
end_point = diff_view.text_point(row, end + plus_minus_sign_offset)
remove_changes.append(sublime.Region(start_point, end_point))
diff_text_without_leading_tilde = ' ' + diff_text[1:] # diff_text
modification_matches = re.finditer('\\^+', diff_text_without_leading_tilde)
for i in modification_matches:
start, end = i.span(0)
start_point = diff_view.text_point(row, start + plus_minus_sign_offset)
end_point = diff_view.text_point(row, end + plus_minus_sign_offset)
if diff_view.match_selector(start_point, 'markup.deleted.diff'):
remove_changes.append(sublime.Region(start_point, end_point))
else:
add_changes.append(sublime.Region(start_point, end_point))
diff_view.add_regions('git_diff_view.add_bg', added_lines, "diff.inserted")
diff_view.add_regions('git_diff_view.removed_bg', removed_lines, "diff.deleted")
diff_view.add_regions('git_diff_view.add_char', add_changes, "diff.inserted.char")
diff_view.add_regions('git_diff_view.remove_char', remove_changes, "diff.deleted.char")
class GitDiffViewUpdateView(sublime_plugin.TextCommand):
def run(self, edit: sublime.Edit, content: str) -> None:
self.view.set_read_only(False)
regions = [r for r in self.view.sel()]
self.view.replace(edit, sublime.Region(0, self.view.size()), content)
sel = self.view.sel()
sel.clear()
sel.add_all(regions)
# disable editing the file for showing
self.view.set_read_only(True)
def get_syntax(file_name: str, view: sublime.View) -> Optional[str]:
window = view.window()
if not window:
return None
if not os.path.exists(file_name):
return None
tmp_buffer = window.open_file(file_name, sublime.TRANSIENT)
tmp_buffer.set_scratch(True)
# Even if is_loading() is true the view's settings can be
# retrieved; settings assigned before open_file() returns.
syntax = str(tmp_buffer.settings().get("syntax", ""))
window.run_command("close")
window.focus_view(view)
return syntax