github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 06:11:49 +03:00
Code Issues Projects Releases Wiki Activity
6,143 Commits 19 Branches 16 Tags 46 MiB
1fb647ae9d
Commit Graph

6143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Rix
ee91e6daef 🔥 the Coalescent instance over Both (Line a). 2016-04-14 21:23:21 -04:00
Rob Rix
a93a99caa2 Move maybeFst/maybeSnd into Patch. 2016-04-14 21:19:21 -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
593ea842e0 Move maybeFirst into Renderer.Split. 2016-04-14 20:31:59 -04:00
Rob Rix
3662b021df Correct the test of insertion patch alignment. 2016-04-14 20:31:03 -04:00
Rob Rix
7c63e92ea7 Construct SplitPatches. 2016-04-14 20:27:24 -04:00
Rob Rix
631496062f 🔥 setCharacterRange. 2016-04-14 19:42:14 -04:00
Rob Rix
3e1072f714 Use record syntax to update info. 2016-04-14 19:40:49 -04:00
Rob Rix
e5dd029b10 Test that insertions are aligned. 2016-04-14 19:40:36 -04:00
Rob Rix
75bda340ef Sort the Data.Functor.Identity import. 2016-04-14 19:34:59 -04:00
Rob Rix
0142a54dcf Move the getRange function to SplitDiff. 2016-04-14 18:36:09 -04:00
Rob Rix
1c9e5d9087 🔥 tests of splitDiffByLines. 2016-04-14 18:31:03 -04:00
Rob Rix
2564034b6d 🔥 tests of splitAbstractedTerm. 2016-04-14 18:30:52 -04:00
Rob Rix
97da08d935 Add a mergeThese function. 2016-04-14 18:25:54 -04:00
Rob Rix
c955c94729 Move alignDiff up. 2016-04-14 17:03:53 -04:00
Rob Rix
b7627ca4cc Revert "Add an Intersection newtype wrapping These." 
This reverts commit 4de08172ae4172f865db558fae28dc5753cdd1a4.
 2016-04-14 16:38:47 -04:00
Rob Rix
fd4d1a66ac Revert "Add a Monoid instance over Intersection." 
This reverts commit fee81dc54f0336f4c07267726d74543f01b50b9f.
 2016-04-14 16:38:43 -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
3d3462b98a Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly 2016-04-14 15:04:23 -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
c547f4e13d Add a Monoid instance over Intersection. 2016-04-14 12:05:44 -04:00
Rob Rix
ddb1898b39 Add an Intersection newtype wrapping These. 2016-04-14 12:05:38 -04:00
Rob Rix
cde4b78196 Add a Monoid instance over Union. 2016-04-14 12:05:30 -04:00
Rob Rix
9f835dbd04 Add a Union type wrapping These. 2016-04-14 12:05:21 -04:00
Rob Rix
19b6b1fc1d Document apThese. 2016-04-14 12:04:37 -04:00
Rob Rix
50beaefa99 Add an apThese function. 2016-04-14 12:04:33 -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
9a24a431da Revert "Revert "Add a maybeThese function to simplify constructing These from Maybes."" 
This reverts commit 5b69bfee53882ecb049831e1b04659766a234e27.
 2016-04-14 10:53:43 -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
4fa1067611 Revert "Add a maybeThese function to simplify constructing These from Maybes." 
This reverts commit 0893da5b7fb31bde527d3580e6daa04db5f7df3c.
 2016-04-14 09:50:52 -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
02db765b49 Add a maybeThese function to simplify constructing These from Maybes. 2016-04-14 09:33:22 -04:00
Rob Rix
b8da3f06cf Add a Crosswalk instance over []. 2016-04-13 16:24:03 -04:00
Rob Rix
ba9fd58724 Define the Crosswalk instance for Join These in terms of on. 2016-04-13 16:21:29 -04:00
Rob Rix
156c8820e6 Add a Bitraversable instance over These. 2016-04-13 16:15:42 -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