github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-23 06:41:45 +03:00
Code Issues Projects Releases Wiki Activity
5,907 Commits 19 Branches 16 Tags 46 MiB
f7c4c91cfe
Commit Graph

585 Commits

Author SHA1 Message Date
Rob Rix
6bf8d10efd Remove isClosedBy. 2016-03-07 19:45:57 -05:00
Rob Rix
b100eb9674 Use isClosedRowBy as a predicate in the tests. 2016-03-07 19:45:39 -05:00
Rob Rix
a8286d66b1 Fix the isOpenRowBy use. 2016-03-07 19:45:25 -05:00
Rob Rix
1e31552397 Remove the tests of openLineBy. 2016-03-07 19:43:14 -05:00
Rob Rix
bf725daa90 Remove isOpenBy. 2016-03-07 19:43:01 -05:00
Rob Rix
a8cdb23694 Use isOpenRowBy. 2016-03-07 19:42:56 -05:00
Rob Rix
f7b4ecc1c1 Rename adjoinRowsByR to adjoinRowsBy. 2016-03-07 19:36:16 -05:00
Rob Rix
e81941f53d Migrate the tests to adjoinRowsByR. 2016-03-07 19:33:32 -05:00
joshvera
c5fc04904e Store modes as Word32 2016-03-07 19:20:28 -05:00
Rob Rix
b47bc5bc16 Apply some of hlint’s advice. 2016-03-07 16:33:30 -05:00
Rob Rix
488ec69895 shouldBe gives better error messages. 2016-03-07 16:28:39 -05:00
Rob Rix
abcd9803f3 Pass the Info & Syntax in directly. 2016-03-04 21:12:49 -05:00
Rob Rix
5c06ecc6d0 Define splitAbstractedTerm by catamorphism (more or less). 2016-03-04 21:07:26 -05:00
Rob Rix
f546977b33 splitAnnotatedByLines takes Both Infos directly. 2016-03-04 20:25:33 -05:00
Rob Rix
7cb85f6571 Define splitDiffByLines by catamorphism. 2016-03-04 19:53:47 -05:00
Rob Rix
651f0106e3 Migrate a couple of tests over to splitDiffByLines. 2016-03-04 19:53:28 -05:00
Rob Rix
3a555df147 Swap the order of the operands to splitPatchByLines. 2016-03-04 19:07:54 -05:00
Rob Rix
61e43f8c02 splitPatchByLines doesn’t take previous indices. 2016-03-04 12:28:48 -05:00
Rob Rix
0cf7ba393d Alignment returns ranged Rows. 2016-03-04 12:26:40 -05:00
Rob Rix
6ecb1336b9 Add a split fixture for the newline-at-eof test. 2016-03-04 12:19:06 -05:00
Rob Rix
ecf5037fa4 Add a split fixture for the no-newline-at-eof test. 2016-03-04 12:18:33 -05:00
joshvera
a2dcdcab6e Fix tests 2016-03-03 17:41:15 -05:00
Rob Rix
e1f12e3c35 Verify that splitPatchByLines obeys the initial indices. 2016-03-03 15:40:41 -05:00
Rob Rix
aa389a9e99 Add a function to construct a leaf within a source. 2016-03-03 15:34:07 -05:00
Rob Rix
7a71b76d99 Simplify leafWithRangesInSources. 2016-03-03 15:33:31 -05:00
Rob Rix
1d89c90e38 Add a function to construct a patch from Both input terms. 2016-03-03 15:00:01 -05:00
Rob Rix
7104835753 Add an Arbitrary instance for Patch. 2016-03-03 14:59:33 -05:00
Rob Rix
7a3da76448 splitAbstractedTerm returns lines containing diff/range pairs. 2016-03-03 13:41:56 -05:00
Rob Rix
723f14aa4c Test splitAbstractedTerm. 2016-03-03 11:39:23 -05:00
Rob Rix
8e78339c39 🔥 openTerm. 2016-03-03 09:02:33 -05:00
Rob Rix
4fe82ec41b Move the move crash test fixtures into the fixed pile 💃 2016-03-02 18:48:53 -05:00
Rob Rix
8ed7620f40 #433 has been fixed. 2016-03-02 15:02:58 -05:00
Rob Rix
685c6a01de Merge branch 'master' into sort-keyed-children-by-range 2016-03-02 12:30:02 -05:00
Rob Rix
dab1ae79a0 Test that moves crash. 2016-03-02 12:15:10 -05:00
Rob Rix
d6a4fb5daa Add a second pair of fixtures for #433. 2016-03-02 12:12:11 -05:00
Rob Rix
87eb17bb6b Rename the fixtures for #433. 2016-03-02 12:12:02 -05:00
Rob Rix
440f741658 Restore the crashers crash test to working. 
cc @mdiep
 2016-03-02 12:09:58 -05:00
Rob Rix
53413003c6 Merge branch 'master' into forward-compatible-rendering 2016-03-02 11:31:09 -05:00
Rob Rix
ce65a540d2 Rebuild the fixtures. 2016-03-02 08:30:34 -05:00
Rob Rix
3f7cdf88a7 Regenerate the JSON fixtures. 2016-03-02 08:18:25 -05:00
joshvera
b124b461c0 Empty diffs have empty hunks 2016-03-01 17:13:53 -05:00
Rob Rix
2f47270400 Add a split diff fixture. 2016-03-01 16:32:08 -05:00
Rob Rix
d4efc9e7d5 Remove a diff in a format we no longer support. 2016-03-01 16:32:02 -05:00
Rob Rix
a34250e619 Bump the fixtures again. 2016-03-01 14:36:50 -05:00
Rob Rix
ab77d09bb6 Bump all the fixtures. 2016-03-01 14:30:33 -05:00
Rob Rix
e894d63a6c Merge branch 'master' into forward-compatible-rendering 
# Conflicts:
#	src/DiffOutput.hs
#	src/Renderer/Split.hs
#	test/CorpusSpec.hs
 2016-03-01 12:34:40 -05:00
Rob Rix
435dde0888 Bump the fixtures again. 2016-02-29 22:05:25 -05:00
Rob Rix
8e5bb19ec2 More fixture bumping. 2016-02-29 21:53:38 -05:00
Rob Rix
9260faf3af Update the fixtures. 2016-02-29 21:46:30 -05:00
Rob Rix
65ee064cda Bump the fixtures. 2016-02-29 21:22:17 -05:00
Rob Rix
e3ac671f1b Bump the fixtures. 2016-02-29 20:53:36 -05:00
Rob Rix
d92bab31fd Generate the JSON with aeson instead. 2016-02-29 20:52:30 -05:00
Rob Rix
ae149c94ff Use runBothWith to tidy up a few computations. 2016-02-29 19:43:57 -05:00
Rob Rix
7548e148dc Rename runLeft/runRight to fst/snd. 2016-02-29 19:39:04 -05:00
Rob Rix
fe6c42da4c Add newline at eof & no newline at eof test cases. 2016-02-29 18:13:23 -05:00
Rob Rix
39b86b2886 Add a test case for dictionary.js in json format. 2016-02-29 18:12:08 -05:00
Rob Rix
46b85eea05 Merge branch 'master' into forward-compatible-rendering 2016-02-29 14:11:14 -05:00
Rob Rix
ac39e73691 Line’s Monoid instance will do just fine here. 2016-02-29 10:38:39 -05:00
Rob Rix
665ffa4133 We don’t need to destructure the Rows in the append test. 2016-02-29 10:33:29 -05:00
Rob Rix
df2b684229 Simplify how we compute combineIntoLeaves. 2016-02-29 10:31:53 -05:00
Rob Rix
7048a61660 Define leafWIthRangesInSources over Both. 2016-02-29 10:30:33 -05:00
Rob Rix
c889174aee Use Both to represent Diff annotations. 2016-02-29 10:12:34 -05:00
Rob Rix
0628793ab4 Use the Applicative instance in a test. 2016-02-29 09:29:50 -05:00
Rob Rix
a8efcb539a Row wraps a Both. 2016-02-29 09:22:52 -05:00
Rob Rix
1abab2bbce adjoinRowsBy applies Both MaybeOpen tests. 2016-02-29 08:55:30 -05:00
joshvera
2c4acfb14f Disambiguate the tests. 2016-02-29 07:45:24 -05:00
Rob Rix
9f09b39b98 100% undiluted pure mempty. 2016-02-28 22:21:17 -05:00
Rob Rix
a6c1ec1ddf Curry. 2016-02-28 22:18:44 -05:00
Rob Rix
3cf56fb635 Map the corpus tests over Both input files. 2016-02-28 22:13:32 -05:00
Rob Rix
0d77576a52 Represent categories in Both. 2016-02-28 22:10:02 -05:00
Rob Rix
81a1a14d4c Represent the input Ranges in Both. 2016-02-28 22:01:21 -05:00
Rob Rix
863251183f Represent alignment sources in Both. 2016-02-28 21:43:47 -05:00
Rob Rix
0626228917 Data.Bifunctor.Join is actually Data.Functor.Both. 2016-02-28 21:29:59 -05:00
Rob Rix
ea87105b4b Use Join for sources everywhere. 2016-02-28 21:10:56 -05:00
Rob Rix
eef4da87b4 Extract the paths into a binding. 2016-02-28 21:08:07 -05:00
Rob Rix
d6fb451ebd Rename SplitSpec to AlignmentSpec. 2016-02-28 14:05:19 -05:00
Rob Rix
e31edf6b3c Move the alignment bits of Split into the Alignment module. 2016-02-28 14:01:56 -05:00
Rob Rix
1ba036b495 Merge branch 'master' into forward-compatible-rendering 
# Conflicts:
#	src/DiffOutput.hs
#	test/CorpusSpec.hs
#	tools/semantic-difftool/src/Main.hs
 2016-02-28 13:26:50 -05:00
Rob Rix
95e0371ea1 Remove a redundant import. 2016-02-26 19:05:42 -05:00
Rob Rix
1d3ae0b902 Remove unified diffs from the corpus. 2016-02-26 19:04:47 -05:00
Rob Rix
2da6a3527b Test JSON. 2016-02-25 14:19:33 -07:00
Rob Rix
fcd8571274 Move Unified under Renderer. 2016-02-25 13:50:35 -07:00
Rob Rix
f8214a9872 Move Split under Renderer. 2016-02-25 13:32:39 -07:00
Rob Rix
f44455c372 Rename Renderer.PatchOutput to Renderer.Patch. 2016-02-25 13:20:25 -07:00
Rob Rix
c710b3c713 Move PatchOutput into Renderer. 2016-02-25 13:14:56 -07:00
joshvera
35355a2e91 Expect diff headers 2016-02-22 14:04:39 -07:00
joshvera
d7db984616 Merge remote-tracking branch 'origin/master' into git-patch-modes 2016-02-22 13:54:32 -07:00
Rob Rix
0ed730eac2 Correct the patch header. 2016-02-22 13:31:18 -07:00
Rob Rix
43445e565c Merge branch 'master' into test-patch-output 2016-02-22 13:22:17 -07:00
Rob Rix
88693119e0 Re-un-enable the crashers-todo tests. 2016-02-22 13:21:23 -07:00
Rob Rix
66b3a18ac0 Enable crashers-todo. 2016-02-22 13:19:58 -07:00
Rob Rix
7e6a01627b Add tests with a newline at EOF. 2016-02-22 13:02:01 -07:00
Rob Rix
3094e62066 Add tests without a newline at EOF. 2016-02-22 13:00:05 -07:00
Rob Rix
9873e4bf8d Pass the matcher into testDiff. 2016-02-22 12:57:16 -07:00
Rob Rix
236f3b30f8 Pass the curried matcher in. 2016-02-22 12:38:49 -07:00
Matt Diephouse
f09676d6b4 Do ALL the tests in parallel 2016-02-17 17:44:37 -05:00
Matt Diephouse
8f4699cade Do these in parallel 2016-02-17 17:43:59 -05:00
Matt Diephouse
565c7b6ca8 Add todo tests 2016-02-17 17:42:27 -05:00
Matt Diephouse
d84ad8ef15 Add a fixed crasher 2016-02-17 17:18:52 -05:00
Matt Diephouse
01f401edfb Add a passing diff test 2016-02-17 17:18:40 -05:00
Matt Diephouse
f1f7ca26c7 Rename test fixture to have format name 2016-02-17 17:18:29 -05:00
Matt Diephouse
a9d9a06440 Include the format name 2016-02-17 17:14:42 -05:00
Matt Diephouse
5af83691fd Test different output formats 2016-02-17 17:10:04 -05:00
Matt Diephouse
7dbbe1ff9e Load patch and split files too 2016-02-17 16:10:28 -05:00
Matt Diephouse
41063f6dc8 Add a function to test --split 2016-02-17 16:06:24 -05:00
Matt Diephouse
274a4b7af7 Denote that this is --unified 2016-02-17 16:00:06 -05:00
Matt Diephouse
5c1e1ce597 Shorter names 2016-02-17 15:59:16 -05:00
Matt Diephouse
bf12a2a13e Pass a renderer into testDiff 2016-02-17 15:54:37 -05:00
Matt Diephouse
548395aa5f Make A and B required 2016-02-17 15:21:37 -05:00
Matt Diephouse
9c2e4f78d2 Move failing tests to todo dirs 2016-02-17 12:57:10 -05:00
Matt Diephouse
ed1a89b6b7 Also test that test/diffs/ isn't empty 2016-02-17 12:54:42 -05:00
Matt Diephouse
f743eef743 Add a test for word diffs 2016-02-16 16:43:37 -05:00
Matt Diephouse
c8edf79abb Add a spec for test files 2016-02-16 16:38:31 -05:00
Matt Diephouse
ac053940fe Add a spec for on-disk tests 2016-02-16 12:33:41 -05:00
joshvera
e008fda7d1 output the right paths in patch 2016-02-10 11:32:26 -08:00
Matt Diephouse
110149673a Add staticgories to ArbitraryTerm.hs 2016-02-09 11:43:13 -08:00
Matt Diephouse
170b7c6e1e Rename Categorizable module to Category 2016-02-04 13:59:33 -05:00
Josh Vera
768ca30a7b Merge pull request #385 from github/data-dot-ordered-map 
Move OrderedMap into Data.
 2016-01-06 13:09:22 -05:00
Rob Rix
7af5a4876a Move OrderedMap into Data. 2016-01-06 11:56:58 -05:00
Rob Rix
924087d59a Manual spec inclusion. 2016-01-05 11:27:37 -05:00
Rob Rix
271d47f8f4 Remove the main function from TermSpec. 2016-01-05 11:26:49 -05:00
Rob Rix
801d0e1d54 Remove some redundant imports from TermSpec. 2016-01-05 11:26:43 -05:00
Rob Rix
12fc39be6e Apply some linter suggestions re: do. 2016-01-05 10:41:40 -05:00
Rob Rix
21b537da5c Apply some linter suggestions re: parens. 2016-01-05 10:41:26 -05:00
Rob Rix
0590af9bc9 Allow all of the tests to run in parallel. 2016-01-05 10:38:51 -05:00
Rob Rix
09459a3421 Merge branch 'master' into patch 2015-12-30 18:55:42 -05:00
Rob Rix
8b4d158f4c Pass sources as a pair. 2015-12-30 15:31:27 -05:00
Rob Rix
4e96478cbb Merge branch 'diff-performance' into patch 
# Conflicts:
#	src/Split.hs
 2015-12-30 12:17:33 -05:00
joshvera
c69cd164cd Merge remote-tracking branch 'origin/master' into use-text 2015-12-30 12:07:52 -05:00
Rob Rix
96f98b6bed Revert "Generate syntax with String leaves." 
This reverts commit ba92cc702f8f4585fbcb8eb61a2567b3c336afd4.
 2015-12-30 10:39:28 -05:00
Rob Rix
b54c4c8265 Bool, not (). 2015-12-30 10:33:49 -05:00
Rob Rix
ad31669f07 Revert "Generalize openMaybe." 
This reverts commit 9a056744cfb33ac0454d07fd89356fb620b7cb50.
 2015-12-30 10:33:28 -05:00
Rob Rix
3e3c7be082 Test openLineBy over openMaybe. 2015-12-30 10:31:30 -05:00
Rob Rix
d5d8095a4e pure. 2015-12-30 10:28:40 -05:00
Rob Rix
494d7f83c8 Spacing. 2015-12-30 10:28:16 -05:00
Rob Rix
093700c571 Generalize openMaybe. 2015-12-30 10:27:45 -05:00
Rob Rix
6dfb6b3ff7 Wrap terms in Identity. 2015-12-30 10:26:40 -05:00
joshvera
28e5b60bbc fix tests 2015-12-29 15:24:13 -05:00
joshvera
a3051c531d Merge remote-tracking branch 'origin/master' into use-text 2015-12-29 15:13:57 -05:00
Rob Rix
7342c93038 Revert "Extend Row’s Arbitrary instance to two parameters." 
This reverts commit 8d48b02705633ee97aa894b1ca5b3af043b3422c.
 2015-12-29 14:58:06 -05:00
Rob Rix
ee3c3c8bd0 Extend Row’s Arbitrary instance to two parameters. 2015-12-29 14:42:35 -05:00
Rob Rix
5416edbcc4 Generate syntax with String leaves. 
This reverts commit 3c4056c094f88daf1b6aa5c7f41799aa595ccdce.
 2015-12-29 10:21:09 -05:00
Rob Rix
c9ab8a131d Correct the tests. 2015-12-24 16:38:50 -05:00
Rob Rix
0866ef52bd Merge branch 'diff-performance' into patch 2015-12-24 16:33:24 -05:00
Rob Rix
7a49534034 Use makeLine as appropriate in the tests. 2015-12-24 10:44:40 -05:00
Rob Rix
d355f268e6 Hide ++ in the tests. 2015-12-23 23:44:02 -05:00
Rob Rix
69aadf4ec5 Rename makeSource → fromList. 2015-12-23 23:37:51 -05:00
Rob Rix
b138864068 Correct the tests. 2015-12-23 23:36:49 -05:00
Rob Rix
0bb6462fad Rename unSource to toList. 2015-12-23 23:26:37 -05:00
Rob Rix
e9449fccb8 Move Source & its API to the Source module. 2015-12-23 22:38:20 -05:00
Rob Rix
d7ad161495 Build leaves from the sources on either side. 2015-12-23 22:34:27 -05:00
Rob Rix
2e823392d1 Filter the strings in the sources. 2015-12-23 22:30:11 -05:00
Rob Rix
f1ab391423 arbitraryLeaf produces a Source. 2015-12-23 22:27:48 -05:00
Rob Rix
5e8e9bda5f Construct leaves with subsources. 2015-12-23 22:27:42 -05:00
Rob Rix
7b6bc623c9 Get some more total ranges from sources. 2015-12-23 22:27:30 -05:00
Rob Rix
adc850f328 Unwrap the source before filtering. 2015-12-23 22:27:21 -05:00
Rob Rix
75ead61274 Move getTotalRange into the tests. 
It’s kind of a lie.
 2015-12-23 22:20:35 -05:00
Rob Rix
99b04b4038 isOnSingleLine takes a Source. 2015-12-23 22:19:29 -05:00
Rob Rix
e0560d272b Use getTotalRange in the tests. 2015-12-23 22:18:10 -05:00
Rob Rix
60aecae119 Add an Arbitrary instance over Source. 2015-12-23 22:18:01 -05:00
Rob Rix
4219f438be Make sources in the openLineBy tests. 2015-12-23 22:10:30 -05:00
Rob Rix
6049a99ed7 Merge branch 'split-refactoring' into patch 2015-12-22 19:01:50 -05:00
Rob Rix
e2cc92bdf7 Move Row into the Row module. 2015-12-22 17:24:58 -05:00
Rob Rix
4c395ff1d1 Import the Line module in the tests. 2015-12-22 17:22:07 -05:00
Rob Rix
1621dca3bc Remove the offset functions. 2015-12-22 17:12:08 -05:00
Rob Rix
08d03e933c Remove the term construction helpers. 2015-12-22 17:11:49 -05:00
Rob Rix
ddf4ccd141 Remove the row text functions. 2015-12-22 17:10:57 -05:00
Rob Rix
3d1fb64cbc Remove span. 2015-12-22 17:10:49 -05:00
Rob Rix
52a057b577 Remove the Arbitrary instance for HTML. 2015-12-22 17:08:50 -05:00
Rob Rix
6663dfe87b openMaybe is defined over Maybe Bool. 2015-12-22 17:08:02 -05:00
Rob Rix
b121ee54e3 Remove openString. 2015-12-22 17:06:55 -05:00
Rob Rix
821ee2e792 Test the identity case via openMaybe. 2015-12-22 17:06:51 -05:00
Rob Rix
cf00dcd95e Test appending onto open rows via openMaybe. 2015-12-22 17:06:45 -05:00
Rob Rix
cfee3a90fc Test promoting onto open lines via openMaybe. 2015-12-22 17:06:09 -05:00
Rob Rix
8f34f04dae Test not promoting onto closed lines via openMaybe. 2015-12-22 17:05:35 -05:00
Rob Rix
7b2ac76422 Test not appending onto closed rows by means of openMaybe. 
This is much faster.
 2015-12-22 17:05:02 -05:00
Rob Rix
208df10e1a Add an openMaybe function for quicker open/closed tests. 2015-12-22 17:02:34 -05:00
Rob Rix
c643f2ed58 Test not appending onto closed rows over strings. 2015-12-22 16:56:22 -05:00
Rob Rix
8c71fff97a Test appending onto open rows over strings. 2015-12-22 16:55:53 -05:00
Rob Rix
cfa82876c1 Generalize the isOpen predicate. 2015-12-22 16:55:18 -05:00
Rob Rix
631e572ab3 Generalize the isClosed predicate. 2015-12-22 16:55:13 -05:00
Rob Rix
8599fd46d9 Test adjoinRowsBy using openString. 2015-12-22 16:52:36 -05:00
Rob Rix
3adfd06d5a Add an open string selector. 2015-12-22 16:52:20 -05:00
Rob Rix
bbbd874722 Remove the openLineBy tests using openElement. 2015-12-22 16:35:23 -05:00
Rob Rix
bd3bee668a Generalize the splitTermByLines test across arbitrary strings. 2015-12-22 16:34:32 -05:00
Rob Rix
ebb843ef4d Remove the termToLines test. 2015-12-22 16:29:14 -05:00
Rob Rix
c41364a743 Remove the remaining annotatedToRows tests. 2015-12-22 16:28:49 -05:00
Rob Rix
9a496a6be5 Populate the indexed term with leaves. 2015-12-22 16:26:24 -05:00
Rob Rix
1b90bc0291 Add a function to construct a leaf from a pair of line ranges. 2015-12-22 16:26:07 -05:00
Rob Rix
6510e95526 Test that we always produce the maximum of the lines in two sources. 2015-12-22 16:10:05 -05:00
Rob Rix
603e750d67 Remove an unused let binding. 2015-12-22 15:55:59 -05:00
Rob Rix
ef027dba36 Test that we preserve the line counts in equal diffs. 2015-12-22 15:48:37 -05:00
Rob Rix
9e6f415dc6 Port the single-line empty unchanged indexed diff test to splitAnnotatedByLines. 2015-12-22 15:38:18 -05:00
Rob Rix
b3c0802e55 Use the abstracted predicate. 2015-12-22 14:44:57 -05:00
Rob Rix
780c8247a3 Abstract out a predicate for terms on a single line. 2015-12-22 14:44:49 -05:00
Rob Rix
b970f02c1d Don’t offset arbitrary leaves. 2015-12-22 13:38:44 -05:00
Rob Rix
bf05d63401 Rename the tripling function. 2015-12-22 13:31:31 -05:00
Rob Rix
5a552dc97c Simplify the single-line unchanged leaf property. 2015-12-22 13:29:36 -05:00
Rob Rix
0422098f9b arbitraryLeaf doesn’t construct terms. 2015-12-22 13:29:12 -05:00
Rob Rix
aaaf8f27a4 Stub in a function to make arbitrary leaves & sources in some type. 2015-12-22 13:16:03 -05:00