6035 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	63a3b69c24	Split replaceIn across several lines.	2016-04-12 18:00:09 -04:00
Rob Rix	7d11abd92a	Split things up over several lines.	2016-04-12 17:58:54 -04:00
Rob Rix	dbe65d6831	Update the info with record syntax.	2016-04-12 17:56:52 -04:00
joshvera	37c7542d5a	Add Show instances for Arguments	2016-04-12 13:10:24 -04:00
Rob Rix	694567f8e3	Use the absolute difference cost.	2016-04-12 11:53:56 -04:00
Rob Rix	1d639ce8eb	Compute the absolute difference of a diff as its cost.	2016-04-12 11:53:51 -04:00
Rob Rix	d872b5ffff	Add a cost function which sums diff sizes, not just term sizes.	2016-04-12 11:46:37 -04:00
Rob Rix	5991d5b5de	Correct the split diff fixture.	2016-04-12 11:23:37 -04:00
Rob Rix	851d53fa07	Recompute term sizes after replacing multi-word leaves.	2016-04-12 11:22:02 -04:00
Rob Rix	9a5dca4558	One plus the sum.	2016-04-12 11:21:16 -04:00
Rob Rix	da4fc09e82	Reformat across lines.	2016-04-12 11:13:29 -04:00
Rob Rix	6075a62626	Write term sizes out in split diffs.	2016-04-12 10:56:01 -04:00
Rob Rix	0f8b6cea8d	Preserve branch term sizes through splitting.	2016-04-12 10:48:30 -04:00
Rob Rix	852fa1f207	Preserve term sizes through splitting.	2016-04-12 10:42:44 -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	e6c81e1c22	🔥 some redundant imports & bindings.	2016-04-12 04:44:12 -04:00
Rob Rix	3239eaf551	Compute diff costs via foldMap.	2016-04-11 16:51:10 -04:00
Rob Rix	ddeb3f9063	Derive a Foldable instance for Patch.	2016-04-11 16:50:48 -04:00
Rob Rix	465c1f9ab7	Use the cached term sizes to diff.	2016-04-11 15:09:45 -04:00
Rob Rix	2a08e059d2	Add a function to compute the cost from the cached term sizes.	2016-04-11 15:09:21 -04:00
Rob Rix	b3eb86a9e4	Correct the docs of diffCost.	2016-04-11 15:06:59 -04:00
Rob Rix	97b588d5e3	Correct the docs of termSize.	2016-04-11 15:06:53 -04:00
Rob Rix	c8c195daf8	Rename getSize to size.	2016-04-11 15:04:44 -04:00
Rob Rix	71e8454fb4	Add a size field to Info.	2016-04-11 15:02:58 -04:00
Rob Rix	4fb2c30892	Pass the cost function to interpret.	2016-04-11 14:49:25 -04:00
Rob Rix	0b4696062d	Compute term sizes as node counts.	2016-04-11 13:54:46 -04:00
Rob Rix	2f241803af	Revert "Rewrite group2 in terms of spanIntersecting." ... This reverts commit 3f808c548a6980b2ae35ec2fb7ea1dd249707668.	2016-04-11 12:06:02 -04:00
Rob Rix	48264b1cb3	Revert "Don’t bind tailRanges." ... This reverts commit dcacd86ccb12fa11b603e0e7468614551104742e.	2016-04-11 12:04:34 -04:00
Rob Rix	fe7301ba3a	Revert "Bind lists of intersecting & nonintersecting children." ... This reverts commit 2453b500adc0774ab5311ca1eca946806b2bb9c9.	2016-04-11 12:04:19 -04:00
Rob Rix	9174d5cfbe	Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly	2016-04-11 11:57:42 -04:00
Rob Rix	87b699c09a	Bind lists of intersecting & nonintersecting children.	2016-04-08 16:44:09 -04:00
Rob Rix	ec8fc5e7e7	Advance both sides if there are no unfinished children.	2016-04-08 15:22:09 -04:00
Rob Rix	efe7d43a59	Don’t bind tailRanges.	2016-04-08 15:06:00 -04:00
Rob Rix	20797a35c8	Use pairRangesWithLine to avoid unpacking Maybe.	2016-04-08 15:04:26 -04:00
Rob Rix	8c9a8906da	Rewrite group2 in terms of spanIntersecting.	2016-04-08 15:00:17 -04:00
Rob Rix	338bfff7c3	spanMergeable returns left/right separately.	2016-04-08 14:53:52 -04:00
Rob Rix	65157c54f2	Document spanThese.	2016-04-08 12:06:19 -04:00
Rob Rix	dcd9431987	Add a spanThese function.	2016-04-08 12:04:01 -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	eae8cf480b	Coalesce the patterns.	2016-04-04 18:06:54 -04:00
Rob Rix	23a2e300ae	intersects takes a single line.	2016-04-04 18:05:46 -04:00
Rob Rix	c79773ceea	🔥 an unused parameter.	2016-04-04 18:02:43 -04:00
Rob Rix	dd38cf4bd7	🔥 some redundant imports.	2016-04-04 18:02:32 -04:00
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
Rob Rix	20c7578807	Consume all of the lines in group2.	2016-04-04 17:56:53 -04:00
Rob Rix	4cce0deb34	Merge pull request #533 from github/async ... Asynchronously diff and timeout individual files	2016-04-04 17:40:55 -04:00