591 Commits

Author	SHA1	Message	Date
Rob Rix	8b2a9fb6d0	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly ... # Conflicts: # src/Renderer/JSON.hs # src/Renderer/Patch.hs # test/CorpusSpec.hs	2016-04-04 18:00:25 -04:00
joshvera	928087e1f5	🔥	2016-04-04 17:38:58 -04:00
joshvera	a553709112	Specialize Renderer to Text	2016-04-04 17:20:26 -04:00
Rob Rix	06c4759aed	Represent Both as Join (,).	2016-04-04 15:01:47 -04:00
Rob Rix	60d6cfeb90	Use the curried both constructor.	2016-04-04 14:53:09 -04:00
joshvera	ba8fef376a	move to where clause	2016-04-02 13:28:17 -04:00
joshvera	4512344e3a	update dictionary.json.js	2016-04-01 16:07:05 -04:00
joshvera	4a7004394b	fix tests	2016-04-01 15:53:16 -04:00
Rob Rix	f1b2308405	Annotate a leaf type to prevent spew in the REPL.	2016-04-01 10:40:21 -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	dd1355e978	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly	2016-03-31 18:01:49 -04:00
Rob Rix	da3f04100e	Merge branch 'master' into one-header-per-file	2016-03-31 17:00:37 -04:00
joshvera	5ff0d38a2f	Make sure we actually show 2 hunks in the test	2016-03-31 13:53:47 -04:00
joshvera	4fafbda1de	Test multiple hunks only has one header	2016-03-31 13:20:14 -04:00
joshvera	b44c8fae38	Add jquery alignment test case	2016-03-31 13:11:46 -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
Rob Rix	04ca818b0b	Rename the test.	2016-03-24 13:54:11 -04:00
Rob Rix	931ba9808f	Test that groupChildrenByLine produces symmetrical context.	2016-03-24 13:53:58 -04:00
Rob Rix	07bc16bf35	Be more specific with the test names.	2016-03-24 13:44:57 -04:00
Rob Rix	899d53eec2	Test the alignment of identical nodes across multiple lines.	2016-03-24 13:05:52 -04:00
Rob Rix	fbbf80a3fa	Test the alignment of identical nodes on a single line.	2016-03-24 13:05:44 -04:00
Rob Rix	2e9eb92609	Rename the tests.	2016-03-22 09:20:44 -04:00
Rob Rix	1a3a32e3e1	Correct the test fixtures.	2016-03-22 00:17:20 -04:00
Rob Rix	2226acf61c	Revert "Add a convenience to construct Source Char." ... This reverts commit 63e023e439491207aa739bb0e68660770eaa9272.	2016-03-21 19:08:35 -04:00
Rob Rix	7ff808f3dc	Add some tests (which won’t typecheck yet).	2016-03-21 19:08:02 -04:00
Rob Rix	62ac37c981	Add a convenience to construct branch diffs.	2016-03-21 18:54:34 -04:00
Rob Rix	361bfc0e81	Add a convenience to construct leaf diffs.	2016-03-21 18:54:27 -04:00
Rob Rix	1f1be15a99	Add a convenience to construct Source Char.	2016-03-21 18:54:18 -04:00
Rob Rix	d3a3b68752	Add a convenience to construct Info.	2016-03-21 18:54:09 -04:00
joshvera	2d711d2a56	just one slash	2016-03-16 18:56:57 -04:00
Rob Rix	6b2b2a811b	Move the nested insert tests to the todo pile.	2016-03-15 15:53:04 -04:00
Rob Rix	8e07d40a0d	Disable the Monoid tests over Both Line Char.	2016-03-15 15:52:54 -04:00
Rob Rix	7da4a180b7	Shrink Adjoined.	2016-03-15 11:46:15 -04:00
Rob Rix	493f55aa65	Shrink Both.	2016-03-15 11:46:09 -04:00
Rob Rix	943e0b7a40	Shrink Lines.	2016-03-15 11:46:05 -04:00
Rob Rix	3182f61140	Test the Monoid instance for Adjoined over Both Line.	2016-03-15 11:19:05 -04:00
Rob Rix	777aef345e	Test the Monoid instance for Adjoined over Line.	2016-03-15 11:18:27 -04:00
Rob Rix	01f817a77e	Move the other arbitrary instances into ArbitraryTerm.	2016-03-15 11:17:47 -04:00
Rob Rix	86f41d4ce8	Empty lines get inserted before merged ones.	2016-03-15 11:13:01 -04:00
Rob Rix	164a4fdd6f	Sequence coalesced lines by aligning.	2016-03-15 11:11:27 -04:00
Rob Rix	f3c6f8b3f6	Compute lines within Adjoined.	2016-03-15 10:58:54 -04:00
Rob Rix	e7702fd11d	Add a (failing) test that Both coalesces asymmetrically at right.	2016-03-15 10:55:20 -04:00
Rob Rix	2ea0fa9109	Add a (failing) test that Both coalesces asymmetrically at left.	2016-03-15 10:54:28 -04:00
Rob Rix	01330d9d2e	Add a (failing) test that it doesn’t coalesce when neither side coalesces.	2016-03-15 10:52:43 -04:00