1
1
mirror of https://github.com/github/semantic.git synced 2024-12-28 17:32:05 +03:00
Commit Graph

501 Commits

Author SHA1 Message Date
Rob Rix
012425b11a Move intersectsRange to Range. 2016-04-15 09:34:34 -04:00
Rob Rix
e0f6c2ae2d splitThese returns its results in Maybe.
The uses of fromJust are as bad as the use of head, unfortunately.
2016-04-15 09:33:30 -04:00
Rob Rix
88d6fc08d4 Rename split → splitThese. 2016-04-15 09:31:43 -04:00
Rob Rix
940ad0ac82 📝 split. 2016-04-15 09:31:28 -04:00
Rob Rix
c585ca95d6 📝 modifyJoin. 2016-04-15 09:30:20 -04:00
Rob Rix
5e5e9fe7c8 🔥 the separate apThese function. 2016-04-15 09:29:23 -04:00
Rob Rix
8b3833b7ff 📝 Union. 2016-04-15 09:27:41 -04:00
Rob Rix
7ceaea76c8 Group the instances at the bottom. 2016-04-15 09:26:16 -04:00
Rob Rix
056b9647e8 🔥 Row. 2016-04-15 09:25:27 -04:00
Rob Rix
d7ed0bc74d Move the Union newtype up. 2016-04-15 09:23:41 -04:00
Rob Rix
ac26367e2d Rephrase the advance function in terms of catThese. 2016-04-14 22:23:26 -04:00
Rob Rix
a61d847705 Replace Data.Bifunctor.These and Data.Align with the these package. 2016-04-14 22:00:00 -04:00
Rob Rix
84abff8773 Move the extras atop These into Alignment. 2016-04-14 21:47:18 -04:00
Rob Rix
6662deac2b 🔥 the old split… code paths. 2016-04-14 21:16:10 -04:00
Rob Rix
3235cfee3a Define renderers in terms of alignDiff. 2016-04-14 21:16:02 -04:00
Rob Rix
7c63e92ea7 Construct SplitPatches. 2016-04-14 20:27:24 -04:00
Rob Rix
3e1072f714 Use record syntax to update info. 2016-04-14 19:40:49 -04:00
Rob Rix
0142a54dcf Move the getRange function to SplitDiff. 2016-04-14 18:36:09 -04:00
Rob Rix
c955c94729 Move alignDiff up. 2016-04-14 17:03:53 -04:00
Rob Rix
ad4d1ab9e4 Pair with the ranges appropriate for the intersecting elements.
This is gross.
2016-04-14 16:34:49 -04:00
Rob Rix
8052414634 Parens I guess. 2016-04-14 13:31:07 -04:00
Rob Rix
919fab9053 Reformat alignChildrenInRanges for less indentation. 2016-04-14 13:19:18 -04:00
Rob Rix
23cca50048 Rename group2 to alignChildrenInRanges. 2016-04-14 13:18:19 -04:00
Rob Rix
ce33d56086 🔥 a redundant blank line. 2016-04-14 13:15:27 -04:00
Rob Rix
e3ace6408c Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
#	test/AlignmentSpec.hs
#	test/PatchOutputSpec.hs
2016-04-14 12:57:45 -04:00
Rob Rix
8c9a9c7586 🔥 mask. 2016-04-14 12:46:25 -04:00
Rob Rix
1656f93f65 🔥 spanThese. 2016-04-14 12:46:05 -04:00
Rob Rix
8a781d0edf 🔥 unconsThese. 2016-04-14 12:16:45 -04:00
Rob Rix
5a80999a1f Rearrange/rename the bindings a little. 2016-04-14 12:13:41 -04:00
Rob Rix
e5a3683c72 Implement applyThese in terms of apThese. 2016-04-14 12:08:37 -04:00
Rob Rix
17728c5f6d Implement catThese in terms of Union. 2016-04-14 12:05:52 -04:00
Rob Rix
ec4ff0cf14 Use catThese to merge lines. 2016-04-14 11:54:58 -04:00
Rob Rix
df898f3489 Rename mergeThese to catThese. 2016-04-14 11:54:50 -04:00
Rob Rix
282a993651 Add a mergeThese function to concatenate [Join These a] into Join These [a]. 2016-04-14 09:59:46 -04:00
Rob Rix
fcaa498033 Use sequenceL to invert the embedding of Join These (Maybe a) to Maybe (Join These a) 2016-04-14 09:50:44 -04:00
Rob Rix
345ac1b38a Use maybeThese to avoid the need for unconsThese. 2016-04-14 09:40:49 -04:00
Rob Rix
0867ae807f Implement group2 in terms of spanAndSplitLines. 2016-04-13 16:06:11 -04:00
Rob Rix
2ac2f6e5c9 Handle the empty case. 2016-04-13 16:05:56 -04:00
Rob Rix
0ea6286197 Split the body of spanAndSplitFirstLines onto a newline and dedent. 2016-04-13 16:05:48 -04:00
Rob Rix
b8bc77bb7f Return the heads/tails of children paired. 2016-04-13 11:47:35 -04:00
Rob Rix
747bfbf454 Return a list of nonintersecting children too. 2016-04-13 11:41:49 -04:00
Rob Rix
de05043c67 Span and split the intersecting first lines. 2016-04-13 11:08:01 -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
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
71e8454fb4 Add a size field to Info. 2016-04-11 15:02:58 -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