6555 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rick Winfrey	acf2fc85a6	Add weekly summary for 05-31-2016	2016-05-31 10:50:06 -05:00
Rob Rix	f9d5f93fb5	Merge pull request #558 from github/alignment-docs ... [RFC] Document the alignment problem & proposed solutions	2016-05-27 17:35:49 -04:00
Rob Rix	d21bfc440d	Merge branch 'master' into alignment-docs	2016-05-27 17:32:06 -04:00
Josh Vera	85b47695f5	Merge pull request #524 from github/cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly ... Align diffs in a tree	2016-05-27 17:21:01 -04:00
joshvera	ecd5efb3fa	Factor hylos out to alignSyntax	2016-05-27 17:09:22 -04:00
joshvera	2340014641	Factor case statement to intersectionsWithHeadRanges in alignChildren	2016-05-27 16:56:35 -04:00
joshvera	e754bc767e	Cleanup alignBranch a bit	2016-05-27 16:51:06 -04:00
joshvera	99424790b3	Move bothRanges to where clause	2016-05-27 16:24:18 -04:00
joshvera	100a2ad879	format numberRows	2016-05-27 16:17:44 -04:00
Rob Rix	1f29cd84a3	📝 alignDiff/alignPatch.	2016-05-27 15:48:32 -04:00
Rob Rix	44be4bdbae	🔥 AlignedDiff.	2016-05-27 15:48:24 -04:00
Rob Rix	5c25f09e16	🔥 Union.	2016-05-27 15:44:58 -04:00
Rob Rix	86e8e06a50	🔥 redundant imports.	2016-05-27 15:44:51 -04:00
Rob Rix	7b4e71293e	🔥 unionThese.	2016-05-27 15:44:08 -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	df927cb9d4	📝 unionThese.	2016-05-27 15:34:35 -04:00
Rob Rix	0becb4205f	We’ve captured these in tests.	2016-05-27 15:33:16 -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	2cdb5dded4	Ignore .html files in UI.	2016-05-27 15:26:53 -04:00
Rob Rix	73a455305d	Disable logging on exhausted ranges w/ remaining children.	2016-05-27 15:17:41 -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	e37fe0dee9	Render JS with predictable ordering.	2016-05-27 14:49:28 -04:00
Rob Rix	e1680f85b0	Revert "Revert "Revert "Correct the computation of range intersection.""" ... This reverts commit d90ebc2d0bc2fdca281b827c903086be1f7abdbd.	2016-05-27 14:33:57 -04:00
Rob Rix	81fd09ae25	Revert "Revert "Correct the computation of range intersection."" ... This reverts commit 02bcb272e36a62a90c099af22add47c69160e941.	2016-05-27 14:27:50 -04:00
Rob Rix	1cb7946cb0	Revert "Correct the computation of range intersection." ... This reverts commit 988914aefb3a89676cecbbe1654370c08f886be0.	2016-05-27 14:24:36 -04:00
Rob Rix	835f38bdf8	Correct the computation of range intersection.	2016-05-27 14:22:45 -04:00
Rob Rix	ccd45ccecb	Print out the remaining children.	2016-05-27 14:17:42 -04:00
Rob Rix	f60faefee5	🔥 a redundant import of Identity.	2016-05-27 14:05:29 -04:00
Rob Rix	e725b6d43e	🔥 some redundant imports & list what we’re using in some others.	2016-05-27 14:02:37 -04:00
Rob Rix	82d1321a79	🔥 intersectsAnyLine.	2016-05-27 13:59:15 -04:00
Rob Rix	225e5fcd53	🔥 intersectsFirstLine.	2016-05-27 13:59:05 -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	5fd5cca3c5	This was never supposed to have been committed.	2016-05-27 13:17:09 -04:00
Rob Rix	7a7ed3d665	Revert "🔥 intersectsAnyLine." ... This reverts commit 4d41816d73af05ef46334d579b203ca99976ec2b.	2016-05-27 13:08:23 -04:00
Rob Rix	87ce5de22f	Revert "Add a function to merge This/That into These at the head of a list." ... This reverts commit 3af1f3f080a5ce725b79b6120cb639e8a3a35e80.	2016-05-27 13:07:46 -04:00
Rob Rix	2e77455195	Expect a Show instance for the leaf type everywhere.	2016-05-27 13:07:32 -04:00
Rob Rix	615cfe6006	Add a function to merge This/That into These at the head of a list.	2016-05-27 13:05:47 -04:00
Rob Rix	10b4e072b0	Use pure to construct the starting rows.	2016-05-27 13:03:49 -04:00
Rob Rix	658ceb24f1	🔥 headRangesOf.	2016-05-27 11:00:43 -04:00
Rob Rix	2cfea45fd1	🔥 advancePast.	2016-05-27 11:00:21 -04:00
Rob Rix	c03f32f9c8	🔥 lineAndRemainingWhere.	2016-05-27 11:00:05 -04:00