2731 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
joshvera	395eee7f7c	Merge remote-tracking branch 'origin/split-diffs-in-haskell' into select-grammar	2015-12-03 15:50:26 -05:00
joshvera	5772279644	use tree-sitter-js fork	2015-12-03 15:47:16 -05:00
joshvera	fae0a806f3	use ts_language_javascript	2015-12-03 15:44:08 -05:00
joshvera	d43ced80f5	we just say ts_language_javascript	2015-12-03 15:34:41 -05:00
joshvera	268e89b018	++tree-sitter-javascript	2015-12-03 15:32:34 -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
Rob Rix	dd7450ff6e	Stub in adjoinRows with the identity case.	2015-12-03 12:26:36 -05:00
Rob Rix	9ac697834e	Row is Equatable and can be Shown.	2015-12-03 12:26:25 -05:00
Rob Rix	56a8386473	Append the last on the left to the first on the right.	2015-12-03 12:13:47 -05:00
Rob Rix	9459b28935	Destructure and append the first lines only.	2015-12-03 12:09:28 -05:00
Rob Rix	ea58415617	Test the multiple line cases.	2015-12-03 12:07:03 -05:00
Rob Rix	dc71ae150d	Identity case.	2015-12-03 12:03:16 -05:00
Rob Rix	b1c593173f	Test that empty lines are the left unit with multiple lines.	2015-12-03 11:58:34 -05:00
Rob Rix	1f6ef522c6	Concatenate lines.	2015-12-03 11:57:13 -05:00
Rob Rix	6d13e98b6a	Line is a Monoid.	2015-12-03 11:57:09 -05:00
Rob Rix	8324f3b066	Test that single lines are concatenated.	2015-12-03 11:52:46 -05:00
Rob Rix	6ef2eb89fc	Return the current element.	2015-12-03 11:52:02 -05:00
Rob Rix	cfda7c8ff2	Export everything for testing.	2015-12-03 11:50:51 -05:00
Rob Rix	14911bf272	Test that empty lines are the left unit.	2015-12-03 11:47:51 -05:00
Rob Rix	8e66656105	Document adjoinLines a little.	2015-12-03 11:47:42 -05:00
Rob Rix	aa1db29cc7	Stub in a test test of adjoinLines.	2015-12-03 11:44:42 -05:00
Rob Rix	0c34de972b	This has to be named Main for now.	2015-12-03 11:44:28 -05:00
Rob Rix	af105ebb88	derive Eq	2015-12-03 11:42:44 -05:00
Rob Rix	9a729a246b	Export adjoinLines.	2015-12-03 11:41:15 -05:00
Rob Rix	a90a22e454	Stub in a function to adjoin pairs of lines.	2015-12-03 11:41:02 -05:00
Rob Rix	720c3c0dba	Add a Line type.	2015-12-03 11:40:54 -05:00
Rob Rix	659c109c64	Spec!	2015-12-03 11:38:49 -05:00
Rob Rix	950f40693f	The tests depend on hspec.	2015-12-03 11:38:43 -05:00
Rob Rix	815494b619	Copy the necessary dependencies into the library.	2015-12-03 11:38:37 -05:00
Rob Rix	bbcb3be6fc	Move Split & Unified into the library.	2015-12-03 11:37:18 -05:00
Rob Rix	51db79e961	(Incorrect) rendering of indexed nodes to rows.	2015-12-03 11:36:00 -05:00
Rob Rix	80dcd8efae	Return ranges from diffToRows.	2015-12-03 10:50:03 -05:00
Rob Rix	ffcb4d9c98	Zip left/right elements together.	2015-12-03 10:39:48 -05:00
Rob Rix	b075e8b18f	Add zipMaybe.	2015-12-03 10:36:17 -05:00
Rob Rix	f8f392262d	Collect the left/right elements.	2015-12-03 10:20:02 -05:00
Rob Rix	db0b5eca8f	Remove an unused import.	2015-12-03 10:19:24 -05:00
Rob Rix	ba2b58f66b	Turn off -Werror. ... This apparently controls the severity of assertions from hlint as well, which was making it difficult to understand what was actually a problem in the source.	2015-12-03 10:15:00 -05:00
Rob Rix	6a3fc9b6b9	Destructure the annotations.	2015-12-03 10:13:24 -05:00
Rob Rix	7873b0e6f3	Rename freeSyntaxToSplit to annotationAndSyntaxToRows.	2015-12-03 10:09:01 -05:00
Rob Rix	6a05ca0b25	Rename straightToSplit to diffToRows.	2015-12-03 10:07:26 -05:00
Rob Rix	485959b135	Row’s constructor is curried.	2015-12-03 10:06:39 -05:00
Rob Rix	bc57f7f871	Simplify Row to two HTML elements.	2015-12-03 10:05:18 -05:00
Rob Rix	c246b08cf4	Pass the annotations to freeSyntaxToSplit.	2015-12-03 10:03:45 -05:00
Rob Rix	1c55552a1b	Delegate free rendering to freeSyntaxToSplit.	2015-12-03 10:02:52 -05:00
Rob Rix	676c5c67ab	Compute the rows for free leaves.	2015-12-03 10:02:30 -05:00
Rob Rix	8db4f0f947	Add a Row type.	2015-12-03 10:02:08 -05:00
Rob Rix	f97b2aa8b4	Stub in a function rendering split diffs directly.	2015-12-03 09:10:00 -05:00
Rob Rix	4853095dbd	Merge branch 'split-diffs-in-haskell' of https://github.com/github/semantic-diff into split-diffs-in-haskell	2015-12-03 09:05:59 -05:00