Rob Rix
|
f1653579a2
|
Add a JSON instance for Range.
|
2016-02-29 17:00:46 -05:00 |
|
Rob Rix
|
d6d419e743
|
Define the Row instance in terms of the Line instance.
|
2016-02-29 16:58:45 -05:00 |
|
Rob Rix
|
4bfe19f73c
|
Remove the too-general instance.
|
2016-02-29 16:58:35 -05:00 |
|
Rob Rix
|
f48bd98690
|
Add a JSON instance for Line.
|
2016-02-29 16:57:13 -05:00 |
|
Rob Rix
|
bd2439ec77
|
Add a JSON instance for Row.
|
2016-02-29 16:55:51 -05:00 |
|
Rob Rix
|
8b33283c00
|
Add a JSONWrapper type with a JSON instance.
|
2016-02-29 16:51:14 -05:00 |
|
Rob Rix
|
7a0e309f7d
|
Add a JSON instance for lists.
|
2016-02-29 16:48:59 -05:00 |
|
Rob Rix
|
5eb33dc23a
|
Add a JSON instance for Int.
|
2016-02-29 16:47:52 -05:00 |
|
Rob Rix
|
a179a0fbfb
|
Add a JSON instance for Integers.
|
2016-02-29 16:43:53 -05:00 |
|
Rob Rix
|
95deff602c
|
Add a JSON instance covering Char and String.
|
2016-02-29 16:42:46 -05:00 |
|
Rob Rix
|
f7a4c27788
|
Add in a basic JSON conversion typeclass.
|
2016-02-29 16:42:34 -05:00 |
|
Rob Rix
|
84f140977f
|
Define JSON types.
These are intentionally source-compatible with the `json` package.
|
2016-02-29 16:42:06 -05:00 |
|
Rob Rix
|
bc2db99978
|
Stub in a Text.JSON module.
|
2016-02-29 16:32:31 -05:00 |
|
Rob Rix
|
e9552433ce
|
Sort the imports.
|
2016-02-29 16:24:45 -05:00 |
|
Rob Rix
|
f3be752e3c
|
Intercalate rows too.
|
2016-02-29 16:18:58 -05:00 |
|
Rob Rix
|
f357ae2c2d
|
Categories are an array.
|
2016-02-29 16:18:42 -05:00 |
|
Rob Rix
|
8f85ad7fb3
|
Intercalate lines and categories.
|
2016-02-29 16:18:24 -05:00 |
|
Rob Rix
|
618fc98903
|
Quote the keys.
|
2016-02-29 16:18:19 -05:00 |
|
Rob Rix
|
ad8501c053
|
Add some missing imports.
|
2016-02-29 14:17:16 -05:00 |
|
Rob Rix
|
456d95e3e9
|
Remove another redundant import.
|
2016-02-29 14:17:09 -05:00 |
|
Rob Rix
|
688f5de0a0
|
Remove redundant imports.
|
2016-02-29 14:16:01 -05:00 |
|
Rob Rix
|
46b85eea05
|
Merge branch 'master' into forward-compatible-rendering
|
2016-02-29 14:11:14 -05:00 |
|
Rob Rix
|
3e172365a2
|
Map directly over the applicatives.
|
2016-02-29 13:50:51 -05:00 |
|
Rob Rix
|
8dddf49c10
|
Embed the Bool/Int/Line ToMarkup instance in Renderable.
|
2016-02-29 13:46:26 -05:00 |
|
Rob Rix
|
75b7f9d58c
|
Revert "Don’t warn about orphans."
This reverts commit 18205b45d7cce5985265248f6c69f9c1932b057d.
|
2016-02-29 13:43:38 -05:00 |
|
Rob Rix
|
fe9f211336
|
Generalize Renderable.
|
2016-02-29 13:43:23 -05:00 |
|
Rob Rix
|
90b58cc1ae
|
Map into Renderable directly.
|
2016-02-29 13:40:12 -05:00 |
|
Rob Rix
|
52b23a8e5c
|
Don’t warn about orphans.
This is for the orphan ToMarkup instance in Renderer.Split.
|
2016-02-29 13:38:14 -05:00 |
|
Rob Rix
|
01970d19ee
|
Merge branch 'master' into why-not-both
|
2016-02-29 13:30:39 -05:00 |
|
Rob Rix
|
9677c59bcf
|
Move the ToMarkup instance for Line to the Renderer.Split module.
|
2016-02-29 13:30:34 -05:00 |
|
Rob Rix
|
6563b4e653
|
Don’t bother destructuring the sources.
|
2016-02-29 13:22:59 -05:00 |
|
Rob Rix
|
48abfb6dac
|
Number rows through Both.
|
2016-02-29 13:22:28 -05:00 |
|
Josh Vera
|
40b96c35c0
|
Merge pull request #478 from github/test-icu-dir-existence
Test icu dir existence
|
2016-02-29 11:43:55 -05:00 |
|
joshvera
|
cf16e75831
|
Merge remote-tracking branch 'origin/master' into test-icu-dir-existence
|
2016-02-29 11:42:40 -05:00 |
|
Josh Vera
|
e4308692a3
|
Merge pull request #475 from github/factor-alignment-out-of-rendering
Factor alignment out of rendering
|
2016-02-29 11:42:16 -05:00 |
|
joshvera
|
e283e06c29
|
Merge remote-tracking branch 'origin/master' into factor-alignment-out-of-rendering
|
2016-02-29 11:39:46 -05:00 |
|
Josh Vera
|
2dac5af30f
|
Merge pull request #474 from github/sort-modules-and-dependencies-in-cabal-files
Sort modules and dependencies in cabal files
|
2016-02-29 11:39:20 -05:00 |
|
joshvera
|
1005f053d9
|
Merge remote-tracking branch 'origin/master' into sort-modules-and-dependencies-in-cabal-files
|
2016-02-29 11:38:31 -05:00 |
|
Josh Vera
|
49fb3be13c
|
Merge pull request #473 from github/factor-tree-sitter-ffi-out
Factor tree-sitter FFI out
|
2016-02-29 11:38:11 -05:00 |
|
joshvera
|
bd1e0d0ca8
|
++tree-sitter-parsers
|
2016-02-29 11:36:56 -05:00 |
|
joshvera
|
79202d970a
|
Merge remote-tracking branch 'origin/master' into factor-tree-sitter-ffi-out
|
2016-02-29 11:32:18 -05:00 |
|
Rob Rix
|
ed48c7f427
|
Add a renderLine convenience.
|
2016-02-29 11:30:32 -05:00 |
|
Josh Vera
|
b0ce35573a
|
Merge pull request #472 from github/factor-git-integration-into-a-separate-package
Factor git integration into a separate package
|
2016-02-29 11:28:24 -05:00 |
|
Rob Rix
|
5b5f22711a
|
Define zipWithDefaults over Both.
|
2016-02-29 10:57:01 -05:00 |
|
Rob Rix
|
ac39e73691
|
Line’s Monoid instance will do just fine here.
|
2016-02-29 10:38:39 -05:00 |
|
Rob Rix
|
665ffa4133
|
We don’t need to destructure the Rows in the append test.
|
2016-02-29 10:33:29 -05:00 |
|
Rob Rix
|
df2b684229
|
Simplify how we compute combineIntoLeaves.
|
2016-02-29 10:31:53 -05:00 |
|
Rob Rix
|
7048a61660
|
Define leafWIthRangesInSources over Both.
|
2016-02-29 10:30:33 -05:00 |
|
Rob Rix
|
c889174aee
|
Use Both to represent Diff annotations.
|
2016-02-29 10:12:34 -05:00 |
|
Rob Rix
|
065c21c013
|
Sort more imports.
|
2016-02-29 10:07:44 -05:00 |
|