github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-28 01:47:01 +03:00
Code Issues Projects Releases Wiki Activity
6,555 Commits 19 Branches 16 Tags 46 MiB
acf2fc85a6
Commit Graph

6555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rob Rix
509ef96938 Pull out the line and advance past it alone. 2016-05-26 16:21:53 -04:00
Rob Rix
0b00a34242 Return the next ranges from linesOf. 2016-05-26 16:18:16 -04:00
Rob Rix
c0e54c56f4 Fail fast on no children, too. 2016-05-26 16:05:12 -04:00
Rob Rix
4b2a010e3e Fail fast when we have no ranges. 2016-05-26 16:04:09 -04:00
Rob Rix
f3804160f9 Add traceShowId to Prologue. 2016-05-26 16:02:45 -04:00
Rob Rix
2931045cb3 Reformat the header. 2016-05-26 16:02:35 -04:00
Rob Rix
d148286cc0 Skip empty children. 2016-05-26 15:41:26 -04:00
Rob Rix
67ca56b093 Merge pull request #564 from github/diff-summaries 
Diff summaries
 2016-05-26 15:31:37 -04:00
Rob Rix
cfe15a5afa Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly 
# Conflicts:
#	src/Alignment.hs
#	src/Control/Comonad/Cofree.hs
#	src/Data/Adjoined.hs
#	src/Data/Align.hs
#	src/Data/Bifunctor/These.hs
#	src/Data/Coalescent.hs
#	src/Data/Copointed.hs
#	src/Data/Functor/Both.hs
#	src/Data/Option.hs
#	src/Line.hs
#	src/Patch.hs
#	src/Range.hs
#	src/Renderer/JSON.hs
#	src/Renderer/Patch.hs
#	src/Renderer/Split.hs
#	src/SplitDiff.hs
#	stack.yaml
#	test/AlignmentSpec.hs
#	test/CorpusSpec.hs
#	test/Data/Adjoined/Spec.hs
#	test/Data/Functor/Both/Spec.hs
 2016-05-26 15:25:45 -04:00
Rob Rix
69fd24c415 Temporarily commit a tracing log about exhausting the ranges with children still remaining. 2016-05-26 14:58:20 -04:00
Rob Rix
2801949859 Add a function computing the lines of all children intersecting given ranges. 2016-05-26 14:57:51 -04:00
joshvera
b3842692cd s/return/pure 2016-05-26 14:57:17 -04:00
Rob Rix
e5506b278f advancePast takes a list of lines to advance past. 2016-05-26 14:56:53 -04:00
joshvera
e3559641ff s/headF.runCofree/extract 2016-05-26 14:55:46 -04:00
joshvera
25be443f8a s/free . Pure/pure 2016-05-26 14:54:47 -04:00
joshvera
500b751503 Add use pure and use extract cases to HLint 2016-05-26 14:53:12 -04:00
Rob Rix
d1ccd93002 Extract advancePast to the top level. 2016-05-26 14:49:57 -04:00
joshvera
a2c76a0ddc fmap toCategoryName . toCategory over the head of children 2016-05-26 14:49:47 -04:00
Rob Rix
281b65e70a Extract a function to compute the head ranges of a pair of lists of ranges. 2016-05-26 14:49:41 -04:00
Josh Vera
b735d08c5a Merge branch 'master' into diff-summaries 2016-05-26 14:47:03 -04:00
joshvera
9d9fbe3c37 🔥 annotate and unfix 2016-05-26 14:46:13 -04:00
joshvera
1245f3361a We just say extract 2016-05-26 14:08:26 -04:00
joshvera
aeb747179f Remove Annotated 2016-05-26 14:05:25 -04:00
joshvera
ebd5d20171 Remove duplicate imports 2016-05-26 14:04:27 -04:00
joshvera
b1f9cc4a4a Remove DiffF type synonym 2016-05-26 13:46:33 -04:00
joshvera
2f761fc38b Remove split dependency 2016-05-26 13:44:17 -04:00
joshvera
473ec980b1 Merge remote-tracking branch 'origin/master' into diff-summaries 2016-05-26 13:40:54 -04:00
Rob Rix
3e7982e796 Merge pull request #568 from github/protolude 
Use a custom Prelude
 2016-05-26 13:24:22 -04:00
Josh Vera
b19b79bfa3 Merge branch 'master' into protolude 2016-05-26 13:14:15 -04:00