Rob Rix
5e3583240b
Merge branch 'master' into pretty-print-expectations
2016-09-15 15:12:40 -04:00
Rob Rix
d28f5e7995
Merge pull request #746 from github/do-while-diff-summaries
...
Retain context for in diff summary output for do-while statements
2016-09-15 15:12:15 -04:00
Rob Rix
57a7a01b77
Merge branch 'master' into do-while-diff-summaries
...
# Conflicts:
#
tools/semantic-git-diff/test/corpus/diff-summaries/javascript/chained-ca
llbacks.json
2016-09-15 15:04:33 -04:00
joshvera
24e02273d1
Clean up some insertDiff
2016-09-15 14:17:38 -04:00
joshvera
3d36d0fc59
Make sure isInMoveBounds is less than the sum of previous + defaultMoveBound
...
And change defaultMoveBound to 1
2016-09-15 14:09:23 -04:00
joshvera
61fe492616
Start at the lowest index in fas
2016-09-15 13:45:46 -04:00
joshvera
0abd720206
Recur into the tail if after is empty
2016-09-15 13:18:10 -04:00
joshvera
c26260057a
Use insertDiff to insert Theses in front of ambigous This and Thats
2016-09-15 13:12:48 -04:00
joshvera
f21420cb3d
Revert "Keep track of indices as Indices instead of These"
...
This reverts commit 5eacda831ecc80b9f8c1ca31babf4a7bcd33dcbd.
2016-09-15 12:01:00 -04:00
joshvera
169024f02e
Keep track of indices as Indices instead of These
2016-09-15 11:34:51 -04:00
Rob Rix
a66133e40f
Merge branch 'master' into markdown
2016-09-15 10:32:56 -04:00
Rob Rix
918f67c470
Merge pull request #820 from github/summarizing-pairs
...
Summarizing pairs
2016-09-15 09:56:32 -04:00
Rob Rix
980f89505e
🔥 more redundant constraints/imports.
2016-09-14 19:28:13 -04:00
Rob Rix
996f9f5fa7
Define <> locally.
2016-09-14 19:26:41 -04:00
Rob Rix
aa240c4e63
🔥 a slew of redundant constraints.
2016-09-14 19:23:54 -04:00
Rob Rix
fc43dd54a0
🔥 a redundant import.
2016-09-14 19:23:40 -04:00
Rob Rix
795b6acbea
🔥 half a function I didn’t mean to commit 😬
2016-09-14 19:21:04 -04:00
Rob Rix
7a0534eaaf
🔥 -threaded & -fprof-auto on the lib.
...
Because:
```
Warning: 'ghc-options: -threaded' has no effect for libraries. It
should only
be used for executables.
Warning: 'ghc-options: -with-rtsopts' has no effect for libraries. It
should
only be used for executables.
```
2016-09-14 19:15:52 -04:00
Timothy Clem
4645bbda08
Remove breakDownLeavesByWord entirely
2016-09-14 15:02:37 -07:00
Timothy Clem
b661b76278
Merge remote-tracking branch 'origin/master' into number-literal
2016-09-14 14:55:15 -07:00
Timothy Clem
6e0e1fabf9
Merge remote-tracking branch 'origin/master' into summarizing-pairs
2016-09-14 14:54:34 -07:00
Rick Winfrey
1a25bf9a11
Add RangeSpec to specs
2016-09-14 16:45:34 -05:00
Rick Winfrey
a4c5a26533
Add pretty diff expectations to semantic diff tests
2016-09-14 16:45:23 -05:00
Rick Winfrey
2f2dd26fbc
Add hspec-expectations-pretty-diff to semantic-diff
2016-09-14 16:44:46 -05:00
Rob Rix
25f4fa4bcb
Mergeable implies Functor.
2016-09-14 17:13:10 -04:00
Rick Winfrey
91b12b71d0
Change semantic-diff-test -> test
2016-09-14 16:12:06 -05:00
Rob Rix
ed2395b952
🔥 a redundant constraint.
2016-09-14 17:09:50 -04:00
Rob Rix
6dee6cdde9
Deal with some semigroups fallout.
2016-09-14 16:51:43 -04:00
Rob Rix
2e28d0d582
Data.These has its own Arbitrary instance these days.
2016-09-14 16:42:01 -04:00
Rob Rix
9f93b1090c
Corecursive, not Unfoldable.
2016-09-14 16:40:25 -04:00
Rob Rix
1df89950ab
Correct a conflict that got committed.
2016-09-14 16:39:33 -04:00
Rick Winfrey
eb38377489
Merge branch 'do-while-diff-summaries' of github.com:github/semantic-diff into do-while-diff-summaries
2016-09-14 15:34:22 -05:00
Rob Rix
e4505a8be0
Protolude has traceShowId now apparently.
2016-09-14 16:33:33 -04:00
Rick Winfrey
9ccc4fa10a
Merge branch 'master' into do-while-diff-summaries
2016-09-14 15:21:52 -05:00
Rob Rix
62196878fa
Merge branch 'master' into ghc8
...
# Conflicts:
# semantic-diff.cabal
# src/Diff.hs
# src/Term.hs
# src/Term/Arbitrary.hs
# stack.yaml
# tools/semantic-git-diff/src/SemanticDiff.hs
2016-09-14 16:12:47 -04:00
joshvera
2d16172528
Add a compareTheseMonotone function to order insertions after deletions, and compare by index
2016-09-14 15:25:11 -04:00
joshvera
899906c1e5
Change index type from Int to These Int Int
2016-09-14 15:14:17 -04:00
joshvera
0ea1298f48
Insert SES diffs into their correct place
2016-09-14 14:58:11 -04:00
joshvera
2aed2534e9
Remove the double succ calls
2016-09-14 14:00:13 -04:00
joshvera
d1bf3d8aea
Change Index state back to -1 for insertions
2016-09-14 13:58:21 -04:00
joshvera
d5c04e209b
Cleanup lint messages
2016-09-14 13:31:36 -04:00
joshvera
1ba892e286
clean up eitherCutoff
2016-09-14 13:30:43 -04:00
joshvera
42e09d37fa
Remove traceShow of diff indices
2016-09-14 13:28:12 -04:00
joshvera
5a86fa09a8
Don't insert the entire diff at the cutoff, insert the sub-diff back in
2016-09-14 12:21:27 -04:00
joshvera
8dae819bcd
Set the index of the inserted term as the state and return its own index in insertion
2016-09-14 11:20:24 -04:00
joshvera
cc91bc27d5
Advance the index of the other side of the diffs twice when inserting an insertion or a deletion
2016-09-14 11:19:56 -04:00
joshvera
f6a3cbfa4f
Start index state from 0
2016-09-14 11:19:29 -04:00
Rob Rix
98c2d550f6
Merge branch 'master' into markdown
2016-09-14 10:52:52 -04:00
Rob Rix
d206928b66
Merge pull request #828 from github/icu-tests
...
Add extra-libraries to text-icu for darwin
2016-09-14 10:48:18 -04:00
joshvera
07737280e2
Merge branch 'icu-tests' into rws-large-diffs
2016-09-14 09:25:02 -04:00
