Rob Rix
|
98a7c049b2
|
Clip when padding.
|
2016-04-25 14:13:01 -04:00 |
|
Rob Rix
|
bd0d8f0d02
|
Map the diffs into functions first up.
|
2016-04-25 14:08:04 -04:00 |
|
Rob Rix
|
dde8612347
|
Revert "Flip the arguments to showDiff."
This reverts commit 6808da41529f58593553730451185cc90b643ba7.
|
2016-04-25 14:06:43 -04:00 |
|
Rob Rix
|
a5f45ed699
|
Flip the arguments to showDiff.
|
2016-04-25 14:04:57 -04:00 |
|
Rob Rix
|
958dfe914c
|
Pad the first column of These.
|
2016-04-25 14:02:39 -04:00 |
|
Rob Rix
|
b9b5382b3d
|
Use the pad function for This.
|
2016-04-25 14:01:45 -04:00 |
|
Rob Rix
|
e214dc3c1d
|
Add a function to pad strings out.
|
2016-04-25 14:01:39 -04:00 |
|
Rob Rix
|
1fb647ae9d
|
Drop the broken min .
|
2016-04-25 13:56:57 -04:00 |
|
Rob Rix
|
d9c2bb8e4c
|
Strip newlines in the output diff.
|
2016-04-25 13:55:39 -04:00 |
|
Rob Rix
|
938b89f8db
|
Add a function to strip newlines from a Functor.
|
2016-04-25 13:55:33 -04:00 |
|
Rob Rix
|
aa87f65466
|
Pad out This lines.
|
2016-04-25 13:47:21 -04:00 |
|
Rob Rix
|
77576905d1
|
Parameterize showLine by the column width.
|
2016-04-25 13:38:26 -04:00 |
|
Rob Rix
|
7999f8e540
|
Wrap the diff in PrettyDiff.
|
2016-04-25 13:37:19 -04:00 |
|
Rob Rix
|
51191338a6
|
Add an align binding.
|
2016-04-25 13:37:07 -04:00 |
|
Rob Rix
|
4d47ebc4b5
|
Define an Eq instance for PrettyDiff.
|
2016-04-25 13:00:26 -04:00 |
|
Rob Rix
|
639e1a9443
|
Add field accessors back in again.
|
2016-04-25 13:00:18 -04:00 |
|
Rob Rix
|
e481756bd3
|
Bind the sources in a let.
|
2016-04-25 12:57:57 -04:00 |
|
Rob Rix
|
3cde6162e7
|
PrettyDiff takes a pair of Sources.
|
2016-04-25 12:57:33 -04:00 |
|
Rob Rix
|
a805cad292
|
Pass the source to showDiff explicitly.
|
2016-04-25 12:56:03 -04:00 |
|
Rob Rix
|
0ca30921ca
|
Add a Show instance for PrettyDiff.
|
2016-04-25 12:54:51 -04:00 |
|
Rob Rix
|
0d90744aac
|
PrettyDiff doesn’t declare accessors.
|
2016-04-25 12:54:40 -04:00 |
|
Rob Rix
|
43359cad9c
|
PrettyDiff carries the Source.
|
2016-04-25 12:53:15 -04:00 |
|
Rob Rix
|
564dd1d2c7
|
Stub in a PrettyDiff type.
|
2016-04-25 12:37:56 -04:00 |
|
Rob Rix
|
f0683932bb
|
🔥 redundant imports.
|
2016-04-22 12:56:13 -04:00 |
|
Rob Rix
|
f7fd63528a
|
🔥 obsolete bindings.
|
2016-04-22 12:56:09 -04:00 |
|
Rob Rix
|
d2dae5824d
|
Expect children to be in a copointed context.
|
2016-04-22 12:18:40 -04:00 |
|
Rob Rix
|
7a3aac1af9
|
Add a failing test that we align context following insertions correctly.
|
2016-04-15 16:10:09 -04:00 |
|
Rob Rix
|
a61d847705
|
Replace Data.Bifunctor.These and Data.Align with the these package.
|
2016-04-14 22:00:00 -04:00 |
|
Rob Rix
|
d99d1d762c
|
🔥 some redundant imports.
|
2016-04-14 21:57:52 -04:00 |
|
Rob Rix
|
3662b021df
|
Correct the test of insertion patch alignment.
|
2016-04-14 20:31:03 -04:00 |
|
Rob Rix
|
7c63e92ea7
|
Construct SplitPatches.
|
2016-04-14 20:27:24 -04:00 |
|
Rob Rix
|
e5dd029b10
|
Test that insertions are aligned.
|
2016-04-14 19:40:36 -04:00 |
|
Rob Rix
|
75bda340ef
|
Sort the Data.Functor.Identity import.
|
2016-04-14 19:34:59 -04:00 |
|
Rob Rix
|
1c9e5d9087
|
🔥 tests of splitDiffByLines.
|
2016-04-14 18:31:03 -04:00 |
|
Rob Rix
|
2564034b6d
|
🔥 tests of splitAbstractedTerm.
|
2016-04-14 18:30:52 -04:00 |
|
Rob Rix
|
e3ace6408c
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# test/AlignmentSpec.hs
# test/PatchOutputSpec.hs
|
2016-04-14 12:57:45 -04:00 |
|
Rob Rix
|
ad47c77509
|
Correct some test cases.
|
2016-04-12 05:00:39 -04:00 |
|
Rob Rix
|
1a22eaebf6
|
Correct the tests.
|
2016-04-12 04:54:32 -04:00 |
|
Rob Rix
|
0437045089
|
Simplify the multiple children in a single line test.
|
2016-04-05 11:37:40 -04:00 |
|
Rob Rix
|
07cf5dac3c
|
Add a (failing) test that multiple children on the same line get aligned.
|
2016-04-04 18:26:10 -04:00 |
|
Rob Rix
|
d35de99307
|
🔥 some redundant parens.
|
2016-04-04 18:25:44 -04:00 |
|
Rob Rix
|
50d18f4472
|
🔥 a do .
|
2016-04-04 18:19:58 -04:00 |
|
Rob Rix
|
63e33f54cc
|
Put the branch/leaf/info DSL at the top level.
|
2016-04-01 10:15:48 -04:00 |
|
Rob Rix
|
9c706c05e2
|
🔥 patchWithBoth.
|
2016-04-01 10:13:37 -04:00 |
|
Rob Rix
|
2540e9d207
|
🔥 leafWithRangeInSource.
|
2016-04-01 10:13:33 -04:00 |
|
Rob Rix
|
4f9de16045
|
Free doesn’t export unfold.
|
2016-04-01 10:13:22 -04:00 |
|
Rob Rix
|
04fffe584f
|
🔥 redundant imports.
|
2016-04-01 10:13:13 -04:00 |
|
Rob Rix
|
19cc23b51a
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# src/Diff.hs
|
2016-03-30 20:20:50 -04:00 |
|
Rob Rix
|
20bb94bf5e
|
Also, tests.
|
2016-03-30 17:33:07 -04:00 |
|
Rob Rix
|
ea97b04032
|
Test that groupChildrenByLine produces asymmetrical context.
|
2016-03-24 13:56:07 -04:00 |
|