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,934 Commits 424 Branches 92 Tags 407 MiB
82d012fdb1
Commit Graph

16934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mitchell Rosen
82d012fdb1 emit a proper resolution result for constructors 2024-08-23 12:08:22 -04:00
Mitchell Rosen
f03f784ed8 show type suggestions for holes again 2024-08-22 13:40:53 -04:00
Mitchell Rosen
677e989730 ⅄ trunk → term-name-resolution-change 2024-08-22 13:24:07 -04:00
Mitchell Rosen
f9113108c8 get ambiguous term error message properly suffixifying names 2024-08-22 13:12:42 -04:00
Mitchell Rosen
4c6139ae7d term name resolution tweak: don't prefer names from the file over names from the namespace 2024-08-21 15:01:51 -04:00
mergify[bot]
b868fecad9
Merge pull request #5288 from puffnfresh/bug/windows-ui 
Fix UI on Windows
 2024-08-21 16:21:40 +00:00
Brian McKenna
a7a80c90e7 Add puffnfresh to contributors 2024-08-21 00:47:52 +00:00
Brian McKenna
d242ae9353 Fix UI on Windows 
The quotes seem to be preventing the UI from loading on my system
and quotes are not needed in this situation in Batch.
 2024-08-20 11:20:06 +00:00
Mitchell Rosen
035fe0a585 ⅄ trunk → type-name-resolution-change 2024-08-19 16:08:21 -04:00
Arya Irani
e388786b48
Merge pull request #5282 from sellout/fix-blank-identifiers 
Change handling of “blank” identifiers
 2024-08-18 17:06:22 -04:00
Arya Irani
1c5a4e6c67
Merge pull request #5285 from unisonweb/24-08-15-namespace-directive 
feat: namespace directive
 2024-08-18 12:30:15 -04:00
Mitchell Rosen
df2c76aa42 rerun generic-parse-errors transcript 2024-08-16 15:25:59 -04:00
Mitchell Rosen
2f82c7eb85 fix file ordering 2024-08-16 15:19:36 -04:00
Mitchell Rosen
699a16acdd move a binding 2024-08-16 15:07:32 -04:00
Mitchell Rosen
7b3b65f55e implement namespace directive 2024-08-16 15:06:34 -04:00
Greg Pfeil
eff07ae662
Improve the Show (BlockTree a) instance 
This makes it much easier to read the output when debugging the lexer.
And it should be `Read`-compatible..

There’s still room for improvement, though:
```haskell
Block (Open "scratch.u")
  [
    [
      Leaf (WordyId (NameOnly (Name Relative (NameSegment {toUnescapedText = "dontMap"} :| [])))),
      Leaf (WordyId (NameOnly (Name Relative (NameSegment {toUnescapedText = "f"} :| [])))),
      Block (Open "=")
        [
          [
            Block (Open "cases")
              [
                [
                  Leaf (WordyId (NameOnly (Name Relative (NameSegment {toUnescapedText = "None"} :| [])))),
                  Block (Open "->")
                    [
                      [
                        Leaf (Reserved "false"),
                      ],
                    ]
                    (Just Close),
                  Leaf (Semi True),
                ],
                [
                  Leaf (WordyId (NameOnly (Name Relative (NameSegment {toUnescapedText = "Some"} :| [])))),
                  Leaf (WordyId (NameOnly (Name Relative (NameSegment {toUnescapedText = "_unused"} :| [])))),
                  Block (Open "->")
                    [
                      [
                        Leaf (WordyId (NameOnly (Name Relative (NameSegment {toUnescapedText = "f"} :| [])))),
                        Leaf (Numeric "2"),
                      ],
                    ]
                    (Just Close),
                ],
              ]
              (Just Close),
          ],
        ]
        (Just Close),
    ],
  ]
  (Just Close)
```
 2024-08-16 08:27:36 -06:00
Greg Pfeil
ebda5ae6e3
Change handling of “blank” identifiers 
Previously, they were tokenized separately from other identifiers, but
then most handling checked both tokens anyway. This now always parses
“blanks” as normal identifiers and checks their blankness at the few
places we care about it.

There were two places that treated `Blank` differently than `WordyId`,
and those are preserved. There were also two places where `Blank ""`
(`_`) was treated differently than `Blank n` (`_withSomeSuffix`), and
those have been eliminated.

Fixes #2822.
 2024-08-16 08:27:36 -06:00
Greg Pfeil
50429143d1
Add a failing transcript for #2822 2024-08-15 18:48:23 -06:00
Arya Irani
f2adc77e39
Merge pull request #5277 from unisonweb/24-08-13-merge-tweaks 2024-08-13 15:50:48 -04:00
Mitchell Rosen
cc48213b1b distinguish between type and term dependencies in UF.dependencies 2024-08-13 14:05:22 -04:00
mitchellwrosen
6325d4586b automatically run ormolu 2024-08-13 16:47:27 +00:00
Mitchell Rosen
28543adcdd reuse unique type guids in merge after all 2024-08-13 12:46:42 -04:00
Mitchell Rosen
4c30192553 inline Mergeblob2.conflictsNames and Mergeblob2.conflictsIds 2024-08-13 12:11:32 -04:00
Mitchell Rosen
7b315c3b34 delete unused Mergeblob2.lcaDeclNameLookup field 2024-08-13 12:05:52 -04:00
Arya Irani
e0b35f51a8
Merge pull request #5259 from unisonweb/24-08-01-merge-api 2024-08-13 11:33:27 -04:00
Arya Irani
ed555a3ea1 Merge branch 'trunk' into 24-08-01-merge-api 2024-08-13 10:50:02 -04:00
Mitchell Rosen
25aeacde30 beef up transcript and fix a couple bugs 2024-08-12 16:16:52 -04:00
Mitchell Rosen
84b45c6d10 don't prefer the unison file for type name suffixes 2024-08-12 15:51:12 -04:00
Arya Irani
2187b2e4e8
Merge pull request #5275 from unisonweb/cp/fix-reflog-sorting 2024-08-12 12:51:52 -04:00
Chris Penner
fce96a5401 Fix non-deterministic sorting of rows in transcripts 2024-08-12 09:12:35 -07:00
Arya Irani
d5d9d9d9ab
Merge pull request #5270 from unisonweb/arya/fix-3424 2024-08-10 00:37:32 -04:00
Arya Irani
c4f8ffcf39 clear latestTypecheckedFile on update 
fixes #3424
 2024-08-09 15:50:38 -04:00
Arya Irani
01cae7efdb failing transcript 2024-08-09 15:44:35 -04:00
Arya Irani
096aeea2b9
Merge pull request #5269 from unisonweb/cp/restrict-annotation-changes-in-diffs 2024-08-09 14:57:41 -04:00
Chris Penner
c341cc431e Add regression test 2024-08-09 10:58:47 -07:00
Mitchell Rosen
1741ffbbd6 ⅄ trunk → 24-08-01-merge-api 2024-08-08 14:55:17 -04:00
Chris Penner
bcf0ff68f4 Only emit annotation changes if it's a hash change 2024-08-08 11:34:33 -07:00
Mitchell Rosen
0d560d209a delete unused import 2024-08-08 13:34:18 -04:00
Mitchell Rosen
c230be29aa move more code around 2024-08-08 12:19:53 -04:00
Mitchell Rosen
a40bfd64ad move the rest of the mergeblobs over 2024-08-08 11:57:14 -04:00
mitchellwrosen
2b33116163 automatically run ormolu 2024-08-08 15:51:13 +00:00
Mitchell Rosen
3b37c4b349 move some of the mergeblob API over to unison-merge 2024-08-08 11:50:26 -04:00
Mitchell Rosen
53209c3b69 more mergeblob work 2024-08-08 11:16:43 -04:00
Mitchell Rosen
c88c4a3643 rename a couple things 2024-08-06 13:25:02 -04:00
Mitchell Rosen
d5a9585194 continue refactoring 2024-08-06 13:05:24 -04:00
Arya Irani
4c3eb03079
Merge pull request #5257 from unisonweb/24-07-24-diff-api 2024-08-06 16:01:41 +00:00
Mitchell Rosen
aedb9c2e43 begin moving over to "mergeblob" api 2024-08-05 15:48:12 -04:00
Mitchell Rosen
816d785b8d extract rendering conflicts and dependents to a helper 2024-08-05 14:34:36 -04:00
Mitchell Rosen
4acee45238 extract PPE making to merge API 2024-08-05 14:11:42 -04:00
mitchellwrosen
2ffbba47c3 automatically run ormolu 2024-08-05 16:10:55 +00:00