joshvera
|
bfe57829d6
|
Merge remote-tracking branch 'origin/master' into rws-large-diffs
|
2016-09-27 10:34:19 -04:00 |
|
Rob Rix
|
38d6bbe644
|
Merge branch 'master' into ghc8
|
2016-09-17 20:45:58 -04:00 |
|
joshvera
|
16aae4d95d
|
Move a few declarations into Prologue
|
2016-09-16 10:14:51 -04:00 |
|
Rob Rix
|
62196878fa
|
Merge branch 'master' into ghc8
# Conflicts:
# semantic-diff.cabal
# src/Diff.hs
# src/Term.hs
# src/Term/Arbitrary.hs
# stack.yaml
# tools/semantic-git-diff/src/SemanticDiff.hs
|
2016-09-14 16:12:47 -04:00 |
|
Rob Rix
|
953bf3ba58
|
Stop hiding ++ , Source doesn’t export it any more.
|
2016-09-13 15:09:55 -04:00 |
|
Rob Rix
|
2b933904c9
|
Add specializations of Term/TermF/Diff/DiffF/SplitDiff over Syntax/Record.
|
2016-09-12 13:40:22 -04:00 |
|
Rob Rix
|
98637ad656
|
Generalize Term/TermF & Diff/DiffF over the functor.
|
2016-09-09 14:46:50 -04:00 |
|
Rick Winfrey
|
60d10c483e
|
Disambiguate between Syntax Comment and Category Comment
|
2016-08-16 13:08:55 -05:00 |
|
Rob Rix
|
7435e9069c
|
Wrap all the branch cases but Fixed in Indexed.
|
2016-07-26 03:50:13 -04:00 |
|
Rob Rix
|
b95cadd9a8
|
Factor catMaybes out of the alignment cases.
|
2016-07-22 18:43:16 -04:00 |
|
Rob Rix
|
a495f143aa
|
Align leaves and comments through alignBranch.
|
2016-07-22 18:42:31 -04:00 |
|
joshvera
|
819470afea
|
use biseuqnceL for comments
|
2016-07-22 12:55:54 -04:00 |
|
joshvera
|
b27eac56d9
|
Merge remote-tracking branch 'origin/master' into syntax-redux
|
2016-07-22 12:38:34 -04:00 |
|
joshvera
|
70f9329f1a
|
Merge remote-tracking branch 'origin/master' into syntax-redux
|
2016-07-22 12:36:03 -04:00 |
|
Rob Rix
|
041aea8f4c
|
🔥 the orphan Crosswalk instance over Join of Bicrosswalkable bifunctors.
|
2016-07-22 11:42:00 -04:00 |
|
Rob Rix
|
d8f8b50cb9
|
Compute Leaf alignment using the Bicrosswalk instance.
|
2016-07-22 11:41:45 -04:00 |
|
Rob Rix
|
4f8ef622aa
|
Use the Bicrosswalk instance directly.
|
2016-07-22 11:39:30 -04:00 |
|
Rob Rix
|
cd19193471
|
Avoid requiring Show instances everywhere.
|
2016-07-14 15:59:23 -04:00 |
|
joshvera
|
27c338331f
|
Merge remote-tracking branch 'origin/master' into syntax-redux
|
2016-07-14 15:22:46 -04:00 |
|
Rob Rix
|
2826a7948a
|
🔥 a redundant definition.
|
2016-07-14 14:07:33 -04:00 |
|
Rob Rix
|
b9b0bda2bd
|
🔥 a redundant import.
|
2016-07-14 14:07:22 -04:00 |
|
Rob Rix
|
2a85ef7668
|
Placate hlint.
|
2016-07-14 14:07:15 -04:00 |
|
Rob Rix
|
bc05e694a3
|
🔥 Keyed syntax nodes.
|
2016-07-12 23:27:09 -04:00 |
|
joshvera
|
28457049f2
|
Add some vertical space to ease debugging
|
2016-07-08 15:19:43 -04:00 |
|
joshvera
|
73afe7d1e9
|
Add zipTerms to Pairs
|
2016-07-08 13:16:06 -04:00 |
|
joshvera
|
8c3fc4b0b3
|
Align comments, pairs, and Commented terms
|
2016-07-08 11:47:39 -04:00 |
|
joshvera
|
99b05ebdc1
|
Object takes a list of f now
|
2016-07-08 11:17:46 -04:00 |
|
joshvera
|
1efd68d122
|
Merge remote-tracking branch 'origin/master' into syntax-redux
|
2016-07-06 16:22:25 -04:00 |
|
joshvera
|
4d2716c5a4
|
Add Ternary/Operator/MathAssignment/SubscriptAccess to Alignment
|
2016-07-06 12:38:47 -04:00 |
|
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 |
|
Rob Rix
|
b604ddd446
|
FlexibleContexts all the things.
|
2016-06-23 16:19:51 -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 |
|