Rob Rix
|
07cf5dac3c
|
Add a (failing) test that multiple children on the same line get aligned.
|
2016-04-04 18:26:10 -04:00 |
|
Rob Rix
|
d35de99307
|
🔥 some redundant parens.
|
2016-04-04 18:25:44 -04:00 |
|
Rob Rix
|
50d18f4472
|
🔥 a do .
|
2016-04-04 18:19:58 -04:00 |
|
Rob Rix
|
eae8cf480b
|
Coalesce the patterns.
|
2016-04-04 18:06:54 -04:00 |
|
Rob Rix
|
23a2e300ae
|
intersects takes a single line.
|
2016-04-04 18:05:46 -04:00 |
|
Rob Rix
|
c79773ceea
|
🔥 an unused parameter.
|
2016-04-04 18:02:43 -04:00 |
|
Rob Rix
|
dd38cf4bd7
|
🔥 some redundant imports.
|
2016-04-04 18:02:32 -04:00 |
|
Rob Rix
|
8b2a9fb6d0
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
# Conflicts:
# src/Renderer/JSON.hs
# src/Renderer/Patch.hs
# test/CorpusSpec.hs
|
2016-04-04 18:00:25 -04:00 |
|
Rob Rix
|
20c7578807
|
Consume all of the lines in group2 .
|
2016-04-04 17:56:53 -04:00 |
|
Rob Rix
|
4cce0deb34
|
Merge pull request #533 from github/async
Asynchronously diff and timeout individual files
|
2016-04-04 17:40:55 -04:00 |
|
joshvera
|
928087e1f5
|
🔥
|
2016-04-04 17:38:58 -04:00 |
|
Rob Rix
|
f095c455a6
|
Merge branch 'master' into async
|
2016-04-04 17:31:05 -04:00 |
|
Rob Rix
|
06dd79dc76
|
Align patches.
|
2016-04-04 17:26:40 -04:00 |
|
Rob Rix
|
0132f180ed
|
🔥 an extra commented-out line.
|
2016-04-04 17:20:54 -04:00 |
|
joshvera
|
a553709112
|
Specialize Renderer to Text
|
2016-04-04 17:20:26 -04:00 |
|
Rob Rix
|
84fc0a54a9
|
Implement alignPatch over Delete/Insert.
|
2016-04-04 17:20:21 -04:00 |
|
Rob Rix
|
881d902d3c
|
Abstract alignSyntax over an Applicative instance.
This involves the use of a function which maps that functor into `Join
These`.
|
2016-04-04 17:18:29 -04:00 |
|
joshvera
|
3b752b834c
|
docs
|
2016-04-04 17:12:55 -04:00 |
|
joshvera
|
90013b1235
|
Rename printDiff to textDiff and printDiff' to printDiff
|
2016-04-04 17:08:29 -04:00 |
|
joshvera
|
506abacbc6
|
Document use of strictness in diffFiles
|
2016-04-04 17:03:35 -04:00 |
|
Rob Rix
|
c9fb18f128
|
🔥 the commented-out alignTerm.
|
2016-04-04 16:43:57 -04:00 |
|
Rob Rix
|
d2beafdc84
|
🔥 Both.unzip.
|
2016-04-04 16:25:16 -04:00 |
|
Rob Rix
|
df4247d0c9
|
alignSyntax takes the infos and syntax unpacked.
|
2016-04-04 15:54:38 -04:00 |
|
Rob Rix
|
013bf6e1c0
|
Extract alignSyntax to the top level.
|
2016-04-04 15:49:22 -04:00 |
|
Rob Rix
|
5ffd45ebe5
|
🔥 the old commented-out alignSyntax .
|
2016-04-04 15:47:43 -04:00 |
|
Rob Rix
|
de6696ce50
|
Simplify unzip using the Applicative instance.
|
2016-04-04 15:41:01 -04:00 |
|
Rob Rix
|
fd150be38e
|
🔥 bothOfThese .
|
2016-04-04 15:39:07 -04:00 |
|
Rob Rix
|
a33acf8bdf
|
Simplify maybeBothOfThese around fromThese .
|
2016-04-04 15:38:56 -04:00 |
|
Rob Rix
|
25bae5d9e0
|
Simplify bothOfThese around fromThese .
|
2016-04-04 15:38:07 -04:00 |
|
Rob Rix
|
f7c4c91cfe
|
Align Fixed nodes.
|
2016-04-04 15:22:14 -04:00 |
|
Rob Rix
|
6856151fe5
|
Extract a wrapInBranch function to construct branches.
|
2016-04-04 15:21:57 -04:00 |
|
Rob Rix
|
06c4759aed
|
Represent Both as Join (,) .
|
2016-04-04 15:01:47 -04:00 |
|
Rob Rix
|
60d6cfeb90
|
Use the curried both constructor.
|
2016-04-04 14:53:09 -04:00 |
|
Rob Rix
|
9476b1226d
|
🔥 the huge comment block.
|
2016-04-04 13:35:04 -04:00 |
|
Rob Rix
|
261cb17a9a
|
🔥 advanceLeft/advanceRight.
|
2016-04-04 13:34:43 -04:00 |
|
Rob Rix
|
cd1601efbe
|
Always advance on the intersecting side.
|
2016-04-04 13:34:21 -04:00 |
|
Rob Rix
|
16b08e3327
|
Advance along the sides that the child actually occupied.
|
2016-04-04 13:27:38 -04:00 |
|
Rob Rix
|
1f367274e7
|
advanceLeft/advanceRight are simple bifunctorial functions.
|
2016-04-04 13:21:05 -04:00 |
|
Rob Rix
|
522fd02b59
|
Rename first to firstLine.
|
2016-04-04 13:19:58 -04:00 |
|
Rob Rix
|
8a8f0b52a8
|
Merge branch 'master' into cofree-and-bifunctors-sitting-in-a-tree-a-l-i-g-n-edly
|
2016-04-04 12:44:23 -04:00 |
|
Rob Rix
|
3d4f9a83f0
|
Use mask to select only the sides that the original child had.
|
2016-04-04 12:44:05 -04:00 |
|
Rob Rix
|
bb38e3dfa6
|
Add yet another gross function, this time to mask These with another These.
This is a bit like some bimap version of <$.
|
2016-04-04 12:43:32 -04:00 |
|
Rob Rix
|
8971b40e77
|
Take both sides when merging.
|
2016-04-04 12:43:11 -04:00 |
|
joshvera
|
ba8fef376a
|
move to where clause
|
2016-04-02 13:28:17 -04:00 |
|
joshvera
|
4512344e3a
|
update dictionary.json.js
|
2016-04-01 16:07:05 -04:00 |
|
Rob Rix
|
7e23ffd86f
|
Concatenate the unused side after splitting.
I suspect this will behave identically, but it is slightly more
accurate to our intention.
|
2016-04-01 16:04:55 -04:00 |
|
joshvera
|
4a7004394b
|
fix tests
|
2016-04-01 15:53:16 -04:00 |
|
joshvera
|
cf898c66c6
|
Strictly render in diffFiles
|
2016-04-01 15:35:38 -04:00 |
|
joshvera
|
842a0f30af
|
Move emptyHunk to a function
|
2016-04-01 15:35:21 -04:00 |
|
joshvera
|
a18c2649d3
|
Add a truncatePatch function
|
2016-04-01 15:35:09 -04:00 |
|