12266 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Rix	1ca4d21c47	Merge branch 'master' into diffs-a-la-carte	2017-05-05 10:56:17 -04:00
Rob Rix	209a2de6b6	Merge branch 'master' into opt-in-anonymous-nodes	2017-05-05 10:56:14 -04:00
Timothy Clem	4a1f4de198	Merge pull request #1105 from github/fix-json-output ... Fix json output	2017-05-05 07:55:22 -07:00
Timothy Clem	e53a8342a3	Missing one case for this monoid instance to be associative	2017-05-05 07:52:14 -07:00
Rob Rix	ccf92f9808	Rename setCharacterRange -> setByteRange.	2017-05-05 09:32:15 -04:00
Rob Rix	d9b6c51319	Extract the wrapInBranch lambda into a binding.	2017-05-05 09:31:23 -04:00
Rob Rix	634b8e450f	Apply the fusion law.	2017-05-05 09:30:27 -04:00
Rob Rix	bee7d1ee6a	Merge branch 'master' into fix-json-output	2017-05-05 09:06:30 -04:00
Timothy Clem	bea5d66f3f	Bit more nuanced of a monoid instance for Value	2017-05-04 14:56:53 -07:00
Timothy Clem	702198ec91	Failing tests showing desired json output	2017-05-04 14:56:32 -07:00
Timothy Clem	477165a4c2	Collapse up and remove unused language extensions	2017-05-04 14:56:08 -07:00
Rob Rix	d6dbc534eb	Don’t bind variables we don’t use.	2017-05-04 17:36:03 -04:00
Rob Rix	d0603610cc	Update the JSON diff output fixtures.	2017-05-04 17:32:06 -04:00
Rob Rix	231abd6cb5	Generalize alignment over the syntax functor.	2017-05-04 17:31:45 -04:00
Rob Rix	5d206c3c9a	Merge branch 'master' into assignment-best-practices	2017-05-04 13:18:18 -04:00
Rob Rix	e943a5372c	Merge branch 'master' into diffs-a-la-carte	2017-05-04 13:18:12 -04:00
Rob Rix	9f1a4bc778	Merge branch 'master' into opt-in-anonymous-nodes	2017-05-04 13:18:00 -04:00
Rob Rix	9f302459c2	Merge pull request #1102 from github/🔥-split-renderer ... 🔥 split renderer	2017-05-04 13:17:38 -04:00
Rob Rix	13d6b313cb	Document how tokens are skipped.	2017-05-04 13:11:09 -04:00
Rob Rix	d62b6170e6	Document optional.	2017-05-04 13:04:54 -04:00
Rob Rix	64ada1c6c2	Document some/many repetitions.	2017-05-04 13:03:46 -04:00
Rob Rix	da158b4a12	Document committed choice.	2017-05-04 12:58:00 -04:00
Rob Rix	7467fabfa4	Document combining assignments with the various instances.	2017-05-04 12:25:05 -04:00
Rob Rix	a30769167c	Document 'pure' assignments.	2017-05-04 11:29:44 -04:00
Rob Rix	9644561a8d	Document the basic primitives.	2017-05-04 11:27:43 -04:00
Rob Rix	dde29370de	Simplify the initial discussion of Assignments.	2017-05-04 11:06:25 -04:00
Rob Rix	838262df2d	Clarify the assignment-context bit.	2017-05-04 11:04:42 -04:00
Rob Rix	aed82c030d	Merge branch 'master' into opt-in-anonymous-nodes	2017-05-04 11:02:30 -04:00
Rob Rix	a656a94664	Merge branch 'master' into diffs-a-la-carte	2017-05-04 11:02:22 -04:00
Rob Rix	9d5b040c42	Merge remote-tracking branch 'origin/master' into assignment-best-practices	2017-05-04 11:01:31 -04:00
Rob Rix	68b813d51b	Merge branch 'master' into 🔥-split-renderer	2017-05-04 10:59:21 -04:00
Timothy Clem	c0b52583e5	Merge pull request #1101 from github/bump-tree-sitter ... ++tree-sitter and friends and use new halt_on_error for parsing	2017-05-04 07:57:14 -07:00
Rob Rix	a14093bf06	Correct the usage for the -o flag.	2017-05-04 10:56:28 -04:00
Rob Rix	32a6901d38	📝 the module a bit.	2017-05-04 10:55:12 -04:00
Rob Rix	7de25c4c7c	🔥 tests of split output.	2017-05-04 10:16:15 -04:00
Rob Rix	f13e4511bf	🔥 the dependencies on blaze.	2017-05-04 10:11:21 -04:00
Rob Rix	9c2b7dfbe0	🔥 Renderer.Split.	2017-05-04 10:10:45 -04:00
Rob Rix	d085b11789	🔥 the split diff renderer.	2017-05-04 10:09:29 -04:00
Rob Rix	d5e0cd5693	🔥 the split diff arguments constructor.	2017-05-04 10:09:19 -04:00
Rob Rix	f385a6e54f	🔥 the --split renderer flag.	2017-05-04 10:09:02 -04:00
Timothy Clem	6e6d3e1432	Go tests with parse error have much smaller trees when we halt on error	2017-05-03 14:12:43 -07:00
Timothy Clem	31c01c0092	Give sExpressions output a trailing newline again	2017-05-03 14:11:37 -07:00
Timothy Clem	69b6c6b21e	Let reading from /dev/null throw - need emptySourceBlob for this case	2017-05-03 14:11:02 -07:00
Timothy Clem	8ff3b0dfbc	Fix up script/generate-example, no-index isn't a thing anymore	2017-05-03 14:07:16 -07:00
Rob Rix	d10ca290b9	Use diffMaybe instead of maybeLinearly.	2017-05-03 16:58:43 -04:00
Rob Rix	45406c5c81	Define a combinator for diffing in Maybe.	2017-05-03 16:56:15 -04:00
Rob Rix	a0df4f8845	Skip wrapping in Maybe.	2017-05-03 16:52:56 -04:00
Rob Rix	8a2725f524	Merge branch 'master' into diffs-a-la-carte	2017-05-03 16:38:09 -04:00
Rob Rix	d524fa05bb	Define Align-based GAlign instances for [] and Maybe.	2017-05-03 16:24:05 -04:00
Timothy Clem	c9f69c32b5	++haskell-tree-sitter to use halt_on_error	2017-05-03 13:22:46 -07:00