Rob Rix
d2f63f77f1
Render hunks’ trailing context.
2015-12-30 15:29:17 -05:00
Rob Rix
2fc7d8f537
Move showRow to the top level.
2015-12-30 15:27:04 -05:00
Rob Rix
636e526311
Move showLine to the top level.
2015-12-30 15:27:00 -05:00
Rob Rix
be2476cfda
Move getRange to the top level.
2015-12-30 15:26:49 -05:00
Rob Rix
725ef9c1d0
Pass the sources around as a pair.
2015-12-30 15:23:52 -05:00
Rob Rix
ebafcab8df
Add trailing context to hunks.
2015-12-30 15:21:26 -05:00
Rob Rix
27a877e861
Generalize unionRanges
to Foldable
Functor
s.
...
We use `Foldable` and `Functor`, and not `Traversable`, because the
latter is not automatically implied by the former. I.e. we use the
minimum necessary set of constraints.
2015-12-30 13:45:04 -05:00
Rob Rix
176d45b59d
Union the ranges rather than concatenating them.
2015-12-30 12:35:27 -05:00
Rob Rix
a225fb20fe
Workaround default Num constraint warnings.
2015-12-30 12:31:38 -05:00
Rob Rix
4e96478cbb
Merge branch 'diff-performance' into patch
...
# Conflicts:
# src/Split.hs
2015-12-30 12:17:33 -05:00
Rob Rix
e1fa8d089e
Merge branch 'master' into diff-performance
2015-12-30 12:14:44 -05:00
Josh Vera
700277abb9
Merge pull request #370 from github/nest-split-diff-nodes
...
Nest split diff nodes
2015-12-30 12:03:28 -05:00
Rob Rix
96f98b6bed
Revert "Generate syntax with String leaves."
...
This reverts commit ba92cc702f8f4585fbcb8eb61a2567b3c336afd4.
2015-12-30 10:39:28 -05:00
Rob Rix
20b87aff70
Revert "Info is a Monoid."
...
This reverts commit f7dad5a28dcd7fb693f2d13c8e2d6ad0b893957e.
2015-12-30 10:37:17 -05:00
Rob Rix
6f415c577f
Generalize split
rendering to arbitrary leaf type.
2015-12-30 10:35:25 -05:00
Rob Rix
b54c4c8265
Bool, not ().
2015-12-30 10:33:49 -05:00
Rob Rix
ad31669f07
Revert "Generalize openMaybe."
...
This reverts commit 9a056744cfb33ac0454d07fd89356fb620b7cb50.
2015-12-30 10:33:28 -05:00
Rob Rix
3e3c7be082
Test openLineBy
over openMaybe
.
2015-12-30 10:31:30 -05:00
Rob Rix
d5d8095a4e
pure
.
2015-12-30 10:28:40 -05:00
Rob Rix
494d7f83c8
Spacing.
2015-12-30 10:28:16 -05:00
Rob Rix
093700c571
Generalize openMaybe.
2015-12-30 10:27:45 -05:00
Rob Rix
6dfb6b3ff7
Wrap terms in Identity.
2015-12-30 10:26:40 -05:00
Rob Rix
722422108f
contextRows
doesn’t take categories.
2015-12-30 10:23:51 -05:00
Rob Rix
8edf12573a
Remove openInfo.
2015-12-30 10:23:16 -05:00
Rob Rix
cdbecea7f1
Context rows produce ranges only.
2015-12-30 10:23:08 -05:00
Rob Rix
2a646d43a1
Wrap in adjoinChildRows.
2015-12-30 10:15:27 -05:00
Rob Rix
40fc01f1b5
Wrap in adjoinChildLines.
2015-12-30 10:10:49 -05:00
Rob Rix
f8553edf70
Union the child/context ranges.
2015-12-30 10:06:39 -05:00
Rob Rix
bb5a7f6218
Remove isEmpty
.
2015-12-30 10:06:16 -05:00
Rob Rix
941d4d5ddb
Add a unionRanges
function to Range
.
2015-12-30 10:05:31 -05:00
Rob Rix
cd213e8f4a
Remove contextLines.
2015-12-30 09:56:56 -05:00
Rob Rix
463266a48e
Don’t bother using contextLines.
2015-12-30 09:56:45 -05:00
Rob Rix
12935f2501
Import Identity.
2015-12-30 09:51:43 -05:00
Rob Rix
a96072ac43
Don’t import Lens.
2015-12-30 09:50:45 -05:00
Rob Rix
30421f40cc
Revert "Depend on lens
."
...
This reverts commit 5418371e0dad0b30f684a4e00564cbec6c035539.
2015-12-30 09:50:10 -05:00
Rob Rix
ec7dc4ee6e
Revert "RankNTypes."
...
This reverts commit 7c5306eca83c86e131783cc8fbcf989abfd76a03.
2015-12-30 09:50:07 -05:00
Rob Rix
7bd6510cfb
Remove the HasTerm lens type.
2015-12-30 09:49:36 -05:00
Rob Rix
6646f56de2
Use Has
to get and set split terms.
2015-12-30 09:49:12 -05:00
Rob Rix
a187138fc3
Use Has
to get and set split diffs in keyed nodes.
2015-12-30 09:43:39 -05:00
Rob Rix
2ef9c33902
Remove HasDiff.
2015-12-30 09:40:44 -05:00
Rob Rix
5452191cb7
Remove HasSplitDiff.
2015-12-30 09:40:40 -05:00
Rob Rix
422fc570b1
Define openDiff
over Has
.
2015-12-30 09:40:09 -05:00
Rob Rix
1465e21fa4
Add a Has
instance for (a, _) pairs.
2015-12-30 09:39:11 -05:00
Rob Rix
98486f6120
Add a Has
instance for Identity
.
2015-12-30 09:38:55 -05:00
Rob Rix
eecc6c63f2
Add a Has
typeclass descending from Functor
.
2015-12-30 09:38:42 -05:00
Rob Rix
c0bc19e52c
Remove setSplitDiff.
2015-12-30 09:30:54 -05:00
Rob Rix
dc78803b4b
HasDiff is constrained to Functors.
2015-12-30 09:30:37 -05:00
Rob Rix
dddfc77e05
openDiff takes a HasSplitDiff context.
2015-12-30 09:17:52 -05:00
Rob Rix
7209e396ec
Add a HasDiff instance for string/diff pairs.
2015-12-30 09:01:49 -05:00
Rob Rix
e55fa76b5a
Add a HasDiff identity instance.
2015-12-30 09:01:36 -05:00