836 Commits

Author	SHA1	Message	Date
joshvera	6bb2be56cc	update fixtures	2016-06-01 12:17:07 -04:00
joshvera	465da6bae5	one more	2016-05-31 17:02:24 -04:00
joshvera	55f286d8be	Replace instance of comparable	2016-05-31 17:01:01 -04:00
joshvera	cf21fddc08	Fix up tests	2016-05-31 16:38:47 -04:00
Rob Rix	2887d0c2a1	Merge branch 'master' into fix-invalid-slice	2016-05-31 13:28:50 -04:00
Rob Rix	07190fb6d1	Add a regression test for #573.	2016-05-30 19:04:16 -04:00
Rob Rix	8e45e5973d	Correct the nested-insert fixture.	2016-05-30 13:54:33 -04:00
Rob Rix	f4ff8d0b89	Correct the insert fixture.	2016-05-30 13:54:28 -04:00
Rob Rix	49f477f5b0	📝 Verbatim.	2016-05-30 12:46:25 -04:00
Rob Rix	3fbfe43935	Prepend a newline to avoid being indented by expected:/but got:.	2016-05-30 12:44:09 -04:00
Rob Rix	89733ccdef	Test the fixtures in Verbatim.	2016-05-30 12:42:43 -04:00
Rob Rix	643e37477f	Derive an NFData instance for Verbatim.	2016-05-30 12:42:19 -04:00
Rob Rix	f10c0b305d	Enable GeneralizedNewtypeDeriving.	2016-05-30 12:42:11 -04:00
Rob Rix	46b43c63e9	This is Text, now.	2016-05-30 12:40:41 -04:00
Rob Rix	7fe5be7fe2	Verbatim wraps Text.	2016-05-30 12:39:43 -04:00
Rob Rix	7a52507e94	Derive an Eq instance for Verbatim.	2016-05-30 12:39:39 -04:00
Rob Rix	3774bfb816	We treat this argument as a FilePath.	2016-05-30 12:38:21 -04:00
Rob Rix	d584832b6b	We treat this argument as a FilePath.	2016-05-30 12:37:45 -04:00
Rob Rix	93b36a852f	Add a Show instance for Verbatim which emits the unquoted string.	2016-05-30 12:37:05 -04:00
Rob Rix	58883000b1	Add a Verbatim newtype wrapping a String.	2016-05-30 12:36:52 -04:00
Rob Rix	160417d5a6	Move nested-insert out of the todos list.	2016-05-30 10:20:43 -04:00
Rob Rix	06c7437e66	Move insert out of the todos list.	2016-05-30 10:20:31 -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	962b637d24	Update the asymmetrical-context fixture.	2016-05-27 15:16:50 -04:00
Rob Rix	1e6af52d35	Update the multiline-insert fixture.	2016-05-27 15:16:44 -04:00
Rob Rix	3351d2a2e3	Move the multiline-insert fixture into the done folder.	2016-05-27 15:16:22 -04:00
Rob Rix	ee9dd67bdf	Move the asymmetrical-context test into the done dir.	2016-05-27 15:16:12 -04:00
Rob Rix	1153970864	Rebuild the other JSON fixtures now that we preserve ordering again.	2016-05-27 15:11:37 -04:00
Rob Rix	cdaa21d7d9	Move the newline-at-eof test into the functioning set.	2016-05-27 15:11:18 -04:00
Rob Rix	610d6e05da	🔥 some redundant imports.	2016-05-27 15:10:54 -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	85553f281c	Remove duplicate Prologue import	2016-05-26 13:13:30 -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