neovim/CONTRIBUTING.md

4.4 KiB

Contributing to Neovim

Getting started

Issues

  • Search existing issues before raising a new one.
  • Include as much detail as possible. In particular, we need to know which OS you're using.

Pull requests

  • Make it clear in the issue tracker what you are working on.
  • Be descriptive in your PR message: what is it for, why is it needed, etc.
  • Don't make cosmetic changes to unrelated files in the same PR.

Tagging in the issue tracker

When submitting pull requests, include one of the following tokens in the title:

  • [WIP] - Work In Progress. The pull request will change, and there is no need to review it yet.
  • [RFC] - Request For Comment. The request needs reviewing and/or comments.
  • [RDY] - The request is ready to be merged. The request must have been reviewed by at least one person and have no outstanding issues.
  • Default label is assumed to be [WIP] if there's no indication otherwise.

Branching & history

  • Use a feature branch, not master.
  • Rebase your feature branch onto (upstream) master before raising the PR.
  • Keep up to date with changes in (upstream) master so your PR is easy to merge.
  • Try to actively tidy your history: combine related commits with interactive rebasing etc. If your PR is still [WIP] don't be afraid to force-push to your feature branch to tidy your history.

For code PRs

Testing

  • We are unlikely to merge your PR if the Travis build fails.
  • The Travis build does not currently run the tests under valgrind, but you are encouraged to do so locally.

Coding style

We have a style guide that all new code should follow. However, vast swathes of the existing vim codebase violate it to some degree, and fixing them would increase merge conflicts and add noise to git blame. Please weigh those costs when making cosmetic changes. As a rule of thumb, avoid pull requests dominated by style changes. Feel free to fix up lines that you happen to be modifying anyway, as long as they look consistent with their surroundings. Fix anything that looks outright barbarous -- especially if you can't find any editor settings that make it look ok -- but otherwise err on the side of leaving things as they are.

For new code, please run clint.py to detect style errors. It is not perfect and may have false positives and negatives. To have clint.py ignore certain special cases, put // NOLINT at the end of the line.

Commit guidelines

The purpose of these guidelines is to make reviews easier and make the VCS logs more valuable.

  • Try to keep the first line under 70 characters.
  • Include further description, if necessary, after a blank line.
    • Don't make it too verbose by including obvious things.
    • But don't spare clarifications for anything that could be not so obvious. Some commit messages are pages long, and that's fine if there's no better place for those comments to live.
    • Recommended: Prefix logically-related commits with a consistent identifier at the beginning of each commit message. For example, the following commits are related by task (Introduce vim namespace) and scope (Contrib YCM).
      Introduce vim namespace: Contrib YCM: Fix style issues.
      Introduce vim namespace: Contrib YCM: Fix build dir calculation
      • Subtasks can be activity-oriented (doing different things on the same area) or scope-oriented (doing the same thing on different areas).
    • Granularity helps, but it's conceptual size that matters, not extent size.
  • Use the imperative voice: "Fix bug" rather than "Fixed bug" or "Fixes bug."