github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-27 17:05:33 +03:00
Code Issues Projects Releases Wiki Activity
11,883 Commits 19 Branches 16 Tags 46 MiB
4975dc61fe
Commit Graph

659 Commits

Author SHA1 Message Date
Timothy Clem
437522f5e1 Remove need for Params syntax 2016-11-04 13:05:28 -07:00
Timothy Clem
c02c32ac7c Back to a single Rescue syntax 2016-11-04 12:29:02 -07:00
Rick Winfrey
741e34a16b Add type annotation 2016-11-03 16:50:11 -05:00
Timothy Clem
c6856025f3 Add params syntax to JSON 2016-11-03 14:37:40 -07:00
Timothy Clem
769413813c Better begin and method declaration parsing and summaries 2016-11-03 14:24:05 -07:00
Timothy Clem
452d795ddd Merge remote-tracking branch 'origin/master' into more-ruby-parsing 2016-11-03 09:26:35 -07:00
Timothy Clem
4daf39476e Parse rescue modifiers 2016-11-03 09:23:35 -07:00
Timothy Clem
18c7914216 Match Rescue syntax in JSON renderer 2016-11-02 17:23:28 -07:00
Timothy Clem
a98185f1a6 Rescue blocks in all their glory 2016-11-02 17:18:09 -07:00
joshvera
0d58e97070 Merge remote-tracking branch 'origin/master' into go-parser 2016-11-02 15:25:50 -04:00
joshvera
23b91cf097 add missing cases 2016-11-02 10:54:13 -04:00
Rick Winfrey
1cd998ff88 Merge branch 'master' into syntax-term-to-json 2016-11-01 17:58:15 -05:00
Rick Winfrey
f1b92d9a9e Revert JSONSyntaxTerm back to ToJSON instance 2016-11-01 16:39:33 -05:00
Rick Winfrey
9168795a1d Add newtype JSONSyntaxTerm ToJSON instance 2016-11-01 15:02:26 -05:00
Timothy Clem
6cac25d2a9 Merge remote-tracking branch 'origin/master' into ruby 2016-11-01 08:50:54 -07:00
Rick Winfrey
582e7ce978 Remove NamespaceImport Category (unrelated change) 2016-11-01 10:09:05 -05:00
Rick Winfrey
aa724c4159 Preserve original type class constraint order 2016-10-28 07:56:26 -05:00
Rick Winfrey
3a073a2849 Add NamespaceImport category to Split Renderer 2016-10-26 17:13:29 -05:00
Timothy Clem
5dd53c0b93 if/unless modifiers and (sort of) unless statements 2016-10-26 14:49:51 -07:00
Timothy Clem
3bbfb765a5 Parse if, with some caveats 2016-10-26 14:32:08 -07:00
Timothy Clem
013f6392ff Parse while and until statements and modifiers 2016-10-26 12:54:21 -07:00
Timothy Clem
1b6c70f4ee Parse yield and return 2016-10-26 10:27:38 -07:00
Timothy Clem
3d13f570be Add ConditionalAssignment to JSON output 2016-10-24 10:56:08 -07:00
Timothy Clem
56c2dae42f Bring in LOTS more of the ruby grammar 2016-10-24 10:43:31 -07:00
Rick Winfrey
a6480e3e51 Make consistent terms and language 
In many cases, we don’t need to identify the syntax / category for a
term in the names of the fields.

We were using mixed abbreviations and full words. I’ve opted to always
use full words.
 2016-10-24 12:25:20 -05:00
Rick Winfrey
f546eb3d60 Move patchFields 2016-10-24 12:24:15 -05:00
Rick Winfrey
52535ece24 Let the instances breathe 2016-10-24 12:24:03 -05:00
Rick Winfrey
9d9020c409 Extract syntaxToTermField function 2016-10-24 11:06:41 -05:00
Rick Winfrey
ddd0536cc3 Moves 2016-10-24 10:30:08 -05:00
Rick Winfrey
881d68dc2c Add Operator 2016-10-24 10:27:03 -05:00
Rick Winfrey
4ee94d12b5 Move MemberAccess 2016-10-24 10:26:54 -05:00
Rick Winfrey
fef0a4b24f Add MathAssignment 2016-10-24 10:25:49 -05:00
Rick Winfrey
6be772fe7b Move to replicate order in Syntax 2016-10-24 10:25:40 -05:00
Timothy Clem
ce0f690af3 Add interpolation to split output 2016-10-21 15:14:16 -07:00
Rick Winfrey
469b76d82b Remove redundant imports 2016-10-18 10:44:36 -05:00
Rick Winfrey
5149ff100f Update Summary.hs to use DefaultFields 2016-10-18 10:43:05 -05:00
joshvera
d95283f4a1 Merge remote-tracking branch 'origin/master' into add-source-spans 2016-10-11 10:45:22 -04:00
Rick Winfrey
7b24a6ba22 Add Import and Export render cases 2016-10-06 18:21:59 -05:00
joshvera
15cd4777e6 Add SourceSpans to customize ToJSON output for These SourceSpan SourceSpan 2016-10-06 17:55:54 -04:00
joshvera
ecf34e5d6e Output source spans to JSON 2016-10-06 13:12:40 -04:00
joshvera
7ba5607cc8 Add source spans to terms 2016-10-05 17:27:45 -04:00
joshvera
4f41619c8e Merge remote-tracking branch 'origin/master' into rws-large-diffs 2016-10-05 12:17:29 -04:00
Rick Winfrey
c6cf6fab4a Add missing cases for new Module Syntax constructor 2016-10-03 17:37:50 -05:00
joshvera
bfe57829d6 Merge remote-tracking branch 'origin/master' into rws-large-diffs 2016-09-27 10:34:19 -04:00
Timothy Clem
0b2f26a077 Merge remote-tracking branch 'origin/master' into improve-number-summaries 2016-09-19 13:08:15 -07:00
Rob Rix
38d6bbe644 Merge branch 'master' into ghc8 2016-09-17 20:45:58 -04:00
Timothy Clem
eadde3b9a8 Introduce a MathOperator 2016-09-16 15:20:55 -07:00
Timothy Clem
a1250e7896 s/BinaryOperator/BooleanOperator 2016-09-16 15:20:36 -07:00
joshvera
6665f0b6b1 remove imports 2016-09-16 11:36:45 -04:00
Rob Rix
025502729d Correct for precedence. 2016-09-15 17:54:33 -04:00
Rob Rix
996f9f5fa7 Define <> locally. 2016-09-14 19:26:41 -04:00
Rob Rix
aa240c4e63 🔥 a slew of redundant constraints. 2016-09-14 19:23:54 -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
Timothy Clem
68d932594e Add in NumberLiteral category 2016-09-12 21:06:53 -07:00
Rob Rix
902a3f20d8 🔥 a redundant import. 2016-09-12 13:43:23 -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
joshvera
6c09ff32be Add comma_operator split Category 2016-09-07 15:00:49 -07:00
joshvera
7c394ff6dd Union the inner maps 2016-08-24 17:07:43 -04:00
joshvera
b290e49000 Don't include keys if no changes or errors 2016-08-24 15:46:50 -04:00
joshvera
6026d03205 Remove redundant imports 2016-08-24 15:37:55 -04:00
joshvera
e58438f4d9 Return a Map Text [Map Text [Text]] from summaries 2016-08-24 15:27:54 -04:00
joshvera
8d98d8564b indentation 2016-08-24 14:07:30 -04:00
joshvera
ceb664710b Remove redundant constraints 2016-08-24 14:00:34 -04:00
joshvera
439724e430 Don't infix isPrefixOf 2016-08-24 13:59:34 -04:00
joshvera
d4f931e318 formatting 2016-08-23 18:35:35 -04:00
joshvera
341b0af86e Remove unused langauge extensions 2016-08-23 18:33:57 -04:00
joshvera
9b886306ea Partition based off new error prefix 2016-08-23 18:18:36 -04:00
joshvera
96b2107b87 Merge remote-tracking branch 'origin/master' into api-changes 2016-08-23 14:54:47 -04:00
Rob Rix
5cbbfa552a Merge branch 'master' into empty-statements 2016-08-23 10:49:06 -04:00
Rick Winfrey
1207347658 Add JSON renderer case for AnonymousFunction 2016-08-22 18:58:56 -05:00
Rick Winfrey
8a61e57eed Make style names consistent (should use '_' instead of '-') 2016-08-22 18:55:34 -05:00
Rick Winfrey
2374cb8548 Remove overlapping CommaOperator case 2016-08-22 18:55:12 -05:00
joshvera
24af60c80f Remove uses of HashMap for rendering 2016-08-22 10:33:11 -04:00
joshvera
7541160bc3 WIP 2016-08-21 21:51:48 -04:00
joshvera
130724d054 Partition changes and errors into { changes:, errors: } 2016-08-20 00:18:33 -04:00
joshvera
bbc2c2b9b2 Add the empty statement 2016-08-19 15:53:04 -04:00
Rick Winfrey
d9d743f292 Merge branch 'master' into binary-relations-are-relational 2016-08-17 16:31:04 -05:00
Rick Winfrey
b86b3218dc Merge branch 'master' into method-call-improvements 2016-08-17 16:20:01 -05:00
Rick Winfrey
ed3fab42c3 Render RelationalOperator 2016-08-17 11:54:40 -05:00
Rick Winfrey
3dae5cb2f8 Update Split to account for newly added CommaOperator and BitwiseOperator constructors 2016-08-17 11:00:47 -05:00
joshvera
c16effb699 Add comma operator to Split 2016-08-17 11:00:17 -04:00
Rick Winfrey
cb3a709540 Add missing Comment Category to Split styles 2016-08-16 15:36:36 -05:00
joshvera
e209199016 Add If constructor to Syntax 2016-08-11 17:39:44 -04:00
joshvera
59932277f9 Merge remote-tracking branch 'origin/master' into one-json-to-rule-them-all 2016-08-10 13:49:26 -04:00
joshvera
7a9f0b7786 Output file path as summary key 2016-08-10 13:38:18 -04:00
joshvera
2933a24d45 Return Output from json, split, summary, and patch 2016-08-09 18:51:44 -04:00
joshvera
9df1399168 output the inserted/deleted path in the patch header 2016-08-09 16:14:46 -04:00
joshvera
29536db80b Don't output filepaths when adding or deleting an empty file 2016-08-08 15:18:22 -04:00
Rob Rix
70c6b42e69 Add the missing pattern match over methods. 2016-08-04 10:04:33 -04:00
joshvera
36c4001682 Merge remote-tracking branch 'origin/master' into throw-syntax 2016-08-01 13:55:44 -04:00
joshvera
ef4389a5c5 Merge remote-tracking branch 'origin/master' into constructors 2016-08-01 13:49:35 -04:00
joshvera
9bd34fe3ff Merge remote-tracking branch 'origin/master' into try-syntax 2016-08-01 13:38:50 -04:00
joshvera
b458d28c57 Merge remote-tracking branch 'origin/master' into array-syntax 2016-08-01 13:30:37 -04:00
joshvera
b2c66eb5ce Add Constructor to Split.styleName 2016-07-30 14:26:59 -04:00
joshvera
b68a2d8bff Add constructor to JSON 2016-07-30 14:26:48 -04:00
joshvera
69e2c99634 update Method JSON 2016-07-30 13:26:21 -04:00
joshvera
1c5f94631c s/diffSummary/diffSummaries 2016-07-29 18:38:46 -04:00
joshvera
a18305da09 qualify Aeson.Array as A.Array 2016-07-29 16:50:10 -04:00
joshvera
5bef010970 Don't need to scope ArrayLiteral in styleName 2016-07-29 16:46:16 -04:00
joshvera
65c9d53c6b Add ArrayLiteral to Split.styleName 2016-07-29 16:45:07 -04:00
joshvera
ce0c19e279 Add class to styleName 2016-07-29 16:31:19 -04:00
joshvera
1fb7ff4016 Add Class to JSON 2016-07-29 16:31:00 -04:00
joshvera
2de0afbe95 Add Try/Catch/Finally to Split 2016-07-29 15:59:14 -04:00
joshvera
0c8f13f396 Add Try case to JSON 2016-07-29 15:59:05 -04:00
joshvera
a3d9a69f65 Remove redundant Range 2016-07-29 15:37:05 -04:00
joshvera
c70273b899 Add Throw to Split 2016-07-29 15:34:15 -04:00
joshvera
14c9f3f7a6 Add Throw to JSON 2016-07-29 15:33:51 -04:00
joshvera
5e877cc3e9 Remove some redundant imports 2016-07-29 14:31:15 -04:00
joshvera
05b4257711 Take sources instead of blobs to simplify diffSummary interface 2016-07-29 14:20:35 -04:00
joshvera
aa99744db7 Remove SourceSpan from Record 2016-07-29 14:12:44 -04:00
joshvera
f7286f927c Construct errors with a SourceSpan 2016-07-29 14:05:11 -04:00
joshvera
ce3857320f Pass SourceBlobs to diffSummary 2016-07-29 12:59:07 -04:00
joshvera
4493751dd7 Merge remote-tracking branch 'origin/master' into error-syntax 2016-07-29 12:18:14 -04:00
joshvera
fbc9e335a3 Merge remote-tracking branch 'origin/master' into error-syntax 2016-07-29 11:44:38 -04:00
joshvera
7f3cb2e9ef Merge remote-tracking branch 'origin/master' into loop-syntax 2016-07-29 11:42:25 -04:00
joshvera
c45f251b3d parse For exprs 2016-07-28 16:34:07 -04:00
joshvera
d057e156cd Add Return case to Syntax 2016-07-28 14:34:53 -04:00
joshvera
7eac130089 Add DoWhile and While cases 2016-07-28 14:08:34 -04:00
joshvera
8c52bf91b5 Add a For case to styleName 2016-07-28 13:50:08 -04:00
joshvera
bf9e385448 Print the source span when printing error node diff summaries 2016-07-27 18:18:55 -04:00
joshvera
be82432aa0 Add an error JSON case 2016-07-26 14:49:14 -04:00
joshvera
033200ac10 Merge branch 'property-tests' into error-syntax 2016-07-26 13:55:34 -04:00
joshvera
4809ad0f2f Use bind 2016-07-26 13:44:12 -04:00
joshvera
de1088f490 Remove redundant import 2016-07-25 14:56:43 -04:00
joshvera
771f37df0b Add styleName mapping to Category.Error 2016-07-25 14:56:33 -04:00
joshvera
485fc884a4 Merge branch 'syntax-redux' into property-tests 2016-07-22 14:39:54 -04:00
joshvera
70f9329f1a Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-22 12:36:03 -04:00
joshvera
ac36cf5bcc Pretty print diff summaries as lists of LeafInfo Docs 2016-07-15 17:06:41 -04:00
Rob Rix
e08fbd141f 📝 Cell. 2016-07-15 11:16:30 -04:00
Rob Rix
9a75c03c1e 🔥 unused field accessors. 2016-07-15 11:15:42 -04:00
Rob Rix
aa5c870e52 🔥 maybeFirst. 2016-07-15 11:15:04 -04:00
Rob Rix
6f0a55a487 Only export split. 2016-07-15 11:14:43 -04:00
Rob Rix
6859cba690 Don’t annotate with term costs. 2016-07-15 11:13:59 -04:00
Rob Rix
274c831e72 Don’t annotate zero-cost nodes. 2016-07-15 11:11:04 -04:00
Rob Rix
81279c910e Split out the attributes into separate functions. 2016-07-15 11:05:39 -04:00
Rob Rix
1cb3656502 Uniform split rendering of branches. 2016-07-15 10:53:43 -04:00
Rob Rix
08246f3a4c Simplify the catamorphism over terms/split diffs. 2016-07-15 10:52:28 -04:00
Rob Rix
7e3b470631 Repackage Renderable up with source & other. 2016-07-15 10:51:18 -04:00
Rob Rix
29812c4095 Use a strict Line type in split rendering. 2016-07-15 10:46:51 -04:00
Rob Rix
e5ad1d1c42 Use a strict Cell type in split rendering. 2016-07-15 09:59:23 -04:00
Rob Rix
7e4c68d182 Group all the ToMarkup instances together. 2016-07-15 09:55:29 -04:00
Rob Rix
b2fdfdba66 Placate hlint. 2016-07-15 09:55:00 -04:00
Rob Rix
aad375951f Render the Cost instead of the Size in Split diffs. 2016-07-15 09:52:25 -04:00
Rob Rix
0a4c91c784 Remove some redundant imports. 2016-07-14 16:38:44 -04:00
Rob Rix
300bd2b84c Renderer takes an annotation type parameter. 2016-07-14 16:36:47 -04:00
Rob Rix
1a2004fc78 Generalize split rendering over extensible record annotations. 2016-07-14 16:11:06 -04:00
Rob Rix
548b7936a7 Generalize patch rendering over extensible record annotations. 2016-07-14 16:10:51 -04:00
Rob Rix
efe868b01a Generalize the ToJSON instances over extensible record annotations. 2016-07-14 16:10:29 -04:00
Rob Rix
4d6ab97691 Placate hlint. 2016-07-14 15:53:52 -04:00
joshvera
27c338331f Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-14 15:22:46 -04:00
joshvera
453334d966 Use wl-pprint-text to pretty print diff summaries 2016-07-14 14:44:18 -04:00
joshvera
58ff433dd0 Merge remote-tracking branch 'origin/master' into pretty-print-summaries 2016-07-14 14:38:46 -04:00
joshvera
7169a51265 Use wl-pprint-text to pretty print diff summaries 2016-07-13 11:58:43 -04:00
Rob Rix
4f967e0e1a 🔥 Data.OrderedMap. 2016-07-12 23:27:20 -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
3ee4c062d6 import Category as C 2016-07-08 13:16:23 -04:00
joshvera
73afe7d1e9 Add zipTerms to Pairs 2016-07-08 13:16:06 -04:00
joshvera
d99df9b8cb Add Comment/Commented/Pair cases to Renderer.Split 2016-07-08 12:04:24 -04:00
joshvera
fdb7a8bc04 Add more JSON cases 2016-07-08 12:01:10 -04:00
joshvera
576b5ef4fb import Syntax as S 2016-07-08 11:50:25 -04:00
joshvera
8755c84466 scope Pair 2016-07-08 11:18:02 -04:00
joshvera
99b05ebdc1 Object takes a list of f now 2016-07-08 11:17:46 -04:00
joshvera
9f8ddbd64d Add Object case to styleName 2016-07-06 12:38:47 -04:00
joshvera
ee599f6fa0 Add an Object case to Split 2016-07-06 12:38:47 -04:00
Rob Rix
bbab043a35 Merge pull request #623 from github/semantic-git-diff-test-harness 
Test harness for semantic-git-diff
 2016-06-28 22:14:39 -04:00
Rick Winfrey
6f5a573ad4 Simplify encoding of diff summaries as JSON 2016-06-28 15:24:24 -05:00
joshvera
0b664ef68e cleanup hlint warnings 2016-06-23 17:47:01 -04:00
joshvera
42cd6f98df Add more cases to syntax ToMarkup instance 2016-06-21 17:31:57 -04:00
joshvera
0a574871c9 Merge remote-tracking branch 'origin/master' into syntax-redux 2016-06-21 17:08:40 -04:00
Rob Rix
03b8076f03 Show the underlying Integer, not the Size. 2016-06-17 13:56:45 -04:00
Rob Rix
fe00a94f52 Destructure Info using the field accessors. 2016-06-17 12:19:00 -04:00
Rick Winfrey
a2d8c23250 Add Boolean case for styleName 2016-06-16 11:08:34 -05:00
joshvera
f28e50da8a Add Switch/Case to Renderer.Split 2016-06-15 15:49:11 -07:00
joshvera
69e5fca7cb Add Switch/Case to styleName 2016-06-15 15:49:02 -07:00
joshvera
6d2824475c Add Switch/Case/VarDecl/VarAssignment to Renderer.JSON 2016-06-15 15:48:47 -07:00
joshvera
c8b921f52b Add VarDecl/VarAssignment to Renderer.Split 2016-06-15 11:16:43 -07:00
joshvera
1ba11175f8 Add VarDecl/VarAssignment/TemplateString/Regex to Renderer.Split 2016-06-15 11:16:28 -07:00
joshvera
2aa38b2512 Add an Html Semigroup instance 2016-06-15 10:43:32 -07:00
joshvera
ef6b174c7d Merge remote-tracking branch 'origin/master' into ghc8 2016-06-15 10:10:07 -07:00
joshvera
835c06ce9a Add Assignment and MemberAccess cases to Renderer.JSON 2016-06-14 11:28:21 -07:00
joshvera
307cdda0de Add cases for methods and args 2016-06-14 09:53:35 -07:00
joshvera
086466ab88 Add MethodCall cases to Renderer 2016-06-14 09:03:43 -07:00
joshvera
9dfd271186 Add Identifier case to styleName 2016-06-10 16:41:48 -04:00
joshvera
d20937f2b1 Parse functions 2016-06-10 15:10:37 -04:00
Rick Winfrey
3cbdf8f7a9 Add FunctionCall case to termFields 2016-06-08 16:49:45 -05:00
Rick Winfrey
accaeb3429 Add FunctionCall toMarkup instance 2016-06-08 16:45:02 -05:00
Rick Winfrey
0050e03305 Scope Category.FunctionCall 2016-06-08 16:18:30 -05:00
joshvera
775c735265 Pack categories into text while constructing terms 2016-06-06 19:53:48 -04:00
joshvera
2b1333aa09 extract multiple diffs from pure indexed nodes 2016-06-06 15:45:44 -04:00
Rob Rix
10b424cd47 Add an Error category. 2016-06-03 18:37:40 -04:00
Rob Rix
83b57fc643 Add a Category for the top-level scope. 2016-06-03 18:34:42 -04:00
Rob Rix
a43be167f6 Merge branch 'master' into cache-cost-on-info 2016-06-03 16:24:02 -04:00
Rob Rix
7802d4916c 🔥 FlexibleInstances & RecordWildCards pragmas. 2016-06-03 16:02:06 -04:00
Rob Rix
0c05e3f29b Don’t bind an unused parameter. 2016-06-02 23:30:01 -04:00
Rob Rix
7741cee48d Use RecordWildcards to clean up some uses of Info. 2016-06-02 22:43:47 -04:00
Rob Rix
4ea9eba71c Merge branch 'master' into render-diff-summaries-as-json 2016-06-01 16:23:39 -04:00
joshvera
3115adec93 Change JSON category key to category and update docs 2016-06-01 12:08:40 -04:00
Rob Rix
f8508b84fd Output a JSON array of strings. 2016-05-31 16:14:10 -04:00
joshvera
0244e9a929 Store a category in Info instead of a Set 2016-05-31 16:13:01 -04:00
joshvera
fbf368b659 Merge remote-tracking branch 'origin/master' into ghc8 2016-05-31 13:49:17 -04:00
Rob Rix
86e8e06a50 🔥 redundant imports. 2016-05-27 15:44:51 -04:00
Rob Rix
e37fe0dee9 Render JS with predictable ordering. 2016-05-27 14:49:28 -04:00
joshvera
dcd8b0de32 Bump to lts nightly for ghc-8.0 2016-05-27 13:10:04 -04:00
Rob Rix
2e77455195 Expect a Show instance for the leaf type everywhere. 2016-05-27 13:07:32 -04:00
Rob Rix
10b4e072b0 Use pure to construct the starting rows. 2016-05-27 13:03:49 -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
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
joshvera
ebd5d20171 Remove duplicate imports 2016-05-26 14:04:27 -04:00
joshvera
473ec980b1 Merge remote-tracking branch 'origin/master' into diff-summaries 2016-05-26 13:40:54 -04:00
joshvera
8180b37285 Use Protolude via the Prologue module and add NoImplicitPrelude 2016-05-26 12:58:04 -04:00
joshvera
68948287f8 Add a summary renderer 2016-05-18 12:01:16 -04:00
joshvera
48c7498ce2 Define Term in terms of Cofree 2016-05-04 14:37:24 -04:00
joshvera
9f8fc439b3 typealias Annotated to CofreeF 2016-05-03 14:19:10 -04:00
joshvera
4eedcc4a70 Fix up other catas 2016-05-03 12:36:59 -04:00
joshvera
6c07d4dc55 WIP CofreeF 2016-05-03 12:17:38 -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
64026caa06 🔥 runBoth. 2016-04-25 16:07:52 -04:00
Rob Rix
8fee49b2e3 Maintain the fiction of multiple terms. 2016-04-25 12:29:50 -04:00
Rob Rix
97bebfbc30 uncurry lineFields. 2016-04-25 12:24:48 -04:00
Rob Rix
1a9bc1326e Fold right and be more careful about context. 2016-04-15 14:36:05 -04:00
Rob Rix
488a05bc28 Don’t compute term sizes, use the cached ones. 2016-04-15 14:32:24 -04:00
Rob Rix
d623699573 Fold right through separators & children when rendering split diffs. 2016-04-15 09:54:12 -04:00
Rob Rix
1e4e6af073 Replace uses of Row with Join These. 2016-04-15 09:23:35 -04:00
Rob Rix
a61d847705 Replace Data.Bifunctor.These and Data.Align with the these package. 2016-04-14 22:00:00 -04:00
Rob Rix
b934fc53a0 import Patch for maybeSnd. 2016-04-14 21:57:21 -04:00
Rob Rix
3235cfee3a Define renderers in terms of alignDiff. 2016-04-14 21:16:02 -04:00
Rob Rix
593ea842e0 Move maybeFirst into Renderer.Split. 2016-04-14 20:31:59 -04:00
Rob Rix
e3ace6408c Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly 
# Conflicts:
#	test/AlignmentSpec.hs
#	test/PatchOutputSpec.hs
 2016-04-14 12:57:45 -04:00
Rob Rix
6075a62626 Write term sizes out in split diffs. 2016-04-12 10:56:01 -04:00
Rob Rix
e6c81e1c22 🔥 some redundant imports & bindings. 2016-04-12 04:44:12 -04:00
Rob Rix
71e8454fb4 Add a size field to Info. 2016-04-11 15:02:58 -04:00
Rob Rix
c79773ceea 🔥 an unused parameter. 2016-04-04 18:02:43 -04:00
Rob Rix
dd38cf4bd7 🔥 some redundant imports. 2016-04-04 18:02:32 -04:00
Rob Rix
8b2a9fb6d0 Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly 
# Conflicts:
#	src/Renderer/JSON.hs
#	src/Renderer/Patch.hs
#	test/CorpusSpec.hs
 2016-04-04 18:00:25 -04:00
joshvera
a553709112 Specialize Renderer to Text 2016-04-04 17:20:26 -04:00
joshvera
3b752b834c docs 2016-04-04 17:12:55 -04:00
Rob Rix
d2beafdc84 🔥 Both.unzip. 2016-04-04 16:25:16 -04:00
Rob Rix
06c4759aed Represent Both as Join (,). 2016-04-04 15:01:47 -04:00
Rob Rix
60d6cfeb90 Use the curried both constructor. 2016-04-04 14:53:09 -04:00
joshvera
842a0f30af Move emptyHunk to a function 2016-04-01 15:35:21 -04:00
joshvera
a18c2649d3 Add a truncatePatch function 2016-04-01 15:35:09 -04:00
joshvera
e44b24806f Merge remote-tracking branch 'origin/master' into async 2016-04-01 12:52:17 -04:00
Rob Rix
da3f04100e Merge branch 'master' into one-header-per-file 2016-03-31 17:00:37 -04:00
joshvera
5ff0d38a2f Make sure we actually show 2 hunks in the test 2016-03-31 13:53:47 -04:00