1
1
mirror of https://github.com/github/semantic.git synced 2024-12-25 07:55:12 +03:00
Commit Graph

486 Commits

Author SHA1 Message Date
joshvera
724910bf7a Merge remote-tracking branch 'origin/master' into git-diff 2016-02-01 14:48:30 -05:00
Matt Diephouse
d76fbfa60e No IO needed 2016-01-28 16:14:24 -05:00
joshvera
8c7d82b363 store strings in SourceBlob 2016-01-26 16:46:27 -05:00
joshvera
d0a3c517a9 Pass around source blobs with oid info 2016-01-26 16:25:40 -05:00
Matt Diephouse
45de586389 Merge branch 'master' into unified 2016-01-22 11:04:53 -05:00
Matt Diephouse
0671d46590 Fix off-by-one error 2016-01-22 10:27:00 -05:00
Matt Diephouse
b074325f67 Make unified into a Renderer of [Chunk String] 2016-01-21 13:27:16 -05:00
Matt Diephouse
160c2e309a Pass the chunk renderer into unified 2016-01-21 13:05:15 -05:00
joshvera
b4dc0056ec fix unused variable warning 2016-01-20 12:27:01 -05:00
joshvera
5fd539765c Share printDiff 2016-01-20 12:25:17 -05:00
joshvera
3e72417c77 Move shared IO to DiffOutput 2016-01-20 11:43:31 -05:00
joshvera
b188febbe7 share diff and breakDownLeavesByWord between SemanticDiff and Main 2016-01-20 11:36:06 -05:00
joshvera
263ea09dd2 diff functions take tuples of sources now 2016-01-20 10:39:44 -05:00
joshvera
99f8fb18a4 Revert main 2016-01-15 16:26:16 -05:00
joshvera
84d8494c3e Add semantic-diff exe 2016-01-15 16:25:58 -05:00
joshvera
33b2331a23 Merge origin/master into git-diff 2016-01-15 16:15:44 -05:00
Matt Diephouse
9e6e125477 Update the documentation 2016-01-14 15:31:20 -05:00
Matt Diephouse
140cfa88b6 Try to make the overall structure clearer 2016-01-14 15:27:47 -05:00
Matt Diephouse
55666a5586 Monadically 2016-01-14 15:13:26 -05:00
Matt Diephouse
61b65533ef printDiff can return a Renderer now 2016-01-14 15:10:56 -05:00
Matt Diephouse
3a9803ee15 Make Renderer take a pair of Source Chars 2016-01-14 15:09:47 -05:00
Matt Diephouse
fa68f78c39 Put the diff first 2016-01-14 14:56:00 -05:00
Matt Diephouse
78852e4041 Get rid of the where clause 2016-01-14 14:54:43 -05:00
Matt Diephouse
44a1c68f8f Create a separate diff function 2016-01-14 14:54:30 -05:00
joshvera
ac77ed1ba0 rename to Format 2016-01-14 14:08:23 -05:00
joshvera
13b676f392 Merge origin/master into git-diff 2016-01-14 14:04:28 -05:00
joshvera
2a00945ae7 Remove unused readAndTranscodeFile 2016-01-14 13:54:36 -05:00
joshvera
1e094aba90 docs 2016-01-14 13:52:26 -05:00
joshvera
2c3ff936b7 Merge origin/master into git-diff 2016-01-14 13:44:29 -05:00
Matt Diephouse
f0760188b9 Rename Renderer to Format
This is more consistent with the terminology around the command-line
`diff` tool.
2016-01-14 13:12:28 -05:00
Matt Diephouse
8d22bd0f5a Document the declarations in Main.hs 2016-01-13 14:29:37 -05:00
joshvera
6c69cf4189 take a list of filepaths to diff 2016-01-13 13:56:33 -05:00
joshvera
5c12f79533 grab gitDir from env 2016-01-12 13:02:52 -05:00
joshvera
8f069abbce Merge master into git-diff 2016-01-12 12:53:09 -05:00
Matt Diephouse
fca9bb3dd2 Remove redundant do 2016-01-12 11:05:10 -05:00
Matt Diephouse
d2b4c48045 Rename replaceLeavesWithWordBranches to breakDownLeavesByWord 2016-01-12 11:01:13 -05:00
Matt Diephouse
a62d1defe2 Extract range and word extraction 2016-01-12 10:59:13 -05:00
Matt Diephouse
4dee96a7c2 Define by pattern matching instead of case analysis 2016-01-12 10:53:45 -05:00
Matt Diephouse
63a6bf326b Use cata in replaceLeavesWithWordBranches 2016-01-12 10:47:55 -05:00
Matt Diephouse
bce530858d Only deconstruct Info for leaves 2016-01-12 10:35:58 -05:00
Matt Diephouse
0ca0b4d453 Refactor to remove guard clause 2016-01-12 10:34:17 -05:00
Matt Diephouse
1cb83b4ea6 Get rid of substringing 2016-01-12 10:28:46 -05:00
joshvera
b9a984186b Add fetchFromGitRepo 2016-01-06 16:16:13 -05:00
Matt Diephouse
db78041edd Rename Argument to Arguments
Because there are in fact multiple arguments
2016-01-06 14:01:41 -05:00
joshvera
7a03ac709b missed one 2016-01-04 15:51:01 -05:00
joshvera
e3777a1c08 inline fmap 2016-01-04 14:50:16 -05:00
joshvera
44e9f50434 remove uses of lens 2016-01-04 14:48:55 -05:00
joshvera
15724218b8 Merge remote-tracking branch 'origin/master' into use-conduit 2016-01-04 14:26:18 -05:00
Rob Rix
09459a3421 Merge branch 'master' into patch 2015-12-30 18:55:42 -05:00
joshvera
24015141b7 Add conduit 2015-12-30 18:00:57 -05:00
joshvera
609e713580 Move printDiff to its own function 2015-12-30 18:00:44 -05:00
joshvera
16013ae454 read and transcode text to unicode 2015-12-29 17:34:28 -05:00
joshvera
a3051c531d Merge remote-tracking branch 'origin/master' into use-text 2015-12-29 15:13:57 -05:00
Rob Rix
0866ef52bd Merge branch 'diff-performance' into patch 2015-12-24 16:33:24 -05:00
Rob Rix
9343e9d4ae Do all formatting within Sources. 2015-12-24 00:20:47 -05:00
Rob Rix
0ef7cdf93b Merge branch 'strictness' into patch 2015-12-23 18:06:47 -05:00
Rob Rix
c1973d052d Fold strictly. 2015-12-23 18:01:31 -05:00
Rob Rix
71c0719326 Remove a redundant import. 2015-12-23 18:01:01 -05:00
joshvera
888cad5791 pack file extension when passing to parserForType 2015-12-18 14:53:25 -05:00
joshvera
75a9a48249 eta reduce 2015-12-18 14:52:26 -05:00
joshvera
e2817db885 Convert lineByLineParser to return text 2015-12-18 14:48:44 -05:00
joshvera
12df3007f1 output text when given Split option 2015-12-18 14:48:33 -05:00
joshvera
cfc4a97f9d Merge remote-tracking branch 'origin/master' into use-bytestrings 2015-12-18 14:43:25 -05:00
Rob Rix
e75827ad7f Qualify the PatchOutput import. 2015-12-18 08:23:28 -05:00
Rob Rix
70c5179a6b Merge branch 'master' into patch 2015-12-17 17:34:45 -05:00
Rob Rix
5b150a72ae Render diffs as patches when --patch is used. 2015-12-17 17:23:06 -05:00
Rob Rix
10afe48d93 Add an argument to select patch output. 2015-12-17 17:19:13 -05:00
Rob Rix
e61140b10f Add a Patch case to Renderer. 2015-12-17 17:19:05 -05:00
Rob Rix
87de49129b Move the bridge sources into src/. 2015-12-17 13:05:53 -05:00
Rob Rix
96f189719a Move TreeSitter into the library. 2015-12-17 12:54:27 -05:00
Rob Rix
be2d4f5d76 Denote a bunch of C productions as being fixed. 2015-12-16 18:22:25 -05:00
Rob Rix
5755c314fb Bind the C language in the where clause. 2015-12-16 18:11:23 -05:00
Rob Rix
2ca8e7ca11 Reformat. 2015-12-16 18:10:39 -05:00
Rob Rix
136399bd66 Move fixedProductions into the language selection. 2015-12-16 18:10:13 -05:00
Rob Rix
4544d25974 Deparenthesize. 2015-12-16 18:09:32 -05:00
Rob Rix
86dfd83935 Swap the order of the language & constructor. 2015-12-16 18:08:51 -05:00
Rob Rix
a886a849f4 Move keyedProductions into the language selection. 2015-12-16 18:07:39 -05:00
Rob Rix
4898163d50 Move constructorForProductions into the library. 2015-12-16 16:27:03 -05:00
Rob Rix
3652773729 Move the Constructor type into the library. 2015-12-16 16:24:58 -05:00
Rob Rix
e47d3d4d3c Move the Parser type back into the library. 2015-12-16 16:24:23 -05:00
Rob Rix
1504a985de Rename Parser to Parsers. 2015-12-16 16:21:49 -05:00
Rob Rix
c6eb5f9722 Use the Constructor to build the terms. 2015-12-16 16:08:10 -05:00
Rob Rix
4c34d43691 Construct the Info inline. 2015-12-16 16:06:55 -05:00
Rob Rix
c2f37529b3 Pass the Constructor to documentToTerm. 2015-12-16 16:06:06 -05:00
Rob Rix
53046e4b0d Select a Language for a given file name extension. 2015-12-16 16:05:24 -05:00
Rob Rix
0769c00d1d Abstract a Language type. 2015-12-16 16:03:15 -05:00
Rob Rix
ec674a572a Construct keyed nodes when appropriate. 2015-12-16 16:02:59 -05:00
Rob Rix
829e443af8 Use fixed nodes when appropriate. 2015-12-16 16:01:43 -05:00
Rob Rix
82c96e18eb Default to indexed nodes. 2015-12-16 16:01:36 -05:00
Rob Rix
ffaa893b43 Rephrase constructorForProductions using a where clause. 2015-12-16 16:01:26 -05:00
Rob Rix
42850ef44e Constructors take a list of production name/child pairs. 2015-12-16 15:59:07 -05:00
Rob Rix
8ace751fcf Move the source string to Constructor. 2015-12-16 15:55:12 -05:00
Rob Rix
49fe2fc030 Stub in a function which builds a Constructor given sets of keyed & fixed production names & a source string. 2015-12-16 15:54:05 -05:00
Rob Rix
7c093e81da Qualify the import of Data.Set. 2015-12-16 15:49:46 -05:00
Rob Rix
326a4c9709 Constructors take Info instead of just the production name. 2015-12-16 15:45:30 -05:00
Rob Rix
c3d80962a1 Stub in the type of a constructor function. 2015-12-16 15:41:36 -05:00
Rob Rix
6270b4aa7e Remove the Haskell module. 2015-12-16 15:36:08 -05:00
Rob Rix
36e7e49f72 Don’t attempt to parse Haskell sources. 2015-12-16 15:35:57 -05:00
Rob Rix
51098e2023 Pretend like we know what we’re doing & parse with Trifecta instead. 2015-12-16 11:48:09 -05:00
Rob Rix
3cae267d77 Add a function to parse into a leaf term.
We aren’t using the source positions yet because O(n) 😭 will have
to sort this out later.
2015-12-16 10:29:23 -05:00