github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-28 09:21:35 +03:00
Code Issues Projects Releases Wiki Activity
7,012 Commits 19 Branches 16 Tags 46 MiB
0b664ef68e
Commit Graph

287 Commits

Author SHA1 Message Date
Rob Rix
621f727a79 Encode SplitPatch manually. 2016-02-29 21:35:03 -05:00
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
ae149c94ff Use runBothWith to tidy up a few computations. 2016-02-29 19:43:57 -05:00
Rob Rix
7548e148dc Rename runLeft/runRight to fst/snd. 2016-02-29 19:39:04 -05:00
Rob Rix
7b3902be9e Encode rather than showing. 2016-02-29 18:08:33 -05:00
Rob Rix
4b543f45f1 Flesh out JSON rendering for SplitDiff. 2016-02-29 17:44:57 -05:00
Rob Rix
96649aa0e4 Implement showJSON over Keyed nodes. 2016-02-29 17:41:29 -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
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
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
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
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
a8efcb539a Row wraps a Both. 2016-02-29 09:22:52 -05:00
Rob Rix
d2f6ea8385 Represent the previous integers in Both. 2016-02-28 22:43:48 -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
Rob Rix
ea87105b4b Use Join for sources everywhere. 2016-02-28 21:10:56 -05:00
Rob Rix
4abf8b5b6c Spacing. 2016-02-28 21:10:02 -05:00
Rob Rix
88130ee7fd Remove some redundant imports. 2016-02-28 21:08:43 -05:00
Rob Rix
92bc9b0530 Move splitPatchToClassName up beside styleName. 2016-02-28 14:03:30 -05:00
Rob Rix
e31edf6b3c Move the alignment bits of Split into the Alignment module. 2016-02-28 14:01:56 -05:00
Rob Rix
1ad9f72c02 Move getSplitTerm into SplitDiff. 2016-02-28 13:41:36 -05:00
Rob Rix
3a0eb53611 Move SplitPatch and SplitDiff into the SplitDiff module. 2016-02-28 13:40:49 -05:00
Rob Rix
1ba036b495 Merge branch 'master' into forward-compatible-rendering 
# Conflicts:
#	src/DiffOutput.hs
#	test/CorpusSpec.hs
#	tools/semantic-difftool/src/Main.hs
 2016-02-28 13:26:50 -05:00
Rob Rix
8c39ae3c87 Remove the Unified module. 2016-02-26 19:05:51 -05:00
Rob Rix
d9f168e320 Format keyed nodes. 2016-02-25 16:56:56 -07:00
Rob Rix
52cf57be80 Format fixed nodes. 2016-02-25 16:50:33 -07:00
Rob Rix
5515f63b25 Format indexed children as an array. 2016-02-25 16:50:15 -07:00
Rob Rix
f83c2abe1a Format indexed syntaxes. 2016-02-25 16:49:42 -07:00
Rob Rix
8fcb8c3e76 iter/cata over diffs & patches. 2016-02-25 16:49:18 -07:00
Rob Rix
a0de714565 Splat syntax out directly. 2016-02-25 16:36:01 -07:00
Rob Rix
3b54caefb5 Flesh out showCategories. 2016-02-25 16:33:17 -07:00
Rob Rix
6e74ef2a08 Flesh out showRange. 2016-02-25 16:32:02 -07:00
Rob Rix
543acb01c0 Stub in range/categories/syntax showing. 2016-02-25 16:31:30 -07:00
Rob Rix
f205a59f6d Use showPatch for Pure diffs. 2016-02-25 16:29:24 -07:00
Rob Rix
640bd6c3dd Use showInfoSyntax for Free diffs. 2016-02-25 16:29:08 -07:00
Rob Rix
0b1bec523f Stub in showing info & syntax. 2016-02-25 16:28:36 -07:00
Rob Rix
1e07c5f7e0 Stub in patch rendering. 2016-02-25 16:27:44 -07:00
Rob Rix
b593fb1783 Stub in showDiff. 2016-02-25 16:25:31 -07:00
Rob Rix
bb51244ffe Show lines. 
Turn off overloaded strings so that we don’t have to annotate showLine.
 2016-02-25 16:17:05 -07:00
Rob Rix
c5d888a6ac Make it a newtype. 2016-02-25 16:16:27 -07:00
Rob Rix
0352948aca Document the thing. 2016-02-25 16:07:12 -07:00
Rob Rix
6d56fabcbf Stub in rendering of rows. 2016-02-25 16:03:34 -07:00
Rob Rix
e33cb1168e Split the diffs and show the rows. 2016-02-25 16:00:43 -07:00
Rob Rix
5fbffece19 Stub in a Show instance for JSON. 2016-02-25 16:00:23 -07:00
Rob Rix
79c7fdecda Abstract JSON over a type variable. 2016-02-25 16:00:09 -07:00
Rob Rix
1a45d0b1d6 Stub in a JSON renderer. 2016-02-25 14:15:22 -07:00
Rob Rix
9716e0d006 Document the JSON type. 2016-02-25 14:09:38 -07:00
Rob Rix
561d625538 Stub in a JSON datatype. 2016-02-25 14:09:11 -07:00
Rob Rix
bce5430697 Stub in a JSON renderer module. 2016-02-25 13:57:28 -07:00
Rob Rix
fcd8571274 Move Unified under Renderer. 2016-02-25 13:50:35 -07:00
Rob Rix
f8214a9872 Move Split under Renderer. 2016-02-25 13:32:39 -07:00
Rob Rix
f44455c372 Rename Renderer.PatchOutput to Renderer.Patch. 2016-02-25 13:20:25 -07:00
Rob Rix
c710b3c713 Move PatchOutput into Renderer. 2016-02-25 13:14:56 -07:00