maralorn · he/him, they/them
  • Joined on 2023-07-06
maralorn commented on pull request mergiraf/mergiraf#527 2025-08-31 16:30:40 +02:00
tests: Utility to minimize test cases, continued

Okay, I now understood your explanation from the other thread. I guess if the result parses with treesitter we should be relatively alright? Succesfully compiling real world examples will be hard…

maralorn commented on pull request mergiraf/mergiraf#576 2025-08-31 13:56:13 +02:00
feat: bundle comments into nodes they annotate

Sorry, that’s not enough context for me. I would like to understand what is the problem with the currently existing Haskell tests, if that’s what’s going on.

When you need a way to…

maralorn commented on pull request mergiraf/mergiraf#488 2025-07-21 22:25:47 +02:00
feat(Haskell): More commutative parents and signatures

Ah, sorry. I was still planning to write the tests, but I didn’t find the time. You can ofc. merge without I don’t think I could write a test which would find invalied merges introduced by…

maralorn created pull request mergiraf/mergiraf#488 2025-07-09 23:08:34 +02:00
feat(Haskell): More commutative parents and signatures
980eb67ad4 feat(Haskell): More commutative parents and signatures
dbbd7cbb78 Set version to 0.12.0
82e0371536 ci: Use Docker image with Rust already installed (#468)
d90a04149a fix: Escape newlines in ascii art representation of trees (#481)
d18cf1c489 fix: Ignore empty nodes in AstNode::isomorphic_to_source (#480)
Compare 10 commits »
maralorn commented on pull request mergiraf/mergiraf#429 2025-06-18 21:34:45 +02:00
feat: Haskell support

The good news is that I couldn't implement that specific commutativity because the Haskell treesitter grammar is not suited to it. So no need to remove anything. 🥳

maralorn commented on pull request mergiraf/mergiraf#431 2025-06-11 10:30:45 +02:00
feat(Haskell): Make record updates commutative and add signatures

Thx! I am still amazed by how ergonomic this was. Looking forward to the next release.

maralorn deleted branch feat-haskell-make-record-updates-commutative from maralorn/mergiraf 2025-06-10 23:38:18 +02:00
maralorn commented on pull request mergiraf/mergiraf#429 2025-06-10 14:35:34 +02:00
feat: Haskell support

I added all the mentioned signatures to the PR in #431.

6255aca5b1 feat: Add various signatures for Haskell
maralorn commented on pull request mergiraf/mergiraf#429 2025-06-05 23:10:50 +02:00
feat: Haskell support

Sadly it is more complicated than that. We could have

<<<<<<< LEFT
import Foo(foo,Bar(baz))
maralorn commented on pull request mergiraf/mergiraf#431 2025-06-05 23:05:12 +02:00
feat(Haskell): Make record updates commutative and add signatures

Oh, yeah. Absolutely.

maralorn created pull request mergiraf/mergiraf#431 2025-06-05 15:55:31 +02:00
feat: Haskell: Make record updates commutative
527c55ab5a feat: Haskell: Make record updates commutative
7041d55931 feat: Haskell support (#429)
50771757a8 doc: Small improvements to "Adding a language" (#430)
Compare 3 commits »
maralorn created branch feat-haskell-make-record-updates-commutative in maralorn/mergiraf 2025-06-05 15:54:50 +02:00
maralorn deleted branch feat-haskell-support from maralorn/mergiraf 2025-06-05 15:30:19 +02:00
maralorn commented on pull request mergiraf/mergiraf#429 2025-06-05 15:29:45 +02:00
feat: Haskell support

Sadly I have struggle adding the other features:

Lets look at deriving:

    │ └deriving: deriving
    │   ├deriving
    │   └classes: tuple
    │     ├(
    │    …
maralorn commented on pull request mergiraf/mergiraf#429 2025-06-05 10:56:29 +02:00
feat: Haskell support

All excellent ideas. Especially the type class constraints actually frequently produce merge errors in our codebase.

I will try to get to it quickly but imo this PR is self contained and doing…

maralorn created pull request mergiraf/mergiraf#429 2025-06-04 23:01:02 +02:00
feat: Haskell support