1
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
neovim/CONTRIBUTING.md
2020-01-29 12:06:35 +01:00

9.3 KiB

Contributing to Neovim

Getting started

If you want to help but don't know where to start, here are some low-risk/isolated tasks:

Reporting problems

  • Check the FAQ.
  • Search existing issues (including closed!)
  • Update Neovim to the latest version to see if your problem persists.
  • Disable plugins incrementally, to narrow down the cause of the issue.
  • When reporting a crash, include a stacktrace.
  • Bisect to the cause of a regression, if you are able. This is extremely helpful.
  • Check $NVIM_LOG_FILE, if it exists.
  • Include cmake --system-information for build-related issues.

Developer guidelines

  • Nvim contributors should read :help dev.
  • External UI developers should read :help dev-ui.
  • API client developers should read :help dev-api-client.
  • Nvim developers are strongly encouraged to install ninja for faster builds.
    sudo apt-get install ninja-build
    make distclean
    make  # Nvim build system uses ninja automatically, if available.
    

Pull requests (PRs)

  • To avoid duplicate work, create a [WIP] pull request as soon as possible.
  • Your PR must include test coverage. See test/README.md.
  • Avoid cosmetic changes to unrelated files in the same commit.
  • Use a feature branch instead of the master branch.
  • Use a rebase workflow for small PRs.
    • After addressing review comments, it's fine to rebase and force-push.
  • Use a merge workflow for big, high-risk PRs.
    • Merge master into your PR when there are conflicts or when master introduces breaking changes.
    • Use the ri git alias:
      [alias]
      ri = "!sh -c 't=\"${1:-master}\"; s=\"${2:-HEAD}\"; mb=\"$(git merge-base \"$t\" \"$s\")\"; if test \"x$mb\" = x ; then o=\"$t\"; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\"; if test \"x$lm\" = x ; then o=\"$mb\"; else o=\"$lm\"; fi; fi; test $# -gt 0 && shift; test $# -gt 0 && shift; git rebase --interactive \"$o\" \"$@\"'"
      
      This avoids unnecessary rebases yet still allows you to combine related commits, separate monolithic commits, etc.
    • Do not edit commits that come before the merge commit.
  • During a squash/fixup, use exec make -C build unittest between each pick/edit/reword.

Stages: WIP, RFC, RDY

Pull requests have three stages: [WIP] (Work In Progress), [RFC] (Request For Comment) and [RDY] (Ready).

  1. [RFC] is assumed by default, do not put "RFC" in the PR title (it adds noise to merge commit messages).
  2. Add [WIP] to the PR title if you are not requesting feedback and the work is still in flux.
  3. Add [RDY] to the PR title if you are done and only waiting on merge.

Commit messages

Follow commit message hygiene to make reviews easier and to make the VCS/git logs more valuable.

  • Try to keep the first line under 72 characters.
  • Prefix the commit subject with a scope: doc:, test:, foo.c:, runtime:, ...
    • Subject line for commits with only style/lint changes can be a single word: style or lint.
  • A blank line must separate the subject from the description.
  • Use the imperative voice: "Fix bug" rather than "Fixed bug" or "Fixes bug."

Automated builds (CI)

Each pull request must pass the automated builds on Travis CI, sourcehut and AppVeyor.

  • CI builds are compiled with -Werror, so compiler warnings will fail the build.
  • If any tests fail, the build will fail. See test/README.md#running-tests to run tests locally. Passing locally doesn't guarantee passing the CI build, because of the different compilers and platforms tested against.
  • CI runs ASan and other analyzers.
    • To run valgrind locally: VALGRIND=1 make test
    • To run Clang ASan/UBSan locally: CC=clang make CMAKE_FLAGS="-DCLANG_ASAN_UBSAN=ON"
  • The lint build checks modified lines and their immediate neighbors, to encourage incrementally updating the legacy style to meet our style. (See #3174 for background.)
  • CI for freebsd and openbsd runs on sourcehut.
    • To get a backtrace on freebsd (after connecting via ssh):
      sudo pkg install tmux  # If you want tmux.
      lldb build/bin/nvim -c nvim.core
      
      # To get a full backtrace:
      #   1. Rebuild with debug info.
      rm -rf nvim.core build
      gmake CMAKE_BUILD_TYPE=RelWithDebInfo CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DMIN_LOG_LEVEL=3" nvim
      #   2. Run the failing test to generate a new core file.
      TEST_FILE=test/functional/foo.lua gmake functionaltest
      lldb build/bin/nvim -c nvim.core
      

Clang scan-build

View the Clang report to see potential bugs found by the Clang scan-build analyzer.

  • Search the Neovim commit history to find examples:
    git log --oneline --no-merges --grep clang
    
  • To verify a fix locally, run scan-build like this:
    rm -rf build/
    scan-build --use-analyzer=/usr/bin/clang make
    

PVS-Studio

View the PVS report to see potential bugs found by PVS Studio.

  • Use this format for commit messages (where {id} is the PVS warning-id)):
    PVS/V{id}: {description}
    
  • Search the Neovim commit history to find examples:
    git log --oneline --no-merges --grep PVS
    
  • Try ./scripts/pvscheck.sh to run PVS locally.

Coverity

Coverity runs against the master build. To view the defects, just request access; you will be approved.

  • Use this format for commit messages (where {id} is the CID (Coverity ID); (example)):
    coverity/{id}: {description}
    
  • Search the Neovim commit history to find examples:
    git log --oneline --no-merges --grep coverity
    

Coding

Lint

You can run the linter locally by:

make lint

The lint step downloads the master error list and excludes them, so only lint errors related to the local changes are reported.

You can lint a single file (but this will not exclude legacy errors):

./src/clint.py src/nvim/ops.c

Style

The repo includes a .clang-format config file which (mostly) matches the style-guide. You can use clang-format to format code with the gq operator in Nvim:

if !empty(findfile('.clang-format', ';'))
  setlocal formatprg=clang-format\ -style=file
endif

Navigate

  • Use universal-ctags. ("Exuberant ctags", the typical ctags binary provided by your distro, is unmaintained and won't recognize many function signatures in Neovim source.)
  • Explore the source code on the web.

Reviewing

To help review pull requests, start with this checklist.

Reviewing can be done on GitHub, but you may find it easier to do locally. Using hub, you can create a new branch with the contents of a pull request, e.g. #1820:

hub checkout https://github.com/neovim/neovim/pull/1820

Use git log -p master..FETCH_HEAD to list all commits in the feature branch which aren't in the master branch; -p shows each commit's diff. To show the whole surrounding function of a change as context, use the -W argument as well.