1
1
mirror of https://github.com/github/semantic.git synced 2024-12-29 09:55:52 +03:00
Commit Graph

6212 Commits

Author SHA1 Message Date
Rob Rix
d166581f37 Handle the degenerate case of intersects. 2016-05-13 16:52:42 -04:00
Rob Rix
8fecee4b83 We don’t use the nonintersecting children. 2016-05-13 16:52:10 -04:00
Rob Rix
2da3548b8b Stub in the asymmetrical/symmetrical alignment choice. 2016-05-13 16:51:50 -04:00
Rob Rix
d351fb5497 Handle the case where no children intersect on either side. 2016-05-13 16:46:53 -04:00
Rob Rix
3357dc5f82 Stub in an alignBranch function. 2016-05-13 16:40:46 -04:00
Rob Rix
df043b52b8 Stub in some type synonyms. 2016-05-13 16:40:38 -04:00
Rob Rix
8862fc35c1 Write down some properties we’d like to hold. 2016-05-13 16:40:18 -04:00
Rob Rix
b9673bb0ee Write down some overall behaviours we expect. 2016-05-13 16:40:10 -04:00
Rob Rix
7a4f2b98c8 Write down some notes about alignSyntax. 2016-05-13 16:39:48 -04:00
Rob Rix
bdd03bb122 For now, children should be aligned at a higher priority than their parents.
This came out of https://github.com/github/semantic-diff/pull/558.
2016-05-13 10:51:52 -04:00
Rob Rix
d461053e71 Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly 2016-05-13 10:47:06 -04:00
Rob Rix
0c2ef09372 Merge pull request #555 from github/vendor-test-repos
Mark the test repos as vendored.
2016-05-03 13:51:59 -04:00
Rob Rix
1e5a16420c Merge branch 'master' into vendor-test-repos 2016-05-03 13:50:59 -04:00
Rob Rix
5e5cc504bf Mark the test repos as vendored. 2016-05-03 13:49:40 -04:00
Rob Rix
c92f000b3d Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly 2016-04-27 20:10:08 -04:00
Rob Rix
e70a50720c alignChildrenInRanges always exhausts its inputs, so call it instead. 2016-04-27 17:44:15 -04:00
Rob Rix
97e4229f1b Use record syntax to update the info. 2016-04-27 13:55:02 -04:00
Rob Rix
9aa7ca9d04 Extract contentElements to the top level. 2016-04-27 13:20:01 -04:00
Rob Rix
7369b7905f Extract markupForContextAndChild to the top level. 2016-04-27 13:19:11 -04:00
Rob Rix
a01be5a419 Annotate the type of contentElements. 2016-04-27 13:18:06 -04:00
Rob Rix
43f59f0390 Simplify wrapIn’s type annotation. 2016-04-27 13:17:21 -04:00
Rob Rix
0ebffeb26a Extract wrapIn to the top level. 2016-04-27 13:16:16 -04:00
Rob Rix
679a491ebc Correct the newline-at-eof fixture. 2016-04-27 10:38:02 -04:00
Rob Rix
d7ca3a3eb6 Correct and move the jquery fixture from the todo list to the done list. 2016-04-27 10:33:08 -04:00
Rob Rix
a70ee70b17 Move the no-newline-at-eof JSON fixture to the done list. 2016-04-27 10:30:17 -04:00
Rob Rix
f8dc8f61f9 Correct (I think) the no-newline-at-eof JSON fixture. 2016-04-27 10:26:54 -04:00
Rob Rix
556498e8d2 Move the no-newline-at-eof split fixture to the done list. 2016-04-27 10:12:15 -04:00
Rob Rix
1b5f92bfc8 Correct the no-newline-at-eof split fixture. 2016-04-27 10:11:43 -04:00
Rob Rix
07a55df18b Move the reformat fixture from todo to done 🎉 2016-04-27 10:07:57 -04:00
Rob Rix
9eb7d0f552 Correct the reformatted fixture. 2016-04-27 10:07:03 -04:00
Rob Rix
52970b5bca Terminate with semicolons to work around a parser bug. 2016-04-27 10:06:28 -04:00
Rob Rix
dbfb52776b Remove the newlines from the reformatted fixture. 2016-04-27 10:03:58 -04:00
Rob Rix
7413c72876 Count up in Both.
This is clunkier, but as @rachelmyers pointed out, it avoids the need
to reason on `increment` case-by-case.

For the same reason, it avoids the possibility of maintenance changing
`increment` in such a way that the selection of `first`/`second` falls
out of sync with the pattern being matched on; thus, it’s more
resilient to change.
2016-04-26 17:36:00 -04:00
Rob Rix
13d23e8d2d Parens, not $. 2016-04-26 16:31:39 -04:00
Rob Rix
25f25c3fcb Apply the increment function. 2016-04-26 16:31:33 -04:00
Rob Rix
808cf59fe5 Add a function to increment only the side we have a line on. 2016-04-26 16:30:57 -04:00
Rob Rix
9c008f1116 Add a (failing) test that numberedRows produces the correct counts. 2016-04-26 15:44:11 -04:00
Rob Rix
64dd8d93da Add a function to get the counts of numbered rows. 2016-04-26 14:54:24 -04:00
Rob Rix
3ad8fb3b8a Sort the imports. 2016-04-26 14:53:50 -04:00
Rob Rix
28aeb9f4fa Operator section. 2016-04-26 14:20:02 -04:00
Rob Rix
d58123d208 fmap, not liftM. 2016-04-26 14:18:59 -04:00
Rob Rix
5a2925b016 Add an Arbitrary instance over Join These. 2016-04-26 14:17:43 -04:00
Rob Rix
ea8626b9db Shrink These. 2016-04-26 14:17:36 -04:00
Rob Rix
b64a67128c Add an Arbitrary instance over These. 2016-04-26 14:14:31 -04:00
Rob Rix
64026caa06 🔥 runBoth. 2016-04-25 16:07:52 -04:00
Rob Rix
d5575fb999 🔥 pairWithThese. 2016-04-25 15:27:50 -04:00
Rob Rix
b0ed956779 🔥 maybeBothOfThese. 2016-04-25 15:24:46 -04:00
Rob Rix
3366b94b5a Simplify showLine a little further. 2016-04-25 15:08:20 -04:00
Rob Rix
ce9be615a6 Turn the bind around. 2016-04-25 15:04:55 -04:00
Rob Rix
632d2cf86b Simplify padding. 2016-04-25 15:03:49 -04:00