joshvera
|
bfe57829d6
|
Merge remote-tracking branch 'origin/master' into rws-large-diffs
|
2016-09-27 10:34:19 -04:00 |
|
Rob Rix
|
8cec95aad4
|
Merge branch 'master' into pretty-print-expectations
# Conflicts:
# script/cibuild-semantic-diff
# script/cibuild-semantic-diff-linux
# test/RangeSpec.hs
# test/Spec.hs
|
2016-09-20 05:56:12 +09:00 |
|
joshvera
|
925fdfaeaf
|
remove &&& import
|
2016-09-16 11:52:31 -04:00 |
|
Rob Rix
|
e6372deeb6
|
🔥 a redundant constraint.
|
2016-09-15 18:38:18 -04:00 |
|
Rob Rix
|
64d1d6b407
|
Monoid/Semigroup stuff.
|
2016-09-15 17:21:37 -04:00 |
|
Rick Winfrey
|
a4c5a26533
|
Add pretty diff expectations to semantic diff tests
|
2016-09-14 16:45:23 -05:00 |
|
Rob Rix
|
8d955c3f96
|
Placate hlint.
|
2016-09-09 14:47:24 -04:00 |
|
Rob Rix
|
98637ad656
|
Generalize Term/TermF & Diff/DiffF over the functor.
|
2016-09-09 14:46:50 -04:00 |
|
joshvera
|
485fc884a4
|
Merge branch 'syntax-redux' into property-tests
|
2016-07-22 14:39:54 -04:00 |
|
Rob Rix
|
389b2ddfa6
|
Use joinCrosswalk in the spec.
|
2016-07-22 11:40:04 -04:00 |
|
Rob Rix
|
faa195ea8f
|
Add a drop-in for Crosswalk over Bicrosswalkable Joins.
|
2016-07-22 11:39:56 -04:00 |
|
Rob Rix
|
82ce5fffad
|
AlignmentSpec doesn’t depend on Info at all.
|
2016-07-15 09:39:03 -04:00 |
|
joshvera
|
59426b86f6
|
Add megaparsec to pretty print summaries
|
2016-07-13 14:32:53 -04:00 |
|
Rob Rix
|
b405286065
|
Tidy up AlignmentSpec.
|
2016-06-27 15:02:28 -04:00 |
|
Rob Rix
|
1668e94427
|
Define Info as a synonym over Data.Record.
|
2016-06-17 13:33:50 -04:00 |
|
Rob Rix
|
8780ea3f26
|
Move the Arbitrary instances for Join (,) and Join These into semantic-diff proper.
|
2016-06-06 11:50:45 -04:00 |
|
Rob Rix
|
a43be167f6
|
Merge branch 'master' into cache-cost-on-info
|
2016-06-03 16:24:02 -04:00 |
|
Rob Rix
|
7802d4916c
|
🔥 FlexibleInstances & RecordWildCards pragmas.
|
2016-06-03 16:02:06 -04:00 |
|
Rob Rix
|
bcbb590b1f
|
Add a cost field to Info.
|
2016-06-02 23:34:16 -04:00 |
|
Rob Rix
|
f2eccbb275
|
🔥 the contortionist pointfree definition of info.
|
2016-06-02 22:55:11 -04:00 |
|
joshvera
|
cf21fddc08
|
Fix up tests
|
2016-05-31 16:38:47 -04:00 |
|
Rob Rix
|
f77d8e023c
|
Do the mapping all in one go.
|
2016-05-27 15:43:45 -04:00 |
|
Rob Rix
|
8ea9b44aef
|
Traverse instead of sequenceA/fmap.
|
2016-05-27 15:43:14 -04:00 |
|
Rob Rix
|
a48404b53a
|
Don’t use unionThese in the spec.
|
2016-05-27 15:42:36 -04:00 |
|
Rob Rix
|
0cbc8e514f
|
Correct the fixtures for a couple of cases.
|
2016-05-27 15:30:39 -04:00 |
|
Rob Rix
|
ecb37f8f00
|
Correct the commented-out PrettyDiff full output thing.
|
2016-05-27 15:30:27 -04:00 |
|
Rob Rix
|
f60faefee5
|
🔥 a redundant import of Identity.
|
2016-05-27 14:05:29 -04:00 |
|
Rob Rix
|
14e9a3372f
|
alignBranch takes a list of lines, not of aligned children.
|
2016-05-27 13:58:50 -04:00 |
|
Rob Rix
|
ebefc1c124
|
🔥 a redundant import.
|
2016-05-27 09:36:36 -04:00 |
|
Rob Rix
|
de6d7edec2
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# semantic-diff.cabal
# src/Alignment.hs
# src/Control/Comonad/Cofree.hs
# src/Data/Adjoined.hs
# src/Diffing.hs
# src/Interpreter.hs
# src/Prologue.hs
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# src/Renderer/Split.hs
# src/SplitDiff.hs
# src/Term.hs
# test/AlignmentSpec.hs
# test/ArbitraryTerm.hs
# test/PatchOutputSpec.hs
|
2016-05-27 09:35:26 -04:00 |
|
Rob Rix
|
cfe15a5afa
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# src/Alignment.hs
# src/Control/Comonad/Cofree.hs
# src/Data/Adjoined.hs
# src/Data/Align.hs
# src/Data/Bifunctor/These.hs
# src/Data/Coalescent.hs
# src/Data/Copointed.hs
# src/Data/Functor/Both.hs
# src/Data/Option.hs
# src/Line.hs
# src/Patch.hs
# src/Range.hs
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# src/Renderer/Split.hs
# src/SplitDiff.hs
# stack.yaml
# test/AlignmentSpec.hs
# test/CorpusSpec.hs
# test/Data/Adjoined/Spec.hs
# test/Data/Functor/Both/Spec.hs
|
2016-05-26 15:25:45 -04:00 |
|
joshvera
|
ebd5d20171
|
Remove duplicate imports
|
2016-05-26 14:04:27 -04:00 |
|
joshvera
|
473ec980b1
|
Merge remote-tracking branch 'origin/master' into diff-summaries
|
2016-05-26 13:40:54 -04:00 |
|
joshvera
|
ed144bbb1f
|
Fix tests
|
2016-05-26 13:11:34 -04:00 |
|
joshvera
|
8180b37285
|
Use Protolude via the Prologue module and add NoImplicitPrelude
|
2016-05-26 12:58:04 -04:00 |
|
Rob Rix
|
8313074e50
|
Test that we preserve child lines in the output.
|
2016-05-26 11:39:24 -04:00 |
|
Rob Rix
|
7854e32c51
|
Unique the keys on both sides.
This avoids false negatives in the tests where, if we generate two
children with the same key, we appear to drop one of the keys.
|
2016-05-26 10:16:26 -04:00 |
|
Rob Rix
|
5933a0809d
|
Move branchElementContents into toAlignBranchInputs.
|
2016-05-26 09:37:06 -04:00 |
|
Rob Rix
|
f48e5c37bc
|
Move alignBranchElement into toAlignBranchInputs.
|
2016-05-26 09:36:44 -04:00 |
|
Rob Rix
|
6ef8758d7e
|
Add a test case for symmetrical reformatted nodes and context following them.
|
2016-05-26 09:31:25 -04:00 |
|
Rob Rix
|
3820ab3e66
|
Filter out bogus empty ranges.
|
2016-05-25 17:10:38 -04:00 |
|
Rob Rix
|
0025b044f7
|
Increment the ranges for successive lines.
|
2016-05-25 17:10:30 -04:00 |
|
Rob Rix
|
b0d154271c
|
Take the actual lines on both sides.
We were getting the wrong ranges.
|
2016-05-25 17:10:14 -04:00 |
|
Rob Rix
|
5fad7be0f5
|
🔥 the unused Arbitrary instance over PrettyDiff.
|
2016-05-25 14:31:47 -04:00 |
|
Rob Rix
|
04e36c4dcb
|
🔥 alignmentFromBranchElements.
|
2016-05-25 14:14:38 -04:00 |
|
Rob Rix
|
2ea50d9387
|
Roll toSourcesAndRanges into toAlignedChildren.
|
2016-05-25 14:13:27 -04:00 |
|
Rob Rix
|
b4d0749d52
|
🔥 the top-level bothContents binding.
|
2016-05-25 13:32:33 -04:00 |
|
Rob Rix
|
eb15740170
|
Roll toSources into toSourcesAndRanges.
|
2016-05-25 11:18:49 -04:00 |
|
Rob Rix
|
e5a2c384fc
|
Test that alignBranch covers every line of the input ranges.
|
2016-05-25 11:13:34 -04:00 |
|
Rob Rix
|
6caf9d3930
|
Extract alignment from the property test.
|
2016-05-25 10:59:16 -04:00 |
|