github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 14:21:31 +03:00
Code Issues Projects Releases Wiki Activity
5,974 Commits 19 Branches 16 Tags 46 MiB
df898f3489
Commit Graph

5974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
joshvera
928087e1f5 🔥 2016-04-04 17:38:58 -04:00
Rob Rix
f095c455a6 Merge branch 'master' into async 2016-04-04 17:31:05 -04:00
Rob Rix
06dd79dc76 Align patches. 2016-04-04 17:26:40 -04:00
Rob Rix
0132f180ed 🔥 an extra commented-out line. 2016-04-04 17:20:54 -04:00
joshvera
a553709112 Specialize Renderer to Text 2016-04-04 17:20:26 -04:00
Rob Rix
84fc0a54a9 Implement alignPatch over Delete/Insert. 2016-04-04 17:20:21 -04:00
Rob Rix
881d902d3c Abstract alignSyntax over an Applicative instance. 
This involves the use of a function which maps that functor into `Join
These`.
 2016-04-04 17:18:29 -04:00
joshvera
3b752b834c docs 2016-04-04 17:12:55 -04:00
joshvera
90013b1235 Rename printDiff to textDiff and printDiff' to printDiff 2016-04-04 17:08:29 -04:00
joshvera
506abacbc6 Document use of strictness in diffFiles 2016-04-04 17:03:35 -04:00
Rob Rix
c9fb18f128 🔥 the commented-out alignTerm. 2016-04-04 16:43:57 -04:00