Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Enhancement] Maintain config.ron, Add Haskell #62

Closed

Conversation

kevinmatthes
Copy link
Contributor

This Pull Request fixes typos in the comments, adds comment banners and introduces a Tree-Sitter for Haskell.

Copy link
Collaborator

@mcobzarenco mcobzarenco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this, super useful! Adding Haskell was on my todo list too! 🙇

Not a big fan of comment boxes, see below. I had one other meta-comment re: splitting changes into multiple commits / PRs. E.g. would be easy to just merge Haskell addition and discuss style changes in a separate PR -- obviously there's a balance, but stylistic things are prone to bike shedding :-)

zee/config/config.ron Show resolved Hide resolved
zee/config/config.ron Show resolved Hide resolved
zee/config/config.ron Outdated Show resolved Hide resolved
Copy link
Collaborator

@mcobzarenco mcobzarenco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks! Please squash the 2nd commit and I'll merge it.

EDIT: @kevinmatthes Could you also add a line in the changelog please referencing the newly added support for Haskell 🎉

@kevinmatthes kevinmatthes marked this pull request as draft July 24, 2022 16:45
This Pull Request fixes typos in the comments, adds comment banners and introduces a Tree-Sitter for Haskell.
@kevinmatthes kevinmatthes marked this pull request as ready for review July 24, 2022 17:14
@kevinmatthes
Copy link
Contributor Author

Squashing will cause problems with the base branch which need to be resolved. The newly added changelog line will not be accepted and the configuration will be damaged. Squashing these three commits into one is not possible, at least not for me.

You can also choose to merge by squash in order to solve the problem of multiple commits.

@kevinmatthes
Copy link
Contributor Author

I support @iainh's #68 and would like to wait for the results of that Pull Request before continuing with this one.

@mcobzarenco
Copy link
Collaborator

mcobzarenco commented Jul 30, 2022

On the git point,

Squashing will cause problems with the base branch which need to be resolved. The newly added changelog line will not be accepted and the configuration will be damaged. Squashing these three commits into one is not possible, at least not for me.

You should checkout latest master and git rebase interactive this branch on it, i.e git rebase -i. This will allow you to squash the commits into one, edit their messages etc.

@mcobzarenco
Copy link
Collaborator

I've created a squashed version #75 -- I may merge that one (you still appear as the author in the commit)

I support @iainh's #68 and would like to wait for the results of that Pull Request before continuing with this one.

I honestly don't see any reason to wait for as that's a major change as there's immediate value in merging this PR -- better documentation and support for Haskell 🎉

@mcobzarenco
Copy link
Collaborator

Merged in #75

@kevinmatthes kevinmatthes deleted the feature/modes-haskell branch July 31, 2022 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants