1
1
mirror of https://github.com/github/semantic.git synced 2025-01-06 23:46:21 +03:00
Commit Graph

8770 Commits

Author SHA1 Message Date
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
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
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
783355427a ++text-icu 2016-09-14 09:16:54 -04:00
Rob Rix
86d2a3950f Revert "🔥 a redundant import."
This reverts commit dc5698979818d0057eb558ec3ce2d8e09c941f44.
2016-09-14 02:44:26 -04:00
Rob Rix
85bb9d577a Revert "Move totalSpan into Source."
This reverts commit 3085a4efe5b6b3e8807df6a05db784afccab58e2.
2016-09-14 02:41:28 -04:00
Rob Rix
25306dba99 🔥 a redundant import. 2016-09-14 02:19:24 -04:00
Rob Rix
6b65574193 Correct the end column.
Oy vey.
2016-09-14 02:18:57 -04:00
Rob Rix
979abfefab Avoid repeated Range computations. 2016-09-14 02:10:30 -04:00
Rob Rix
4a06d76054 Move cmarkParser to its own module. 2016-09-14 02:08:27 -04:00
Rob Rix
88865f2c09 Traverse nodes within their parent spans. 2016-09-14 02:04:38 -04:00
Rob Rix
da19d6672e Use totalSpan to define errorNode. 2016-09-14 01:58:38 -04:00
Rob Rix
6317228466 Move totalSpan into Source. 2016-09-14 01:57:51 -04:00
Rob Rix
f30fe7b358 Trim out nodes without positions. 2016-09-14 01:56:25 -04:00
Rob Rix
89a769ca35 Convert between 0- and 1-indexed spans. 2016-09-14 01:45:17 -04:00
Rob Rix
27d4cc0775 🔥 an obsolete comment. 2016-09-14 01:44:52 -04:00
Rob Rix
56fd38d9d3 Merge branch 'master' into markdown 2016-09-14 00:12:50 -04:00
Rick Winfrey
8ccf703f5f Update identifiable term to include MethodCall and DoWhile syntaxes constructors
- Unifies isIdentifiable and identifiable functions because
isIdentifiable is never applied on its own.

- Use lambda case and return partially constructed Identifiables.
2016-09-13 17:54:05 -05:00
Rick Winfrey
b9015c3ef5 Merge branch 'master' into do-while-diff-summaries 2016-09-13 16:11:07 -05:00
Rob Rix
5f771deb33 Merge branch 'master' into summarizing-pairs 2016-09-13 16:45:13 -04:00
Rob Rix
9e36a53f07 Merge pull request #825 from github/icu-fixes
ICU fixes
2016-09-13 16:44:51 -04:00
Timothy Clem
8762f6352a Merge remote-tracking branch 'origin/master' into summarizing-pairs 2016-09-13 12:48:51 -07:00
joshvera
c9d86fc930 ++text-icu 2016-09-13 15:45:44 -04:00
Timothy Clem
5caee16318 Use ellipsis for Unidentifiable too 2016-09-13 12:45:00 -07:00
Rob Rix
baba6eec73 🔥 the unused outputPath field from DiffArguments. 2016-09-13 15:40:53 -04:00