unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-10-04 05:37:14 +03:00
Code Issues Projects Releases Wiki Activity
16,806 Commits 424 Branches 92 Tags 407 MiB
3df6418512
Commit Graph

85 Commits

Author SHA1 Message Date
Mitchell Rosen
3df6418512 ⅄ update-defn-order → 24-07-24-diff-api 2024-07-29 13:06:51 -04:00
Mitchell Rosen
17c6c8e7c8 write pure version of lenientCheckDeclCoherency 2024-07-25 16:17:03 -04:00
Mitchell Rosen
daa97fd2cf write pure version of checkDeclCoherency 2024-07-25 16:00:29 -04:00
Mitchell Rosen
0079f2a0dd write pure version of nameBasedNamespaceDiff 2024-07-25 15:41:06 -04:00
Mitchell Rosen
f59c428b35 write pure version of synhashDefns 2024-07-25 14:42:45 -04:00
Mitchell Rosen
04c659de5d write pure version of synhashLcaDefns 2024-07-25 14:27:24 -04:00
Mitchell Rosen
aea1660a07 simplify checkDeclCoherency again 2024-07-24 02:58:07 -04:00
Mitchell Rosen
e64ffb6f2c ⅄ trunk → update-defn-order 2024-07-24 02:40:13 -04:00
Mitchell Rosen
c7a55f0196 update work 2024-07-22 18:26:14 -04:00
Greg Pfeil
9ac6a04ec1
Inform Ormolu of some operator precedences 
This adds a .ormolu file to tell Ormolu what some operator precedences
are, to improve indentation of multi-line operator sequences.
 2024-07-18 19:44:34 -06:00
Greg Pfeil
b8f1ed988a
Run Ormolu over the entire codebase 
With #5142, Ormolu was upgraded from 0.5.2.0 to 0.7.2.0. This formats
the codebase to avoid spurious formatting comingled in other commits.

Almost all of the changes are simply wrapping single constraints in parens, like
```diff
-hashBranch :: forall m. Monad m => Branch m -> m BranchHash
+hashBranch :: forall m. (Monad m) => Branch m -> m BranchHash
```

There is also some reordering of language pragmas and imports,
indentation correction (some of which gets precedence wrong), and switching
some Haddock from `-- ^` to `-- |` .
 2024-07-18 17:48:40 -06:00
Eduard Nicodei
6ed06f3089 Merge remote-tracking branch 'origin/trunk' into merged-ghc-upgrade-try-2 2024-07-15 18:21:33 +01:00
Arya Irani
9b11d96cbb
Merge pull request #5177 from unisonweb/24-07-01-todo-merge-precondition-violations 2024-07-10 13:28:59 -04:00
mitchellwrosen
d70b219058 automatically run ormolu 2024-07-09 15:48:21 +00:00
Mitchell Rosen
9cc6c2bd8a synhash var bugfix: hash debruijn indexes, not var names 
also adds a debug.synhash.term command for debugging
 2024-07-09 11:47:27 -04:00
Mitchell Rosen
06b731b774 report constructor aliases in todo 2024-07-03 11:19:18 -04:00
Mitchell Rosen
fdf91bbce6 make decl coherency check more abstract to support "get all violations" use case 2024-07-02 17:44:09 -04:00
Mitchell Rosen
eb1ee64cf2 merge unison-util-nametree into unison-core1 2024-07-02 12:23:34 -04:00
Chris Penner
e94f8706fc Remove Primes from module names 2024-06-27 12:16:53 -07:00
Mitchell Rosen
5353a4e64c properly handle deleted constructors in merge 2024-06-20 14:31:40 -04:00
Chris Penner
035f75ab36 Merge trunk 2024-06-03 08:44:11 -07:00
Mitchell Rosen
899be60f5a improve merge precondition violation output messages 2024-05-31 14:34:47 -04:00
Chris Penner
63f32a6144 Merge! 2024-05-30 15:56:27 -07:00
Chris Penner
6384038ee0 Don't expose Branch0 internals, (and add add lens utils to prelude) 2024-05-30 15:21:47 -07:00
Mitchell Rosen
32cde2cd35 relax merge preconditions on lca 2024-05-29 12:41:59 -04:00
Mitchell Rosen
52283ed3f7 minor cleanup 2024-05-29 10:38:13 -04:00
Mitchell Rosen
50334f262f make "lenient" decl coherency check that can't fail 2024-05-29 10:21:39 -04:00
Mitchell Rosen
5dcf56dc78 fix up undefineds 2024-05-14 09:29:29 -04:00
Mitchell Rosen
3e0e10edec merge work 2024-05-13 15:05:55 -04:00
Mitchell Rosen
9a0ef3d797 merge work 2024-05-13 13:15:00 -04:00
Mitchell Rosen
d7b48dcb5c minor cleanup 2024-05-06 13:03:41 -04:00
Mitchell Rosen
0d155e99eb better error messages for merge precondition violations 2024-05-02 16:28:30 -04:00
Mitchell Rosen
b319c592dd render things with the right PPEs 2024-04-30 14:47:39 -04:00
Mitchell Rosen
b739c27f73 work on properly rendering merged Unison file 2024-04-29 18:52:34 -04:00
Mitchell Rosen
a3b038ceb8 make simplifications 2024-04-25 11:42:20 -04:00
Mitchell Rosen
834364886e delete a fixme 2024-04-24 19:15:56 -04:00
Mitchell Rosen
1d45d0e99c minor cleanup of duplication 2024-04-24 19:12:35 -04:00
Mitchell Rosen
d3a5909ae6 move cached transaction stuff into unison-sqlite 2024-04-24 12:55:21 -04:00
Mitchell Rosen
4319a03e7b OverloadedRecordDot 2024-04-24 10:32:07 -04:00
Mitchell Rosen
149b5b4f86 delete some unused stuff 2024-04-19 14:30:49 -04:00
Mitchell Rosen
9a0867d161 remember whether dependent came from Alice or Bob 2024-04-18 16:45:16 -04:00
Mitchell Rosen
96eeb5f1f5 refactoring, cleanup 2024-04-18 12:15:22 -04:00
Mitchell Rosen
784b779014 begin work on fixing bumpLca 2024-04-18 10:40:33 -04:00
Mitchell Rosen
5c397dc3fe add fallback to lca ppe for synhashing 2024-04-17 22:28:38 -04:00
Mitchell Rosen
4e42d38385 split apart combine and partition diffs steps 2024-04-17 20:46:39 -04:00
Mitchell Rosen
0299f38946 don't expect constructors of builtin types 2024-04-17 18:24:28 -04:00
Mitchell Rosen
afbece86f4 track uninhabited decls in decl name lookup 2024-04-17 10:35:58 -04:00
Mitchell Rosen
68695e49d0 fix infinite loop 2024-04-17 10:30:35 -04:00
Mitchell Rosen
da3e716e49 continue attempting to properly partition diff into conflicted and unconflicted 2024-04-16 18:09:56 -04:00
Mitchell Rosen
75ae8120af include constructor names in decl synhashes 2024-04-16 11:49:59 -04:00