Insert context boundary at top of file is first change is not at top of file

This commit is contained in:
Kovid Goyal 2014-01-29 17:06:02 +05:30
parent 75bdef4fe3
commit e26ee89caf

View File

@ -653,13 +653,13 @@ class DiffSplit(QSplitter): # {{{
QApplication.processEvents(QEventLoop.ExcludeUserInputEvents | QEventLoop.ExcludeSocketNotifiers)
else:
for i, group in enumerate(cruncher.get_grouped_opcodes(context)):
if i > 0:
self.changes.append(Change(
ltop=cl.block().blockNumber()-1, lbot=cl.block().blockNumber(),
rtop=cr.block().blockNumber()-1, rbot=cr.block().blockNumber(), kind='boundary'))
self.left.line_number_map[self.changes[-1].ltop] = '-'
self.right.line_number_map[self.changes[-1].rtop] = '-'
for tag, alo, ahi, blo, bhi in group:
for j, (tag, alo, ahi, blo, bhi) in enumerate(group):
if j == 0 and (i > 0 or min(alo, blo) > 0):
self.changes.append(Change(
ltop=cl.block().blockNumber()-1, lbot=cl.block().blockNumber(),
rtop=cr.block().blockNumber()-1, rbot=cr.block().blockNumber(), kind='boundary'))
self.left.line_number_map[self.changes[-1].ltop] = '-'
self.right.line_number_map[self.changes[-1].rtop] = '-'
getattr(self, tag)(alo, ahi, blo, bhi)
QApplication.processEvents(QEventLoop.ExcludeUserInputEvents | QEventLoop.ExcludeSocketNotifiers)
cl.insertBlock(), cr.insertBlock()