github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-28 17:32:05 +03:00
Code Issues Projects Releases Wiki Activity
7,027 Commits 19 Branches 16 Tags 46 MiB
4eebbb288c
Commit Graph

685 Commits

Author SHA1 Message Date
joshvera
9973343364 Map dictionary literals to objects 2016-06-28 16:38:06 -04:00
joshvera
0b664ef68e cleanup hlint warnings 2016-06-23 17:47:01 -04:00
joshvera
0a574871c9 Merge remote-tracking branch 'origin/master' into syntax-redux 2016-06-21 17:08:40 -04:00
Rob Rix
87552e0ecb Generalize Alignment over annotations with ranges. 2016-06-17 14:07:35 -04:00
Rob Rix
0969e20f39 Generalize hasChanges to arbitrary annotations. 2016-06-17 14:05:38 -04:00
Rob Rix
37b59c89d7 Use the setter functions to update Info. 2016-06-17 13:28:35 -04:00
Rob Rix
e8c165fb15 Use mappend instead of ++. 2016-06-17 11:29:27 -04:00
joshvera
8bb9f23035 Add VarDecl/VarAssignment/Switch/Case cases to alignSyntax 2016-06-16 16:35:52 -07:00
joshvera
4b52268f94 Add Assignment, MemberAccess, MethodCall, Args cases to alignSyntax 2016-06-14 11:27:48 -07:00
joshvera
d20937f2b1 Parse functions 2016-06-10 15:10:37 -04:00
joshvera
4257f7a46f Add a Function case to alignSyntax 2016-06-10 13:34:19 -04:00
Rick Winfrey
43def99532 Add FunctionCall case to alignSyntax 2016-06-08 17:06:35 -05:00
Rob Rix
0fa2a40cfb 🔥 some redundant parens. 2016-06-01 21:37:38 -04:00
Rob Rix
b7e724effd Sort the produced children by range. 2016-05-30 19:21:06 -04:00
joshvera
ecd5efb3fa Factor hylos out to alignSyntax 2016-05-27 17:09:22 -04:00
joshvera
2340014641 Factor case statement to intersectionsWithHeadRanges in alignChildren 2016-05-27 16:56:35 -04:00
joshvera
e754bc767e Cleanup alignBranch a bit 2016-05-27 16:51:06 -04:00
joshvera
99424790b3 Move bothRanges to where clause 2016-05-27 16:24:18 -04:00
joshvera
100a2ad879 format numberRows 2016-05-27 16:17:44 -04:00
Rob Rix
1f29cd84a3 📝 alignDiff/alignPatch. 2016-05-27 15:48:32 -04:00
Rob Rix
44be4bdbae 🔥 AlignedDiff. 2016-05-27 15:48:24 -04:00
Rob Rix
5c25f09e16 🔥 Union. 2016-05-27 15:44:58 -04:00
Rob Rix
7b4e71293e 🔥 unionThese. 2016-05-27 15:44:08 -04:00
Rob Rix
df927cb9d4 📝 unionThese. 2016-05-27 15:34:35 -04:00
Rob Rix
0becb4205f We’ve captured these in tests. 2016-05-27 15:33:16 -04:00
Rob Rix
73a455305d Disable logging on exhausted ranges w/ remaining children. 2016-05-27 15:17:41 -04:00
Rob Rix
ccd45ccecb Print out the remaining children. 2016-05-27 14:17:42 -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
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
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
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