Incorrect parse for function with where-clause and comments

[wenkokke]

When parsing a function with a where-clause, tree-sitter-haskell groups comments after the where-clause into the decls node, rather than making them top-level comment nodes. For instance, the following code:

foo = bar
  where
    bar = 1
--   🎉 `foo = bar` and `bar = 1`
--   👀 `foo = bar where bar = 1`
--   🚀 `foo = bar where bar = 1` and `bar = 1`

bap :: Int -> Int
bap | 1 == 1, 2 == 2 = x
--   🎉 `1 == 1` and `2 == 2`
--   👀 `1 == 1, 2 == 2`

Parses to the following tree:

(haskell
  (function
    name: (variable)
    "="
    rhs: (exp_name
      (variable)
    )
    (where)
    (decls
      (function
        name: (variable)
        "="
        rhs: (exp_literal
          (integer)
        )
      )
      (comment)
      (comment)
      (comment)
    )
  )
  (signature
    name: (variable)
    type: "::"
    type: (fun
      (type_name
        (type)
      )
      "->"
      (type_name
        (type)
      )
    )
  )
  (function
    name: (variable)
    (guard_equation
      (guards
        "|"
        (guard
          (exp_infix
            (exp_literal
              (integer)
            )
            (operator)
            (exp_literal
              (integer)
            )
          )
        )
        (comma)
        (guard
          (exp_infix
            (exp_literal
              (integer)
            )
            (operator)
            (exp_literal
              (integer)
            )
          )
        )
      )
      "="
      (exp_name
        (variable)
      )
    )
  )
  (comment)
  (comment)
)

[Nisarg1112]

Hey @wenkokke @tek Have you guys done any fixes for this issue?

[tek]

@Nisarg1112 partially, in #120, but there's some work to be done before merging that PR and some follow-up work for fine-tuning comments.

[Nisarg1112]

@tek Any estimate by when that can be fully done and get merged?

[tek]

@Nisarg1112 optimistically I would say two weeks, but if you're a dependent library author you can help speed up the process by giving feedback on discourse 😄