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
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
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
1504a985de
Rename Parser to Parsers.
2015-12-16 16:21:49 -05:00
Rob Rix
6ea78f4318
Merge branch 'output-directory' into haskell-parser
2015-12-16 01:58:18 -05:00
Rob Rix
cd460e4567
Pass it to optional
to make it optional, apparently.
2015-12-16 01:53:18 -05:00
Rob Rix
d0c3650045
Split the lines.
2015-12-16 01:42:53 -05:00
Rob Rix
dcbba9bf1b
Replace the extension using the operator I guess?
2015-12-16 01:41:45 -05:00
Rob Rix
b26f16478f
Provide a default value for the option.
...
I’m not sure that this is the best way of doing this.
2015-12-16 01:37:05 -05:00
Rob Rix
923e54ff9d
Pick a filename if the output path is a directory.
2015-12-16 01:28:40 -05:00
Rob Rix
3a4c9f733d
Move the write
binding to the outer where clause.
2015-12-16 01:22:48 -05:00
Rob Rix
ed26ed4b80
Break the lambda out into a where clause.
2015-12-16 01:10:20 -05:00
Rob Rix
599663e83d
🔥 writeToFile.
2015-12-16 00:44:26 -05:00
Rob Rix
ba437bd477
Use case analysis instead of maybe
.
2015-12-16 00:43:13 -05:00
Rob Rix
1ea542fccb
Write split diffs to the output path or stdout.
2015-12-16 00:40:59 -05:00
Rob Rix
3216f77fce
Add a helper to write files out.
2015-12-16 00:40:12 -05:00
Rob Rix
25394d2923
Import System.IO.
2015-12-16 00:39:07 -05:00
Rob Rix
5242c21b7a
Rename the rendered diff bindings.
2015-12-16 00:26:13 -05:00
Rob Rix
0181673e55
Document the output option.
2015-12-15 23:33:48 -05:00
Rob Rix
d733d0627f
Add an optional output dir argument.
2015-12-15 23:31:36 -05:00
Rob Rix
6b61950e6e
Ditto for the field.
2015-12-15 23:24:04 -05:00
Rob Rix
d174a0c8c8
Rename Output to Renderer.
2015-12-15 23:23:45 -05:00
Rob Rix
d28ab9041d
Use the strArgument shorthand.
2015-12-15 23:20:33 -05:00
joshvera
5fe694d2b8
nope gotta normalize sources in main
2015-12-15 17:42:37 -05:00
joshvera
d4b41f8109
just use TextIO.readFile
2015-12-15 16:08:35 -05:00
Rob Rix
8e154e0016
Move parserForType into Parser.
2015-12-15 14:36:25 -05:00
Rob Rix
ac042e0c4a
Remove some unnecessary parameters from makeLeaf.
2015-12-15 14:36:03 -05:00
joshvera
6eb8172fe4
output split diffs as Text
2015-12-15 13:29:58 -05:00
Rob Rix
3c8b79f0b0
Correct some merge confusion.
2015-12-14 17:22:53 -05:00
Rob Rix
cded6c0d7d
Get the substrings out at the same time as computing the ranges.
2015-12-14 15:37:30 -05:00
Rob Rix
df4b74876a
Rename the word ranges function.
2015-12-14 15:31:45 -05:00
Rob Rix
9c1dd640f5
Don’t bind subrange, since we only use it once.
2015-12-14 14:41:12 -05:00
Rob Rix
1d9e945aad
Pass absolute start indices to children.
2015-12-14 14:40:30 -05:00
Rob Rix
714c8ff682
Compute the substring from the subrange.
2015-12-14 14:39:50 -05:00
Rob Rix
37f236d7d7
Remove redundant imports.
2015-12-14 14:15:46 -05:00
Rob Rix
4083829e12
Bind a different variable for the subrange.
2015-12-14 13:04:21 -05:00
Rob Rix
c115262f7f
Share a single computation of the substring for each case.
2015-12-14 13:01:17 -05:00
Rob Rix
718399c7d9
Compute the substring once and only once.
2015-12-14 12:59:47 -05:00
Rob Rix
bf9aa915a3
Move rangesOfWordsFrom into Range.hs.
2015-12-14 12:44:48 -05:00
Rob Rix
8acc962ad2
Offset leaves’ ranges to get the substrings.
2015-12-14 12:40:08 -05:00
Rob Rix
bac6b696a5
Make leaves within the parent’s substring.
2015-12-14 12:39:56 -05:00
Rob Rix
dbce74368f
Pass the start index to makeLeaf.
2015-12-14 12:39:09 -05:00
Rob Rix
41032f0399
We don’t need a $ here.
2015-12-14 12:37:23 -05:00
Rob Rix
6fc7632e93
Only pass the start index around.
2015-12-14 12:37:07 -05:00
Rob Rix
774f731ab1
Pass the source to makeLeaf.
2015-12-14 12:35:16 -05:00
Rob Rix
4dd9907130
Try negating the offset.
2015-12-14 12:34:18 -05:00
Rob Rix
4cd2b2db7a
Parentheses are not required here.
2015-12-14 12:25:09 -05:00
Rob Rix
a239384831
Work within recursively smaller and smaller substrings.
...
This resolves the O(n²) behaviour we were seeing.
2015-12-14 12:24:55 -05:00
Rob Rix
79e4860c62
Pass the source & root to recursive invocations.
2015-12-14 12:18:58 -05:00
Rob Rix
039e5849ca
Revert "Shadow the outer function’s name."
...
This reverts commit 4cb7c975334d540b9ef08d59724536d2bbd8fda0.
2015-12-14 12:17:35 -05:00
Rob Rix
c004eb739e
Revert "Push the inner function out and operate within substrings."
...
This reverts commit 435ba7a2e35d9a4bb61413b91895b88bf3cb2be9.
2015-12-14 12:17:30 -05:00
Rob Rix
b08bb04767
Push the inner function out and operate within substrings.
2015-12-14 12:16:44 -05:00
Rob Rix
1c3db7ae47
Shadow the outer function’s name.
2015-12-14 12:15:55 -05:00
Rob Rix
ae047f3012
Reorder the parameters for partial application.
2015-12-14 12:15:28 -05:00
Rob Rix
6dbaf9f53a
Replace wordy leaves in both terms.
2015-12-14 12:13:18 -05:00
Rob Rix
36747be406
Add a function replacing wordy leaves in a term with branches of per-word leaves.
2015-12-14 12:09:21 -05:00
Rob Rix
0944591fab
Add a function computing the ranges of non-whitespace substrings within a string.
2015-12-14 12:08:33 -05:00
Rob Rix
9e8a6f8456
Default to the line by line parser.
2015-12-09 10:36:37 -05:00
Rob Rix
a75c1b0482
No need to reinvent fmap.
2015-12-09 10:18:52 -05:00
Rob Rix
da3634c59a
parserForType
returns a Parser.
...
This change moves the languages out of IO. I believe this to be correct
(as they should be referentially transparent) but we may wish to review
that carefully.
2015-12-09 10:11:30 -05:00
Rob Rix
d7f415da04
Move all of the tree-sitter stuff into its own module.
2015-12-09 09:58:15 -05:00
Rob Rix
dcbf7bafb7
Use the Parser type.
2015-12-09 09:50:55 -05:00
Rob Rix
49910d1d1e
Render HTML to Html.
2015-12-07 14:34:58 -05:00
Rob Rix
a5e7341322
Push the let bindings out a bit.
2015-12-07 14:23:32 -05:00
joshvera
395cfde9aa
takeExtension returns extensions with dots
2015-12-04 16:25:01 -05:00
joshvera
d7089ec506
Remove unused parser type
2015-12-03 15:54:41 -05:00
joshvera
395eee7f7c
Merge remote-tracking branch 'origin/split-diffs-in-haskell' into select-grammar
2015-12-03 15:50:26 -05:00
joshvera
d43ced80f5
we just say ts_language_javascript
2015-12-03 15:34:41 -05:00
joshvera
79f2f94c2c
Add ts_language_js as a language
2015-12-03 15:21:34 -05:00
joshvera
c20ea6ee78
Switch parsers on mediaType
2015-12-03 15:10:49 -05:00
joshvera
370fbe4819
remove duplicate imports
2015-12-03 14:03:10 -05:00
joshvera
2a063d3277
Move Range to a module
2015-12-02 21:40:34 -05:00
joshvera
1dd8d93ce1
use fromIntegral
2015-12-02 14:29:19 -05:00
Rob Rix
25b1756419
Populate the line range.
2015-12-01 15:04:23 -05:00
Rob Rix
1b5f6b848d
stub line ranges in Info
2015-12-01 14:51:21 -05:00
Rob Rix
8600d7d71b
Stub in split diff rendering.
2015-12-01 11:33:16 -05:00
Rob Rix
226dc1e966
Hide Data.Set.split
.
2015-12-01 11:33:10 -05:00
Rob Rix
5512f48ee5
Add a --split
option.
2015-12-01 11:32:52 -05:00
Rob Rix
f655c414f7
Bind the diff outside the output.
2015-12-01 11:26:46 -05:00
Rob Rix
bfb982f69e
Only format unified diffs when --unified is used.
2015-12-01 11:24:33 -05:00
Rob Rix
e8609ba886
Remove files
.
2015-12-01 11:22:28 -05:00
Rob Rix
0dbfbba869
Use the parsed arguments.
2015-12-01 11:22:26 -05:00
Rob Rix
250f52e01a
Parse the args with our parser.
2015-12-01 11:19:40 -05:00
Rob Rix
2976bb1f18
Add a parser for our arguments.
2015-12-01 11:15:13 -05:00
Rob Rix
b98839393d
Split the sources up into fields.
2015-12-01 11:15:05 -05:00
Rob Rix
3c1c4e6911
Add the model for our arguments.
2015-12-01 11:08:04 -05:00
Rob Rix
a2f190fb14
Export substring.
2015-11-27 12:49:46 -05:00
Rob Rix
4aa89bd919
Print out the unified diff.
2015-11-27 12:42:00 -05:00
Rob Rix
070e60f149
Alphabetical order.
2015-11-27 12:41:38 -05:00
Rob Rix
acfb27ba9b
Diff things.
2015-11-27 12:22:05 -05:00
Rob Rix
908d6b9de0
Ingest Keyed nodes.
2015-11-27 09:19:40 -05:00
Rob Rix
1ecad15128
Import Data.Map again.
2015-11-27 09:19:09 -05:00
Rob Rix
854e2f7013
withNamedChildren returns name/child pairs.
2015-11-27 09:19:02 -05:00
Rob Rix
2353cf3798
Rename the parameter.
2015-11-26 16:28:17 -05:00
Rob Rix
0e68767028
Close over the function.
2015-11-26 16:27:57 -05:00