Josh Vera
5f9866f04d
Merge branch 'master' into diff-with-no-index
2016-09-30 14:56:14 -04:00
Rick Winfrey
bc02700086
Merge branch 'master' into parent-context
2016-09-30 10:49:46 -05:00
Rick Winfrey
ee4a89bfea
Update prependSummary so all Annotatable terms are prepended to the parentAnnotation
...
Since the paramorphism works by starting at leaves and working towards
the roots, prepending parentAnnotations with the current term means we
always ascribe parent contexts in the correct order (parent -> child ->
grand child …)
2016-09-30 10:03:11 -05:00
Rick Winfrey
9691d1269c
Update DiffSummary arbitrary instance ( 🔥 grandParentAnnotation)
2016-09-30 10:02:02 -05:00
Rick Winfrey
54eec372bf
Add parentContexts (and hsep)
...
hsep :: [Doc] -> Doc
The document (hsep xs) concatenates all documents xs horizontally with
(<+>).
(From Text.PrettyPrint.Leijen)
2016-09-30 10:01:33 -05:00
Rick Winfrey
197d8dc0af
🔥 maybeParentContext and maybeGrandParentContext
2016-09-30 10:00:33 -05:00
Rick Winfrey
b0fb1d4a6b
🔥 grandParentAnnotation
...
Also convert parentAnnotation to a [(Category, Text)], rather than
Maybe (Category, Text)
2016-09-30 10:00:03 -05:00
Rick Winfrey
243727d1b1
Remove doc formatting separator
2016-09-29 18:50:50 -05:00
Rick Winfrey
d42e79c189
Use annotatable smart constructor for determining grandParentAnnotation
2016-09-29 18:50:36 -05:00
Rick Winfrey
497421250f
Add annotatable smart constructor
2016-09-29 18:50:19 -05:00
Timothy Clem
e18da624da
Whoops, remove my test files
2016-09-29 16:25:26 -07:00
Timothy Clem
d03a0c78f7
Better to have these as their own data records
2016-09-29 16:22:45 -07:00
Timothy Clem
fb8849ecae
Refactor argument parsing
2016-09-29 15:56:39 -07:00
Timothy Clem
a269e6c28a
Merge branch 'diff-with-no-index-args-parse' into diff-with-no-index
2016-09-29 14:12:13 -07:00
Timothy Clem
f93f67ebf7
Merge branch 'master' of https://github.com/github/semantic-diff into diff-with-no-index
2016-09-29 13:15:52 -07:00
joshvera
ff7e2aa18a
Merge remote-tracking branch 'origin/master' into rws-large-diffs
2016-09-29 11:45:55 -04:00
Josh Vera
1c2eb9c687
Merge pull request #848 from github/named-functions
...
Disambiguate between named functions w/o params and anonymous functions with params
2016-09-29 11:45:11 -04:00
Timothy Clem
716a0a8f45
Disambiguate between named functions no params and anon functions with
2016-09-28 16:15:44 -07:00
joshvera
175dda93b3
Merge remote-tracking branch 'origin/master' into rws-large-diffs
2016-09-28 17:04:17 -04:00
Josh Vera
5a31d44a96
Merge pull request #842 from github/all-files
...
Compare all files for two commit shas when no specific file paths given
2016-09-28 15:17:07 -04:00
Josh Vera
118f2d0812
Merge branch 'master' into all-files
2016-09-28 15:05:24 -04:00
Josh Vera
f1fae662fe
Merge pull request #837 from github/improve-anonymous-function-summaries
...
Improve anonymous function summaries
2016-09-28 15:05:09 -04:00
Josh Vera
d04067346e
Merge branch 'master' into all-files
2016-09-28 15:02:10 -04:00
Josh Vera
a0cdf480d8
Merge branch 'master' into improve-anonymous-function-summaries
2016-09-28 15:01:38 -04:00
Josh Vera
b8443b2ef7
Merge pull request #845 from github/test-case-generator-docs
...
Add docs for options (-g)
2016-09-28 15:00:13 -04:00
Josh Vera
ff5c8874ed
Merge branch 'master' into all-files
2016-09-28 14:59:53 -04:00
joshvera
36f3f98d9e
indentation
2016-09-28 14:58:54 -04:00
joshvera
ee0b7a7132
Move minimumTermIndex to a function
2016-09-28 14:54:21 -04:00
Josh Vera
46a9766d28
Merge branch 'master' into test-case-generator-docs
2016-09-28 14:49:12 -04:00
Josh Vera
9fa777dea0
Merge branch 'master' into improve-anonymous-function-summaries
2016-09-28 14:48:25 -04:00
Josh Vera
390f8552fe
Merge pull request #844 from github/term-to-diff-info
...
Allow LeafInfo cases to fall through
2016-09-28 14:46:35 -04:00
joshvera
b4b02870f8
formatting
2016-09-28 13:25:50 -04:00
joshvera
088ad770a1
Merge remote-tracking branch 'origin/master' into rws-large-diffs
2016-09-28 13:23:56 -04:00
Timothy Clem
edacadaafd
Params before the word 'function'
2016-09-28 08:23:46 -07:00
Rick Winfrey
0aff617d07
🔥 comment -- context is no longer present
2016-09-28 08:50:44 -05:00
Rick Winfrey
8e67113507
🔥 MathAssignment termToDiffInfo case
2016-09-28 08:49:34 -05:00
Rick Winfrey
4dca35677c
🔥 Assignment termToDiffInfo case
2016-09-28 08:49:19 -05:00
Rick Winfrey
a227651831
🔥 Function termToDiffInfo case
2016-09-28 08:49:07 -05:00
Rick Winfrey
311f3a4223
🔥 Ternary termToDiffInfo case
2016-09-28 08:48:55 -05:00
Rick Winfrey
e19367e36b
🔥 AnonymousFunction termToDiffInfo case
2016-09-28 08:44:56 -05:00
Rick Winfrey
cc59a9e05c
🔥 unnecessary case condition
2016-09-28 08:43:27 -05:00
Rick Winfrey
d86c12d672
Output grandParentAnnotation doc
2016-09-28 08:01:40 -05:00
Rick Winfrey
139b45f3e4
Experiment with adding grandParentAnnotation to DiffInfo
2016-09-28 08:01:26 -05:00
Rick Winfrey
b27d45458d
Add grandParentAnnotation field to DiffInfo record
2016-09-28 08:00:31 -05:00
Timothy Clem
b8ad29fbca
Custom argument parsing for sha ranges and file paths
2016-09-27 14:56:29 -07:00
Timothy Clem
bbc6f06185
Cleanup use of qualified Prelude
2016-09-27 12:59:01 -07:00
Timothy Clem
d175993a3f
Use FilePath type
2016-09-27 12:58:45 -07:00
Josh Vera
8502663eac
Merge branch 'master' into all-files
2016-09-27 10:49:12 -04:00
Josh Vera
388ca5f71b
Merge branch 'master' into improve-anonymous-function-summaries
2016-09-27 10:48:03 -04:00
joshvera
3a05796f45
redundant constraints
2016-09-27 10:38:29 -04:00
