github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 22:31:36 +03:00
Code Issues Projects Releases Wiki Activity
6,834 Commits 19 Branches 16 Tags 46 MiB
086466ab88
Commit Graph

6834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rob Rix
ac209ea61f Handle left/right asymmetrical children separately. 2016-05-27 10:59:40 -04:00
Rob Rix
f9fe3afc7c Fix indentation. 2016-05-27 10:38:20 -04:00
Rob Rix
6dc06d11a2 🔥 intersectsAnyLine. 2016-05-27 10:29:42 -04:00
Rob Rix
5efcf63846 Use applyToBoth to tidy up intersects considerably. 2016-05-27 10:25:05 -04:00
Rob Rix
6b211ac8bb Use applyToBoth to eliminate a fromJust. 2016-05-27 10:23:38 -04:00
Rob Rix
5dd24a96ea Define fixity and precedence for applyToBoth. 2016-05-27 10:22:51 -04:00
Rob Rix
41d532dd2d Add an applyToBoth function. 2016-05-27 10:22:24 -04:00
Rob Rix
55d952c4c1 Avoid fromJust. 2016-05-27 10:10:58 -04:00
Rob Rix
c67150bb49 Use intersectsFirstLine in alignBranch. 2016-05-27 10:08:41 -04:00
Rob Rix
835f734100 Use intersectsFirstLine in alignChildren. 2016-05-27 10:07:45 -04:00
Rob Rix
0c06abbe4d Add intersectsFirstLine back in. 2016-05-27 10:07:32 -04:00
Rob Rix
9e69f251b6 Annotate with an operator section. 2016-05-27 09:40:02 -04:00
Rob Rix
0850d91d50 Wrapping equal terms into diffs is really svelte now. 2016-05-27 09:38:54 -04:00
Rob Rix
ebefc1c124 🔥 a redundant import. 2016-05-27 09:36:36 -04:00
Rob Rix
de6d7edec2 Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly 
# Conflicts:
#	semantic-diff.cabal
#	src/Alignment.hs
#	src/Control/Comonad/Cofree.hs
#	src/Data/Adjoined.hs
#	src/Diffing.hs
#	src/Interpreter.hs
#	src/Prologue.hs
#	src/Renderer/JSON.hs
#	src/Renderer/Patch.hs
#	src/Renderer/Split.hs
#	src/SplitDiff.hs
#	src/Term.hs
#	test/AlignmentSpec.hs
#	test/ArbitraryTerm.hs
#	test/PatchOutputSpec.hs
 2016-05-27 09:35:26 -04:00
Rob Rix
bcbc28937b Extract intersectsAnyLine to the top level. 2016-05-26 19:18:11 -04:00
Rob Rix
0925285816 Test whether any line intersects. 2016-05-26 19:14:27 -04:00
Rob Rix
da8a911142 🔥 linesOf. 2016-05-26 19:14:17 -04:00
Rob Rix
e72cbd1f60 Revert "Call into linesOf for symmetrically intersecting children." 
This reverts commit fc767f00cd8bed7769873b75cd73d2ca2d7edd89.
 2016-05-26 16:33:12 -04:00
Rob Rix
606cd3abef Call into linesOf for symmetrically intersecting children. 2016-05-26 16:33:08 -04:00
Rob Rix
9daf310d73 Return the children from linesOf. 2016-05-26 16:32:50 -04:00