5954 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	3dbed9510b	Add an Align instance for Maybe.	2016-03-31 14:44:23 -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
joshvera	f35b88eabd	One header per file	2016-03-31 12:31:28 -04:00
Rob Rix	e5192708e0	Revert "Only take the first line from each child." ... This reverts commit 439e9358ee46be695cf651ed35dc9f988e757b9d.	2016-03-31 10:01:45 -04:00
Rob Rix	8d808e32ca	Revert "Skip a recursive call when we haven’t yet exhausted the lines in a child." ... This reverts commit 6da256ef89752bf312a0ba40cf571ff8f410c436.	2016-03-31 10:01:42 -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
Josh Vera	042d2ce803	Merge pull request #530 from github/move-info-into-its-own-module ... Move info into its own module	2016-03-30 18:10:22 -04:00
Rob Rix	20bb94bf5e	Also, tests.	2016-03-30 17:33:07 -04:00
Rob Rix	e8fbe8c789	Move Info into its own module.	2016-03-30 17:26:52 -04:00
Rob Rix	75677fa8aa	Add a module for Info.	2016-03-30 17:12:39 -04:00
Rob Rix	5bc8e9b582	Skip a recursive call when we haven’t yet exhausted the lines in a child.	2016-03-29 16:07:53 -04:00
Rob Rix	fe3c43d3d9	Only take the first line from each child.	2016-03-29 15:36:49 -04:00
Rob Rix	73a2eac0bb	intersects returns something in the shape of the ranges.	2016-03-29 15:30:53 -04:00
Rob Rix	35d60f8517	Rename heads/tails to headRanges/tailRanges.	2016-03-29 13:53:46 -04:00
Rob Rix	55742ac947	🔥 the inner go function.	2016-03-29 10:02:06 -04:00
Rob Rix	9417f9a5cf	Spacing.	2016-03-29 09:58:31 -04:00
Rob Rix	6f4f9391de	🔥 bimapJoin.	2016-03-29 09:57:41 -04:00
Rob Rix	e356b1f29b	groupChildrenByLine’s go function takes its ranges in Join These Range.	2016-03-29 09:42:19 -04:00
Rob Rix	48be9e9d81	There is only one cata.	2016-03-29 09:22:54 -04:00
Rob Rix	8db6772d07	Destructure lists embedded in Join These.	2016-03-28 19:17:38 -04:00
Rob Rix	d33a779768	spanMergeable takes its ranges in Join These.	2016-03-28 18:48:55 -04:00
Rob Rix	b5d1658e60	intersects takes its ranges in Join These.	2016-03-28 18:46:34 -04:00
Rob Rix	c5257ab009	Add a partial Applicative function for Join These.	2016-03-28 18:46:22 -04:00
Rob Rix	ffca96416f	Extract and annotate the inner functions.	2016-03-28 18:27:01 -04:00
Rob Rix	e334308205	Eliminate repetition when binding this/that.	2016-03-28 18:09:59 -04:00
Rob Rix	178dc833b2	Rename left/right to this/that for clarity.	2016-03-28 18:08:54 -04:00
Rob Rix	17abfbb813	Generalize split for clarity that it cannot depend on diff details.	2016-03-28 18:08:46 -04:00
Rob Rix	133c69ec92	Span over the mergeable children.	2016-03-28 17:57:38 -04:00
Rob Rix	b4c75c7f55	Add a function to partition & divide children intersecting with a pair of lines.	2016-03-28 17:55:01 -04:00
Rob Rix	6f170a134d	Add a function to split These into This and That.	2016-03-28 17:54:44 -04:00
Rob Rix	4fa1e1c2d3	Pull the or test out of intersects.	2016-03-28 17:53:39 -04:00
Rob Rix	82c2d29d5e	Don’t join the child lines.	2016-03-28 16:40:21 -04:00
Rob Rix	71fd74527d	Write intersects in non-tacit style.	2016-03-28 16:19:08 -04:00
Rob Rix	ed97e2fa36	Extract the intersection predicate into the where clause.	2016-03-28 16:10:38 -04:00
Rob Rix	07e3d89e2f	Match if there are no intersecting lines.	2016-03-28 16:08:33 -04:00
Rob Rix	665afe2a29	Find intersecting child lines on either side.	2016-03-28 16:03:56 -04:00
Rob Rix	3c27e69000	🔥 the bogus context gathering guards.	2016-03-28 16:03:43 -04:00
Rob Rix	deff4e0c28	🔥 the asymmetric children-gathering.	2016-03-28 16:03:29 -04:00
joshvera	4b046e6f4e	Return IO Text from printDiff	2016-03-28 13:31:10 -04:00
Rob Rix	e81be3d4ba	We meant to test whether these were _not_ empty.	2016-03-28 12:50:38 -04:00
Rob Rix	56c002fdf4	Inline the definition of intersecting.	2016-03-28 12:48:25 -04:00
Rob Rix	aa69c00245	concatMap.	2016-03-28 04:39:32 -04:00
Rob Rix	36ea4abdc8	🔥 some $s.	2016-03-28 04:39:26 -04:00
Rob Rix	f949aae3df	Avoid some $s.	2016-03-28 04:39:15 -04:00
Rob Rix	4649aa290a	Use null to test for emptiness.	2016-03-28 04:39:08 -04:00
Rob Rix	26199e2b22	Allow coincident endings in asymmetric alignments too.	2016-03-25 12:07:06 -04:00
Rob Rix	122ff8c182	Child ranges can end coincident with the line ranges and still intersect.	2016-03-25 11:52:30 -04:00
Rob Rix	acc7cd3ce8	Align trailing context asymmetrically.	2016-03-25 00:26:33 -04:00