1
1
mirror of https://github.com/github/semantic.git synced 2024-12-23 14:54:16 +03:00
Commit Graph

1322 Commits

Author SHA1 Message Date
joshvera
bfe57829d6 Merge remote-tracking branch 'origin/master' into rws-large-diffs 2016-09-27 10:34:19 -04:00
Timothy Clem
b5c45f8c7c New expected json output for dictionary 2016-09-20 10:31:50 -07:00
Timothy Clem
bf2c5966ba Merge branch 'master' of https://github.com/github/semantic-diff into improve-number-summaries 2016-09-20 08:01:37 -07:00
Timothy Clem
7c390d9081 Merge branch 'master' of https://github.com/github/semantic-diff into improve-number-summaries 2016-09-19 15:27:00 -07:00
Timothy Clem
d632011a3c Fix up tests 2016-09-19 15:23:07 -07:00
Rob Rix
8cec95aad4 Merge branch 'master' into pretty-print-expectations
# Conflicts:
#	script/cibuild-semantic-diff
#	script/cibuild-semantic-diff-linux
#	test/RangeSpec.hs
#	test/Spec.hs
2016-09-20 05:56:12 +09:00
Timothy Clem
edb69e2c69 Fix test, category printed as NumberLiteral now 2016-09-19 13:33:02 -07:00
Rob Rix
38d6bbe644 Merge branch 'master' into ghc8 2016-09-17 20:45:58 -04:00
joshvera
925fdfaeaf remove &&& import 2016-09-16 11:52:31 -04:00
joshvera
0535744ebc more imports 2016-09-16 11:48:58 -04:00
Rob Rix
e6372deeb6 🔥 a redundant constraint. 2016-09-15 18:38:18 -04:00
Rob Rix
8d465b96ab Annotate the leaf type. 2016-09-15 18:34:54 -04:00
Rob Rix
97b7f27683 Give a type signature for decorate.
This fixes a problem where ghc will loop forever trying to infer the
type.
2016-09-15 18:32:57 -04:00
Rob Rix
d0395cd227 🔥 some redundant parens. 2016-09-15 18:12:32 -04:00
Rob Rix
64d1d6b407 Monoid/Semigroup stuff. 2016-09-15 17:21:37 -04: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
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
6317228466 Move totalSpan into Source. 2016-09-14 01:57:51 -04:00
Rob Rix
a6633a5351 🔥 a redundant binding. 2016-09-13 15:10:49 -04:00
Rob Rix
1c335df1f0 Verify that sourceSpanToRange computes correct ranges within lines. 2016-09-13 15:04:17 -04:00
Rob Rix
e6f4db8ee8 Compute the insetting of SourceSpans & Ranges. 2016-09-13 15:03:58 -04:00
Rob Rix
50e5f8a411 Verify that sourceSpanToRange computes multi-line ranges. 2016-09-13 14:27:52 -04:00
Rob Rix
8de562b88e Verify that totalSpan covers multiple lines. 2016-09-13 14:27:36 -04:00
Rob Rix
1b890bcde4 Verify that totalSpan covers single lines. 2016-09-13 14:27:29 -04:00
Rob Rix
8bdf162874 Rename the line-by-line test. 2016-09-13 14:27:15 -04:00
Rob Rix
c157962785 Add a helper to compute the total span of some source. 2016-09-13 14:27:05 -04:00
Rob Rix
6ce0ce5e26 Indentation. 2016-09-13 13:14:02 -04:00
Rob Rix
c5fed4ac25 Test sourceSpanToRange across arbitrary sources. 2016-09-13 12:37:59 -04:00
Rob Rix
61dd23789d Rename the test. 2016-09-13 12:32:28 -04:00
Rob Rix
5459bd4313 🔥 This was wrong. 2016-09-13 12:23:25 -04:00
Rob Rix
77ddc0abd8 Source spans are zero-indexed. 2016-09-13 12:23:05 -04:00
Rob Rix
b7d9ab1875 Add a trivial test of SourceSpan -> Range computation. 2016-09-13 12:09:18 -04:00
Rob Rix
076f5c0d1e Stub in a spec for sourceSpanToRange. 2016-09-13 11:59:46 -04:00
Rob Rix
b5d14e702c Test that actualLineRanges is exhaustive. 2016-09-13 11:56:43 -04:00
Rob Rix
04519db7a9 Verify that actualLineRanges produces the intended # of lines. 2016-09-13 11:39:27 -04:00
Rob Rix
8d5bc01a75 Run the Source spec. 2016-09-13 11:39:05 -04:00
Rob Rix
dcc164d09f Add a spec for Source. 2016-09-13 11:35:10 -04:00
Rob Rix
2b34916554 Build and run RangeSpec 😔 2016-09-13 11:18:38 -04:00
joshvera
d3440439dc Merge remote-tracking branch 'origin/master' into rws-large-diffs 2016-09-12 14:55:20 -04:00
joshvera
dbb687b33e Split Term and Diff into SyntaxTerm and SyntaxDiff types as well 2016-09-09 14:51:20 -04:00
Rob Rix
8d955c3f96 Placate hlint. 2016-09-09 14:47:24 -04:00
Rob Rix
98637ad656 Generalize Term/TermF & Diff/DiffF over the functor. 2016-09-09 14:46:50 -04:00
joshvera
499f5da329 Export isBranchInfo and clean up some warnings 2016-08-25 12:22:58 -04:00
joshvera
17da45b320 Moved isBranchInfo to DiffSummary 2016-08-24 15:28:10 -04:00
joshvera
3b33c6860f Update some test diffs 2016-08-22 10:33:42 -04:00
joshvera
9064e5f047 Fix up semantic-diff-tests 2016-08-22 10:33:26 -04:00
Rob Rix
7009d9ac2b Move the multiple hunks fixture back to the main diffs list. 2016-08-18 15:33:14 -04:00
Rob Rix
00689650dd Use the defaultFeatureVectorDecorator in the tests. 2016-08-18 14:03:36 -04:00
Rob Rix
d169e6fa66 Spacing. 2016-08-18 12:51:07 -04:00
Rob Rix
b14a7765e6 Copy in b. 2016-08-18 11:40:39 -04:00
Rob Rix
ecaff655c1 Extract a function to copy terms in. 2016-08-18 11:40:33 -04:00
Rob Rix
cabf1a887e Compute recursive as copies instead of replacements.
This should make us more accurate to the tests of Interpreter.
2016-08-18 11:37:55 -04:00
Rob Rix
02bb72ee0b Move compare to the where clause. 2016-08-18 11:25:21 -04:00
Rob Rix
8aa0f082a6 Bump _q_ in all of the specs.
Figure it’s best if they use the same value for the parameter.
2016-08-18 11:23:21 -04:00
joshvera
c09887b8df update semantic-diff tests 2016-08-17 11:24:12 -04:00
joshvera
b4133bdcac Map comma operators to flattened indexed nodes 2016-08-16 17:24:06 -04:00
Rob Rix
9dcbe04297 Move the multiple hunks fixture to the todo list.
See also #682.
2016-08-12 13:43:00 -04:00
Rob Rix
e820b43469 🔥 a redundant import. 2016-08-12 13:40:41 -04:00
Rob Rix
b91b305f32 Re-enable the RWS insertion bias tests. 2016-08-12 13:22:55 -04:00
Rob Rix
443df7da7c Merge branch 'unbiased-branch-diff-tests-that-actually-test-branch-diff-bias' into unbiased-branch-diffs
# Conflicts:
#	src/Diffing.hs
#	test/CorpusSpec.hs
#	tools/semantic-git-diff/test/corpus/diff-summaries.json
2016-08-12 13:04:33 -04:00
Rob Rix
d9be26396c Make the RWS test pending on #683. 2016-08-12 12:58:37 -04:00
Rob Rix
2b35110d0a 🔥 the faulty tests of unbiased branch diffs. 2016-08-12 12:24:38 -04:00
Rob Rix
ff4861e2fb Add the unbiased insertion test to the Interpreter spec. 2016-08-12 12:16:48 -04:00
Rob Rix
d3c333ae64 🔥 the faulty tests of unbiased insertions. 2016-08-12 11:59:44 -04:00
Rob Rix
b1e893b3f8 Add a concrete test of unbiased insertions. 2016-08-12 11:59:09 -04:00
Rob Rix
ada00d0485 The RWS unbiased tests require disjoint syntax constructors. 2016-08-12 11:44:29 -04:00
Rob Rix
5462278d0f Use the replacing combinator in the tests. 2016-08-12 11:44:23 -04:00
Rob Rix
bcaf909957 Revert "Mark the (failing) rws tests as pending for the time being."
This reverts commit a9025cacda01db216590e99dd36e867611e0f953.
2016-08-12 11:44:18 -04:00
Rob Rix
fa983e5561 Add a concrete test of unbiased deletions. 2016-08-12 11:40:30 -04:00
Rob Rix
2eead056e1 The RWS unbiased tests require disjoint syntax constructors. 2016-08-12 09:56:24 -04:00
Rob Rix
7bbbc4cbea Use the replacing combinator in the tests. 2016-08-12 09:53:16 -04:00
Rob Rix
0eb43f47a3 Use wrap in the RWS correctness test. 2016-08-12 09:46:45 -04:00
Rob Rix
df25851902 Revert "Mark the (failing) rws tests as pending for the time being."
This reverts commit a9025cacda01db216590e99dd36e867611e0f953.
2016-08-12 09:13:52 -04:00
Rob Rix
73f73fdb40 Mark the (failing) rws tests as pending for the time being. 2016-08-11 15:24:02 -04:00
Rob Rix
86fd5b21fd Use the replacing smart constructor. 2016-08-11 14:42:17 -04:00
Rob Rix
0346b5d8f1 Use galign to ensure that the constructors are disjoint. 2016-08-11 14:32:10 -04:00
Rob Rix
0fc0e80ed9 Revert "Revert "Ensure that the syntaxes are disjoint.""
This reverts commit cfe27aec6f0764f451c493439086e03a1bdcf176.
2016-08-11 13:33:33 -04:00
Rob Rix
d9b48b6def Revert "Ensure that the syntaxes are disjoint."
This reverts commit 43ebf52752a8cf22ae18633a5667966fd3f74aa0.
2016-08-11 13:28:51 -04:00
Rob Rix
70a622ca84 Ensure that the syntaxes are disjoint. 2016-08-11 13:27:45 -04:00
Rob Rix
fd23564dd5 Use a single root function for both interpreter tests. 2016-08-11 13:05:36 -04:00
Rob Rix
3eb05a31b1 Test the interpreter against insertions as well. 2016-08-11 13:03:22 -04:00
Rob Rix
fd2274b997 Use a single annotation for both children. 2016-08-11 13:00:54 -04:00
Rob Rix
261e82fd21 Extract a constructor for the root terms. 2016-08-11 12:54:14 -04:00
Rob Rix
7d8eb02ec8 Strip the diff and terms in the rws correctness test. 2016-08-11 12:50:56 -04:00
Rob Rix
3bb86389ed Strip the diff in the replacement of unicode equivalent terms test. 2016-08-11 12:48:41 -04:00
Rob Rix
15b515e7a1 Strip the diff in the correctness test. 2016-08-11 12:48:27 -04:00
Rob Rix
336f37d0c8 Strip diffs in the unbiased test. 2016-08-11 12:45:40 -04:00
Rob Rix
0aef8a8467 Use stripDiff in the RWS spec. 2016-08-11 12:44:49 -04:00
Rob Rix
8d22e7bd85 Pointfree definition of root. 2016-08-11 12:37:19 -04:00
Rob Rix
7bb5d7cd36 Use a single function to compute both roots. 2016-08-11 12:36:41 -04:00
Rob Rix
b551f9c3d9 Test that the bias of interpreter by reversing the inputs & output. 2016-08-11 12:34:32 -04:00
Rob Rix
af831671bc Interpreter uses category equality. 2016-08-11 12:32:44 -04:00
Rob Rix
544a6d3daf RWS uses category equality for its comparisons. 2016-08-11 12:31:44 -04:00
Rob Rix
fd6701973f Replace termA/termB with functions. 2016-08-11 12:25:30 -04:00
Rob Rix
fb847d9d3f Add a test that interpreter is unbiased for deletions. 2016-08-11 12:23:34 -04:00
Rob Rix
e4c55a8dbd Add (failing) tests of rws’ bias. 2016-08-11 11:53:51 -04:00
Rob Rix
f7055f16e8 Extract the decorating of arbitrary terms. 2016-08-11 10:27:11 -04:00
joshvera
21cb7f71d7 Merge 'origin/master' into one-json-to-rule-them-all 2016-08-10 17:33:11 -04:00
joshvera
59932277f9 Merge remote-tracking branch 'origin/master' into one-json-to-rule-them-all 2016-08-10 13:49:26 -04:00
joshvera
ae0f18593b Remove redundant imports 2016-08-10 12:18:53 -04:00
joshvera
347f4fbb4b Concat outputs in CorpusSpec 2016-08-10 12:17:33 -04:00
joshvera
1c1938080c Use either path in output 2016-08-10 11:00:40 -04:00
joshvera
dfbc5e1867 infix 2016-08-10 10:58:41 -04:00
joshvera
d09c1314a4 infix 2016-08-10 10:56:28 -04:00
joshvera
1574e74bcb Normalize names before unioning 2016-08-10 10:55:48 -04:00
joshvera
9df1399168 output the inserted/deleted path in the patch header 2016-08-09 16:14:46 -04:00
joshvera
25a53ac718 add file addition and deletion tests 2016-08-09 16:14:46 -04:00
joshvera
c286b39146 Fix oids 2016-08-09 16:14:46 -04:00
joshvera
07dfb0f5d8 handle missing files in CorpusSpec 2016-08-09 16:14:46 -04:00
joshvera
55afdaba17 Add new file patch test 2016-08-09 16:14:46 -04:00
joshvera
0bee997724 fix tests 2016-08-08 14:59:51 -04:00
joshvera
ce149af0f6 ++js-test ++tree-sitter-parsers 2016-08-01 12:23:15 -04:00
joshvera
1c5f94631c s/diffSummary/diffSummaries 2016-07-29 18:38:46 -04:00
joshvera
b354ed61d9 ++js-test 2016-07-29 16:57:30 -04:00
joshvera
b242555021 ++js-test 2016-07-29 16:34:09 -04:00
joshvera
04a976969e ++js-test 2016-07-29 16:16:58 -04:00
joshvera
380e980250 annotate sources 2016-07-29 14:34:28 -04:00
joshvera
1ba42a9d0f Add Ranges to DiffSummarySpec 2016-07-29 14:31:02 -04:00
joshvera
aa99744db7 Remove SourceSpan from Record 2016-07-29 14:12:44 -04:00
joshvera
fbc9e335a3 Merge remote-tracking branch 'origin/master' into error-syntax 2016-07-29 11:44:38 -04:00
joshvera
5caa439bec ++js-test 2016-07-28 14:29:24 -04:00
joshvera
8b0f496b90 Merge remote-tracking branch 'origin/master' into error-syntax 2016-07-27 19:00:27 -04:00
joshvera
ba7d599aa3 Add SourceSpan to tests 2016-07-27 18:49:21 -04:00
joshvera
b5b3391786 add missing unwrap 2016-07-26 16:44:33 -04:00
joshvera
4bd4a93a0c ++js-test 2016-07-26 16:34:28 -04:00
joshvera
804a8457a5 ++js-test for errors.js 2016-07-26 16:30:12 -04:00
joshvera
5eece69994 Use any 2016-07-26 16:29:46 -04:00
Rob Rix
cfddd9ca75 Merge branch 'master' into sequenceable 2016-07-26 15:43:02 -04:00
Rob Rix
e5f9d1ed28 Test the Mergeable laws over lists. 2016-07-26 15:27:32 -04:00
Rob Rix
475ec475b6 Weaken the identity laws to be non-empty. 2016-07-26 15:27:16 -04:00
Rob Rix
dd0b0322fc Add a property demonstrating the relationship between sequenceAlt over [Maybe a] & pure . catMaybes. 2016-07-26 14:56:02 -04:00
Rob Rix
cfb7361b9c Scale the list generator. 2016-07-26 14:44:25 -04:00
joshvera
044aa782c1 partially apply isBranchNode 2016-07-26 14:36:56 -04:00
joshvera
e7000b7de3 s/expression_statement/expression_statements 2016-07-26 14:26:31 -04:00
joshvera
799643147b partially apply isBranchNode 2016-07-26 14:04:15 -04:00
joshvera
de925c533d use Foldable.any 2016-07-26 13:55:05 -04:00
joshvera
84edc4b8ce use bind 2016-07-26 13:45:50 -04:00
joshvera
4809ad0f2f Use bind 2016-07-26 13:44:12 -04:00
Rob Rix
2ee68cc4b2 Add an identity law over merge. 2016-07-26 13:30:09 -04:00
Rob Rix
794fffbf47 Clean up the generator. 2016-07-26 13:25:16 -04:00
Rob Rix
b987a40377 sequenceAlt’s relationship with merge is the inverse of merge’s relationship with sequenceAlt. 2016-07-26 13:23:14 -04:00
Rob Rix
7ff92d968e Run the merge laws over Syntax. 2016-07-26 13:17:33 -04:00
Rob Rix
e98844e937 Run the merge laws over Identity. 2016-07-26 13:17:13 -04:00
Rob Rix
7d4d14c99b Run the merge laws over Maybe. 2016-07-26 13:16:46 -04:00
Rob Rix
8f25cbd473 🔥 some redundant constraints. 2016-07-26 13:13:45 -04:00
Rob Rix
f64164d872 Generalize a constraint away. 2016-07-26 13:12:32 -04:00
Rob Rix
a967e800bb Move the alternative instances helper down. 2016-07-26 13:12:09 -04:00
Rob Rix
be973b5bae Generalize out a helper function to validate laws against alternative instances. 2016-07-26 13:11:52 -04:00
Rob Rix
5430f45850 Verify the merge laws over []/Maybe. 2016-07-26 13:06:18 -04:00
Rob Rix
df4621622a Formulate a merge law. 2016-07-26 13:03:13 -04:00
Rob Rix
475c97190c Parallelize the Mergeable spec. 2016-07-26 12:47:38 -04:00
Rob Rix
5d6b1cd047 Test the sequenceAlt laws over Syntax. 2016-07-26 05:39:02 -04:00
Rob Rix
7af29fcf10 Define the identity law over pure. 2016-07-26 04:25:45 -04:00
Rob Rix
6806438949 Generalize the sequenceAlt laws over the inner alternative functor. 2016-07-26 04:23:03 -04:00
Rob Rix
f76b334b8c Validate the sequenceAltLaws against the Identity instance. 2016-07-26 04:16:40 -04:00
Rob Rix
a0cf6ce702 Validate the relationship between sequenceAlt and merge. 2016-07-26 04:15:56 -04:00
Rob Rix
d1bbe1c029 Validate the sequenceAltLaws against Maybe. 2016-07-26 04:08:19 -04:00
Rob Rix
88bb767ff7 Group the law invocations by functor. 2016-07-26 04:07:46 -04:00
Rob Rix
734254194c Define sequenceAltLaws to take a generator of Mergeable values. 2016-07-26 04:06:51 -04:00
Rob Rix
fa3b7d126e Factor the sequenceAlt law properties into a separate function. 2016-07-26 04:04:24 -04:00
Rob Rix
93c53ed90a Stub in a property test for the proposed identity law. 2016-07-26 04:02:52 -04:00
Rob Rix
b03f1d3b91 Stub in a spec function. 2016-07-26 03:58:14 -04:00
Rob Rix
8f15a59282 Stub in a spec for the Mergeable stuff. 2016-07-26 03:56:52 -04:00
joshvera
4ab572c94b Merge remote-tracking branch 'origin/master' into property-tests 2016-07-25 12:30:23 -04:00
joshvera
9686a7e53b Remove extra split2.html 2016-07-22 17:10:11 -04:00
joshvera
b5119dab1e Include Info 2016-07-22 14:51:08 -04:00
joshvera
485fc884a4 Merge branch 'syntax-redux' into property-tests 2016-07-22 14:39:54 -04:00
joshvera
b27eac56d9 Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-22 12:38:34 -04:00
joshvera
70f9329f1a Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-22 12:36:03 -04:00
Rob Rix
389b2ddfa6 Use joinCrosswalk in the spec. 2016-07-22 11:40:04 -04:00
Rob Rix
faa195ea8f Add a drop-in for Crosswalk over Bicrosswalkable Joins. 2016-07-22 11:39:56 -04:00
Rob Rix
0016bb92ea Merge branch 'master' into generalize-rws-over-the-functor 2016-07-21 11:49:55 -04:00
joshvera
a4851ba063 type signatures 2016-07-15 20:32:48 -04:00
joshvera
78bb7779a4 Test annotatedSummaries 2016-07-15 17:11:45 -04:00
joshvera
ed2f8bd57d Delete comments 2016-07-15 15:24:40 -04:00
Rob Rix
4b33b24a05 Labels are computed from the entire term. 2016-07-15 14:45:37 -04:00
joshvera
ea814432a6 Add a property test to check number of LeafInfos in diff summaries match leaves in diff patches 2016-07-15 14:10:31 -04:00
joshvera
e57f30f20b DiffInfo are now either LeafInfos or BranchInfos 2016-07-15 13:18:45 -04:00
Rob Rix
85659ec988 Fix up the asymmetrical context fixture. 2016-07-15 11:31:43 -04:00
Rob Rix
529334a552 Fix up the dictionary fixture. 2016-07-15 11:30:49 -04:00
Rob Rix
292a8f0a07 Fix up the multiline insert fixture. 2016-07-15 11:29:15 -04:00
Rob Rix
fcc4df2232 Fix up the insert fixture. 2016-07-15 11:27:48 -04:00
Rob Rix
2d1dea1270 Fix up the nested insert fixture. 2016-07-15 11:26:18 -04:00
Rob Rix
49291bf1ab Fix up the newline-at-eof fixture. 2016-07-15 11:26:11 -04:00
Rob Rix
5af6188b17 Fix up the no-newline-at-eof fixture. 2016-07-15 11:23:18 -04:00
Rob Rix
ce4ad3d9bc Fix up the reformat fixture. 2016-07-15 11:20:55 -04:00
Rob Rix
5bc2cd93f1 Only annotate terms & diffs with costs, not sizes. 2016-07-15 11:17:53 -04:00
Rob Rix
97e8dfadb1 DiffSummarySpec doesn’t depend on Info. 2016-07-15 09:41:12 -04:00
Rob Rix
82ce5fffad AlignmentSpec doesn’t depend on Info at all. 2016-07-15 09:39:03 -04:00
joshvera
13671e5d14 Add patchAnnotations to DiffInfo to track discarded branch nodes 2016-07-14 19:35:23 -04:00
Rob Rix
300bd2b84c Renderer takes an annotation type parameter. 2016-07-14 16:36:47 -04:00
joshvera
9a01466bfc Merge branch 'syntax-redux' into pretty-print-summaries 2016-07-14 15:30:15 -04:00
Rick Winfrey
85ddbcbcba Merge branch 'syntax-redux' of github.com:github/semantic-diff into syntax-redux 2016-07-14 14:26:07 -05:00
joshvera
27c338331f Merge remote-tracking branch 'origin/master' into syntax-redux 2016-07-14 15:22:46 -04:00
Rick Winfrey
2354cfa45a Add diff summary property test verifying no changes results in no diff summaries. 2016-07-14 14:21:14 -05:00
joshvera
453334d966 Use wl-pprint-text to pretty print diff summaries 2016-07-14 14:44:18 -04:00
joshvera
58ff433dd0 Merge remote-tracking branch 'origin/master' into pretty-print-summaries 2016-07-14 14:38:46 -04:00