1
1
mirror of https://github.com/github/semantic.git synced 2024-12-26 16:33:03 +03:00
Commit Graph

1397 Commits

Author SHA1 Message Date
Rob Rix
c836faa1cf Encode Syntax manually. 2016-02-29 21:33:03 -05:00
Rob Rix
e01b0c7df9 Customize the Category instance. 2016-02-29 21:21:24 -05:00
Rob Rix
d9006714d4 Disable orphan instance warnings in this module. 2016-02-29 20:56:53 -05:00
Rob Rix
d92bab31fd Generate the JSON with aeson instead. 2016-02-29 20:52:30 -05:00
Rob Rix
d02f6484db Generic instances everywhere, why not. 2016-02-29 20:38:41 -05:00
Rob Rix
ae149c94ff Use runBothWith to tidy up a few computations. 2016-02-29 19:43:57 -05:00
Rob Rix
51ad3ba049 Add runBothWith. 2016-02-29 19:41:05 -05:00
Rob Rix
7548e148dc Rename runLeft/runRight to fst/snd. 2016-02-29 19:39:04 -05:00
Rob Rix
ace7616899 The Foldable instance for OrderedMap takes care of this for us. 2016-02-29 19:38:22 -05:00
Rob Rix
7b3902be9e Encode rather than showing. 2016-02-29 18:08:33 -05:00
Rob Rix
adf7b24bc7 🔥 Text.JSON, just use the json package. 2016-02-29 18:06:06 -05:00
Rob Rix
9fe9864fbf Escape some things. 2016-02-29 18:00:34 -05:00
Rob Rix
4b543f45f1 Flesh out JSON rendering for SplitDiff. 2016-02-29 17:44:57 -05:00
Rob Rix
258f7e6eed SplitPatch is a Functor. 2016-02-29 17:44:44 -05:00
Rob Rix
96649aa0e4 Implement showJSON over Keyed nodes. 2016-02-29 17:41:29 -05:00
Rob Rix
5539d11d9a Write a custom Show instance for JSValue. 2016-02-29 17:37:33 -05:00
Rob Rix
e39d728af0 Write a custom Show instance for JSObject. 2016-02-29 17:33:19 -05:00
Rob Rix
466d7d3611 Write a custom Show instance for JSString. 2016-02-29 17:30:39 -05:00
Rob Rix
47c71a0acf Wrap each Row. 2016-02-29 17:28:23 -05:00
Rob Rix
0657e55272 Flesh out the JSON instance for SplitPatch. 2016-02-29 17:27:37 -05:00
Rob Rix
7e71de3ec2 Implement showJSON over Fixed nodes. 2016-02-29 17:25:12 -05:00
Rob Rix
2c4ae8246c Implement showJSON over Indexed nodes. 2016-02-29 17:24:51 -05:00
Rob Rix
427b529bbb Flesh out the JSON instance for Term a little. 2016-02-29 17:23:26 -05:00
Rob Rix
fdab783d8f Stub in an instance over Syntax. 2016-02-29 17:23:16 -05:00
Rob Rix
61a340895e Wrap some things. 2016-02-29 17:19:59 -05:00
Rob Rix
9e2ec009a1 Stub in an instance for Term. 2016-02-29 17:19:22 -05:00
Rob Rix
3c4a99df18 Use an explicit instance for Category. 2016-02-29 17:17:54 -05:00
Rob Rix
a504e73b04 Some more instances. 2016-02-29 17:15:08 -05:00
Rob Rix
25214616c8 Remove the old JSON type. 2016-02-29 17:10:47 -05:00
Rob Rix
6126287d59 Derive Eq & Show instances for the JS types. 2016-02-29 17:02:16 -05:00
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
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
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
Rob Rix
ed48c7f427 Add a renderLine convenience. 2016-02-29 11:30:32 -05:00
Rob Rix
5b5f22711a Define zipWithDefaults over Both. 2016-02-29 10:57:01 -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
Rob Rix
93e44a3dc5 Sort some imports. 2016-02-29 10:04:59 -05:00
Rob Rix
e678c863b3 runLeft/runRight to construct insertion/deletion ranges. 2016-02-29 10:02:53 -05:00
Rob Rix
768e3fedba Construct insertion/deletion Ranges with rangeAt. 2016-02-29 10:00:48 -05:00
Rob Rix
9108b56e4f Add a rangeAt function to construct a Range at an index. 2016-02-29 10:00:02 -05:00
Rob Rix
5bbca4cf8d Use runLeft/runRight when aligning insertions/deletions. 2016-02-29 09:59:54 -05:00
Rob Rix
fe193b89d4 Use runLeft/runRight in unLeft/unRight. 2016-02-29 09:34:27 -05:00
Rob Rix
acca5d8917 Add runLeft/runRight conveniences. 2016-02-29 09:33:38 -05:00
Rob Rix
acd19b4502 Don’t bind variables we don’t use. 2016-02-29 09:33:02 -05:00
Rob Rix
a8efcb539a Row wraps a Both. 2016-02-29 09:22:52 -05:00
Rob Rix
e26b4bacd5 Document Both. 2016-02-29 09:15:26 -05:00
Rob Rix
1abab2bbce adjoinRowsBy applies Both MaybeOpen tests. 2016-02-29 08:55:30 -05:00
Rob Rix
6fe2060e45 Define an Applicative instance for Row. 2016-02-29 08:44:36 -05:00
Rob Rix
8303fd08ad wrapRowContents applies Both functions to Row contents. 2016-02-29 08:38:58 -05:00
Rob Rix
0eeda4b047 Remove a redundant import. 2016-02-29 07:44:15 -05:00
Rob Rix
a8e89b8fac Clean up a bit using Both’s zipWith/unzip. 2016-02-29 07:43:43 -05:00
Rob Rix
cff2511305 Implement zipWith over Both. 2016-02-29 01:54:35 -05:00
Rob Rix
3296276f90 Implement zip over Both. 2016-02-29 01:51:37 -05:00
Rob Rix
ecdb3c3e9b Implement unzip over Both. 2016-02-29 01:46:43 -05:00
Rob Rix
b6ffeeba2a Document both. 2016-02-29 01:31:45 -05:00
Rob Rix
391d102dcf Add a both function. 2016-02-29 01:31:04 -05:00
Rob Rix
7f73085dd5 Compute openLineBy across Both sides. 2016-02-29 01:25:50 -05:00
Rob Rix
6170622468 Zip through Both. 2016-02-29 01:22:18 -05:00
Rob Rix
e23da3feb9 Perform the adjoining through Both. 2016-02-29 01:18:09 -05:00
Rob Rix
e606700b57 unRow returns Both. 2016-02-29 00:42:48 -05:00
Rob Rix
834b521e23 Distribute mapping replacements over Both terms. 2016-02-29 00:34:18 -05:00
Rob Rix
d2f6ea8385 Represent the previous integers in Both. 2016-02-28 22:43:48 -05:00
Rob Rix
c8166041ef Remove some more parens. 2016-02-28 22:32:27 -05:00
Rob Rix
fdd3234c44 Remove some parens. 2016-02-28 22:29:22 -05:00
Rob Rix
0d77576a52 Represent categories in Both. 2016-02-28 22:10:02 -05:00
Rob Rix
c3039cd853 Run the computation over both sides of the functor. 2016-02-28 22:04:18 -05:00
Rob Rix
81a1a14d4c Represent the input Ranges in Both. 2016-02-28 22:01:21 -05:00
Rob Rix
8dc4b5bb69 Represent alignment ranges in Both. 2016-02-28 21:46:13 -05:00
Rob Rix
863251183f Represent alignment sources in Both. 2016-02-28 21:43:47 -05:00
Rob Rix
51e916c1a8 Remove redundant imports. 2016-02-28 21:43:13 -05:00
Rob Rix
0626228917 Data.Bifunctor.Join is actually Data.Functor.Both. 2016-02-28 21:29:59 -05:00
Rob Rix
2b61360697 Use some more Joins. 2016-02-28 21:28:24 -05:00
Rob Rix
b663e59c4c Join the sums. 2016-02-28 21:20:58 -05:00