NVIM v0.3.7

OTHER:
361d4be588 dist: update nvim.png

.builds/freebsd.yml

@@ -1,40 +0,0 @@
-image: freebsd/latest
-
-packages:
-- cmake
-- gmake
-- ninja
-- libtool
-- automake
-- pkgconf
-- unzip
-- wget
-- gettext
-- python
-- libffi
-- gdb
-
-sources:
-- https://github.com/neovim/neovim
-
-environment:
-  SOURCEHUT: 1
-  LANG: en_US.UTF-8
-  CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON -DMIN_LOG_LEVEL=3
-
-tasks:
-- build-deps: |
-    cd neovim
-    gmake deps
-- build: |
-    cd neovim
-    gmake CMAKE_BUILD_TYPE=RelWithDebInfo CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" nvim
-- functionaltest: |
-    cd neovim
-    gmake functionaltest
-- unittest: |
-    cd neovim
-    gmake unittest
-- oldtest: |
-    cd neovim
-    gmake oldtest

.builds/openbsd.yml

@@ -1,44 +0,0 @@
-# sourcehut CI: https://builds.sr.ht/~jmk/neovim
-
-image: openbsd/latest
-
-packages:
-- autoconf-2.71
-- automake-1.16.3
-- cmake
-- gettext-runtime-0.21p1
-- gettext-tools-0.21p1
-- gmake
-- libtool
-- ninja-1.10.2p0
-- unzip-6.0p14
-- gdb
-
-sources:
-- https://github.com/neovim/neovim
-
-environment:
-  SOURCEHUT: 1
-  LC_CTYPE: en_US.UTF-8
-  CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON -DMIN_LOG_LEVEL=3
-
-tasks:
-- build-deps: |
-    export AUTOCONF_VERSION=2.71
-    export AUTOMAKE_VERSION=1.16
-    mkdir neovim/.deps
-    cd neovim/.deps
-    cmake -G Ninja ../third-party/
-    cmake --build . --config RelWithDebInfo
-- build: |
-    mkdir neovim/build
-    cd neovim/build
-    cmake -G Ninja $CMAKE_EXTRA_FLAGS ..
-    cmake --build . --config RelWithDebInfo
-    ./bin/nvim --version
-- functionaltest: |
-    cd neovim/build
-    cmake --build . --config RelWithDebInfo --target functionaltest
-- oldtest: |
-    cd neovim
-    gmake oldtest

.clang-format

@@ -1,11 +1,11 @@
 BasedOnStyle:  Google
 Language: Cpp
-ColumnLimit: 100
+ColumnLimit: 80
 IndentWidth: 2
-TabWidth: 8
+TabWidth: 2
 UseTab: Never
-IndentCaseLabels: false
-BreakBeforeBraces: Custom
+IndentCaseLabels: true
+BreakBeforeBraces: Linux
 AlignEscapedNewlinesLeft: false
 AllowShortFunctionsOnASingleLine: false
 AlignTrailingComments: true
@@ -17,24 +17,4 @@ AllowShortLoopsOnASingleLine: false
 BinPackParameters: false
 BreakBeforeBinaryOperators: true
 BreakBeforeTernaryOperators: true
-ContinuationIndentWidth: 2
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: No
-AlwaysBreakTemplateDeclarations: No
-AlignEscapedNewlines: DontAlign
-BinPackArguments: false
-BraceWrapping:
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   true
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-PointerAlignment: Right
-SortIncludes: false
-Cpp11BracedListStyle: false
+ContinuationIndentWidth: 4

.clangd

@@ -1,2 +0,0 @@
-CompileFlags:
-  CompilationDatabase: build/       # Search build/ directory for compile_commands.json

.editorconfig

@@ -3,14 +3,10 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
-tab_width = 8
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 
-[*.{c,h,in,lua}]
-max_line_length = 100
-
 [{Makefile,**/Makefile,runtime/doc/*.txt}]
 indent_style = tab
 indent_size = 8

.flake8

@@ -1,2 +0,0 @@
-[flake8]
-max-line-length = 88

.git-blame-ignore-revs

@@ -1,53 +0,0 @@
-# To use this file (requires git 2.23):
-#   git config blame.ignoreRevsFile .git-blame-ignore-revs
-
-# eval.c: factor out eval/funcs.c #11828
-#   - This is a move/rename. git 2.33 doesn't know how to ignore it.
-#     It is here anyway, (1) in case git improves later, and (2) to
-#     save you the trouble of attempting this.
-6c5bbf07d988ef55e5e8ba8d70b62c1f0885261b
-
-# symbol renames
-6186df3562e33e92f04ed8c850204ceabc4746e1
-
-# style (uncrustify, etc.)
-2d240024acbd68c2d3f82bc72cb12b1a4928c6bf
-61178778230e609d68b271ffd53ffd993cd23c42
-15af08ad176339d1f269ce264bb0efea283c9536
-47f99d66440ae8be26b34531989ac61edc1ad9fe
-1e49a1c888a3d9a581f4aa409a26ada3ac2417cb
-3b3dbcf7b7ba5466e6ab643e256f2374b520a6b2
-e8067d1490a31ff76143d576dc9948b4f09c6c55
-d5b66e88601b4d2fde5d905f9d12847126ba4449
-07715044887d82f74254e64c4c32fa49b0501bea
-6ed43f8f1caad702f9590d174c5ec142f3d85b18
-0a83017fe95df0290adb98ec6bf457b96a3fab17
-867e8885991ae450019c18aa5e42546bd4b62c2c
-1f49268c46fcbe65f7e2e2cb620e6f51c059cf9e
-51a98aa0c2fe3231a0ffc8a78189bc6fafd6abf6
-853346a94d6aa78c97314a3b217fb5a5408a47f1
-30fefee684e641a0c6867446c6de30efa2f0a126
-f4ca3a29ddcb0c98e8e09c45a6342af709f8cc45
-48e67b229415b4e2b3315bd00b817e5f9ab970c8
-7a26eb8a567cbc831d4f629f9eccb767a44436b8
-2f9b9e61d7417183f2d9f36d804247c0926be9d4
-c0767bd4f3ce7b34bb77da0657c49ba10ba1b32e
-d90fb1c0bfc1e64c783c385a79e7de87013dadba
-9c268263b1792d00b3ffdfd7495af2575862656e
-8c74c895b300bcee5fa937a2329d1d4756567b42
-40be47e0faef7aa015eb4ba44ceb1ee1a03e97cf
-4472c56d54f447040f6e8610b261b7efa0d04eb6
-a68faed02dc8e37b8f10da14dc02e33e6ed93947
-725cbe7d414f609e769081276f2a034e32a4337b
-7e3bdc75e44b9139d8afaea4381b53ae78b15746
-4ba12b3dda34472c193c9fa8ffd7d3bd5b6c04d6
-849f104c2789c884428fd45501912c6591a78e12
-38dd53c525054daf83dba27d7d46e90e8b41fa50
-6059784770c4c88fb6fe528b9f7634192fa1164e
-ee031eb5256bb83e0d6add2bae6fd943a4186ffe
-69e11b58b4db0952f11a5ff85aa7150b5f5b8db8
-271bb32855853b011fceaf0ad2f829bce66b2a19
-
-# typos
-d238b8f6003d34cae7f65ff7585b48a2cd9449fb
-4547137aaff32b20172870a549d3a28a3c7adf1c

.gitattributes

@@ -1,6 +0,0 @@
-*.h linguist-language=C
-src/nvim/testdir/test42.in diff
-.github/ export-ignore
-.travis.yml export-ignore
-codecov.yml export-ignore
-.builds/ export-ignore

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: neovim
-open_collective: neovim

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,75 +0,0 @@
-name: Bug Report
-description: Report a problem in Neovim
-labels: [bug]
-body:
-
-  - type: markdown
-    attributes:
-      value: |
-        _Before reporting:_ search [existing issues](https://github.com/neovim/neovim/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and check the [FAQ](https://github.com/neovim/neovim/wiki/FAQ). Usage questions such as "How do I...?" belong on the [Neovim Discourse](https://neovim.discourse.group/c/7-category/7) and will be closed.
-
-  - type: input
-    attributes:
-      label: "Neovim version (nvim -v)"
-      placeholder: "0.6.0 commit db1b0ee3b30f"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "Vim (not Nvim) behaves the same?"
-      description: "Does `vim -u DEFAULTS` have the same issue? Note the exact Vim version (`8.x.yyyy`)."
-      placeholder: "no, vim 7.3.432"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "Operating system/version"
-      placeholder: "macOS 11.5"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "Terminal name/version"
-      placeholder: "xterm 3.1"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "$TERM environment variable"
-      placeholder: "xterm-256color"
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: "Installation"
-      description: "How did you install neovim: build from repo / system package manager / appimage / homebrew / snap / chocolatey / other (describe)?"
-      placeholder: "Arch User Repository (AUR)"
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: "How to reproduce the issue"
-      description: |
-        - Steps to reproduce using `nvim --clean` ("factory defaults").
-        - For build failures: list the exact steps including CMake flags (if any).
-        - For shell-related problems: try `env -i TERM=ansi-256color "$(which nvim)"`.
-      placeholder: |
-        nvim --clean
-        :edit foo
-        yiwp
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: "Expected behavior"
-      description: "Describe the behavior you expect. May include logs, images, or videos."
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: "Actual behavior"
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Question
-    url: https://neovim.discourse.group/
-    about: Ask questions about configuration and usage of Neovim

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,21 +0,0 @@
-name: Feature request
-description: Request an enhancement for Neovim
-labels: [enhancement]
-body:
-
-  - type: markdown
-    attributes:
-      value: |
-        Before requesting: search [existing issues](https://github.com/neovim/neovim/labels/enhancement) and check the [FAQ](https://github.com/neovim/neovim/wiki/FAQ).
-
-  - type: input
-    attributes:
-      label: "Feature already in Vim?"
-      description: "Does the feature already exist in Vim? If possible, specify which version (or commit) that introduced it."
-      placeholder: "Yes, Vim 7.3.432"
-
-  - type: textarea
-    attributes:
-      label: "Feature description"
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/lsp_bug_report.yml

@@ -1,54 +0,0 @@
-name: Language server (LSP) client bug
-description: Report an issue with Neovim LSP
-labels: [bug, lsp]
-body:
-
-  - type: markdown
-    attributes:
-      value: |
-        _Before reporting:_ search [existing issues](https://github.com/neovim/neovim/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and check the [FAQ](https://github.com/neovim/neovim/wiki/FAQ). Usage questions such as "How do I...?" or "Why isn't X language server/feature working?" belong on the [Neovim Discourse](https://neovim.discourse.group/c/7-category/7) and will be closed.
-
-  - type: input
-    attributes:
-      label: "Neovim version (nvim -v)"
-      placeholder: "0.6.0 commit db1b0ee3b30f"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "Language server name/version"
-      placeholder: "rls 0.5.2"
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: "Operating system/version"
-      placeholder: "emacs 23"
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: 'Steps to reproduce using "nvim -u minimal_init.lua"'
-      description: |
-        - Download the minimal config with `curl -LO https://raw.githubusercontent.com/neovim/nvim-lspconfig/master/test/minimal_init.lua` and modify it to include any specific commands or servers pertaining to your issues.
-        - _Note_: if the issue is with an autocompletion or other LSP plugin, report to that plugin's issue tracker.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: "Expected behavior"
-      description: "Describe the behavior you expect. May include logs, images, or videos."
-  - type: textarea
-    attributes:
-      label: "Actual behavior"
-
-  - type: input
-    attributes:
-      label: "Log file"
-      placeholder: "https://gist.github.com/prakhar1989/1b0a2c9849b2e1e912fb"
-      description: |
-        - Upload `lsp.log` before and after the problem in a [secret gist](https://gist.github.com/). Paste the URL to the gist.
-        - You can set the log level by adding `vim.lsp.set_log_level("debug")` after setting up LSP in your config.
-        - You can find the location of the log with `:lua print(vim.lsp.get_log_path())`

.github/labeler.yml

@@ -1,65 +0,0 @@
-"lsp":
-  - runtime/lua/vim/lsp.lua
-  - runtime/lua/vim/lsp/*
-
-"lua":
-  - runtime/lua/**/*
-  - src/nvim/lua/*
-
-"tui":
-  - src/nvim/tui/tui.*
-
-"treesitter":
-  - src/nvim/lua/treesitter.*
-  - runtime/lua/vim/treesitter.lua
-  - runtime/lua/vim/treesitter/*
-
-"diagnostic":
-  - runtime/lua/vim/diagnostic.lua
-
-"dependencies":
-  - third-party/**/*
-
-"spell":
-  - src/nvim/spell*
-
-"terminal":
-  - src/nvim/terminal.*
-
-"column":
-  - src/nvim/mark.h
-  - src/nvim/mark.c
-  - src/nvim/sign*
-
-"folds":
-  - src/nvim/fold*
-
-"mouse":
-  - src/nvim/mouse*
-
-"documentation":
-  - all: ["runtime/doc/*"]
-
-"clipboard":
-  - runtime/autoload/provider/clipboard.vim
-
-"diff":
-  - src/nvim/diff.*
-
-"build":
-  - CMakeLists.txt
-  - "**/CMakeLists.txt"
-  - "**/Makefile"
-  - "**/*.cmake"
-
-"test":
-  - all: ["test/**/*"]
-
-"ci":
-  - .github/labeler.yml
-  - .github/workflows/**/*
-  - .builds/*
-  - ci/**/*
-
-"filetype":
-  - runtime/lua/vim/filetype.lua

.github/scripts/remove-reviewers.js

@@ -1,16 +0,0 @@
-module.exports = async ({github, context}) => {
-  const requestedReviewers = await github.rest.pulls.listRequestedReviewers({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    pull_number: context.issue.number
-  });
-
-  const reviewers = requestedReviewers.data.users.map(e => e.login)
-
-  github.rest.pulls.removeRequestedReviewers({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    pull_number: context.issue.number,
-    reviewers: reviewers
-  });
-}

.github/scripts/reviews.js

@@ -1,95 +0,0 @@
-module.exports = async ({github, context}) => {
-  const pr_data = await github.rest.pulls.get({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    pull_number: context.issue.number
-  })
-  const labels = pr_data.data.labels.map(e => e.name)
-
-  const reviewers = new Set()
-  if (labels.includes('api')) {
-    reviewers.add("bfredl")
-    reviewers.add("gpanders")
-    reviewers.add("muniter")
-  }
-
-  if (labels.includes('build')) {
-    reviewers.add("jamessan")
-  }
-
-  if (labels.includes('ci')) {
-    reviewers.add("jamessan")
-  }
-
-  if (labels.includes('column')) {
-    reviewers.add("lewis6991")
-  }
-
-  if (labels.includes('diagnostic')) {
-    reviewers.add("gpanders")
-  }
-
-  if (labels.includes('diff')) {
-    reviewers.add("lewis6991")
-  }
-
-  if (labels.includes('dependencies')) {
-    reviewers.add("jamessan")
-  }
-
-  if (labels.includes('distribution')) {
-    reviewers.add("jamessan")
-  }
-
-  if (labels.includes('documentation')) {
-    reviewers.add("clason")
-  }
-
-  if (labels.includes('extmarks')) {
-    reviewers.add("bfredl")
-  }
-
-  if (labels.includes('filetype')) {
-    reviewers.add("clason")
-    reviewers.add("gpanders")
-  }
-
-  if (labels.includes('gui')) {
-    reviewers.add("glacambre")
-    reviewers.add("smolck")
-  }
-
-  if (labels.includes('lsp')) {
-    reviewers.add("mfussenegger")
-    reviewers.add("mjlbach")
-  }
-
-  if (labels.includes('treesitter')) {
-    reviewers.add("bfredl")
-    reviewers.add("vigoux")
-  }
-
-  if (labels.includes('typo')) {
-    reviewers.add("dundargoc")
-  }
-
-  if (labels.includes('ui')) {
-    reviewers.add("bfredl")
-  }
-
-  if (labels.includes('vim-patch')) {
-    reviewers.add("seandewar")
-    reviewers.add("zeertzjq")
-  }
-
-  // Remove person that opened the PR since they can't review themselves
-  const pr_opener = pr_data.data.user.login
-  reviewers.delete(pr_opener)
-
-  github.rest.pulls.requestReviewers({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    pull_number: context.issue.number,
-    reviewers: Array.from(reviewers)
-  });
-}

.github/workflows/api-docs-check.yml

@@ -1,20 +0,0 @@
-name: Missing API docs
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    branches-ignore:
-      - 'marvim/api-doc-update**'
-    paths:
-      - 'src/nvim/api/*.[ch]'
-      - 'runtime/lua/**.lua'
-      - 'runtime/doc/**'
-
-jobs:
-  call-regen-api-docs:
-    if: github.event.pull_request.draft == false
-    permissions:
-      contents: write
-      pull-requests: write
-    uses: ./.github/workflows/api-docs.yml
-    with:
-      check_only: true

.github/workflows/api-docs.yml

@@ -1,70 +0,0 @@
-# Autogenerate the API docs on new commit to important branches
-# Also work as a check for PR's to not forget committing their doc changes
-# called from api-docs-check.yml
-name: Autogenerate API docs
-on:
-  push:
-    paths:
-      - 'src/nvim/api/*.[ch]'
-      - 'runtime/lua/**.lua'
-      - 'runtime/doc/**'
-    branches:
-      - 'master'
-      - 'release-[0-9]+.[0-9]+'
-  workflow_dispatch:
-  workflow_call:
-    inputs:
-      check_only:
-        type: boolean
-        default: false
-        required: false
-
-jobs:
-  regen-api-docs:
-    runs-on: ubuntu-20.04
-    permissions:
-      contents: write
-      pull-requests: write
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y python3 luajit
-          conda install -c conda-forge doxygen=1.9.2 msgpack-python
-          echo "$CONDA/bin" >> $GITHUB_PATH
-
-      - name: Setup git config
-        run: |
-          git config --global user.name 'marvim'
-          git config --global user.email 'marvim@users.noreply.github.com'
-
-      - run: printf 'DOC_BRANCH=marvim/api-doc-update/%s\n' ${GITHUB_REF#refs/heads/} >> $GITHUB_ENV
-
-      - name: Generate docs
-        id: docs
-        run: |
-          git checkout -b ${DOC_BRANCH}
-          python3 scripts/gen_vimdoc.py
-          printf '::set-output name=UPDATED_DOCS::%s\n' $([ -z "$(git diff)" ]; echo $?)
-
-      - name: FAIL, PR has not committed doc changes
-        if: ${{ steps.docs.outputs.UPDATED_DOCS != 0 && inputs.check_only }}
-        run: |
-          echo "Job failed, run ./scripts/gen_vimdoc.py and commit your doc changes"
-          echo "The doc generation produces the following changes:"
-          git --no-pager diff
-          exit 1
-
-      - name: Automatic PR
-        if: ${{ steps.docs.outputs.UPDATED_DOCS != 0 && !inputs.check_only }}
-        run: |
-          git add -u
-          git commit -m 'docs: regenerate [skip ci]'
-          git push --force https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY} ${DOC_BRANCH}
-          gh pr create --draft --fill --base ${GITHUB_REF#refs/heads/} --head ${DOC_BRANCH} || true

.github/workflows/backport.yml

@@ -1,33 +0,0 @@
-name: Backport
-on:
-  pull_request_target:
-    types: [closed, labeled]
-  issue_comment:
-    types: [created]
-jobs:
-  backport:
-    permissions:
-      contents: write
-      pull-requests: write
-    name: Backport Pull Request
-    if: >
-      github.repository_owner == 'neovim' && (
-        github.event_name == 'pull_request_target' &&
-        github.event.pull_request.merged
-      ) || (
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        contains(github.event.comment.body, '/backport')
-      )
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          # required to find all branches
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
-      - name: Create backport PRs
-        uses: zeebe-io/backport-action@v0.0.7
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          github_workspace: ${{ github.workspace }}

.github/workflows/ci.yml

@@ -1,249 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - 'master'
-      - 'release-[0-9]+.[0-9]+'
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-    branches:
-      - 'master'
-      - 'release-[0-9]+.[0-9]+'
-    paths-ignore:
-      - 'runtime/doc/*'
-
-# Cancel any in-progress CI runs for a PR if it is updated
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  lint:
-    # This job tests two things: it lints the code but also builds neovim using
-    # system dependencies instead of bundled dependencies. This is to make sure
-    # we are able to build neovim without pigeonholing ourselves into specifics
-    # of the bundled dependencies.
-
-    if: (github.event_name == 'pull_request' && github.base_ref == 'master' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/master')
-    runs-on: ubuntu-20.04
-    timeout-minutes: 10
-    env:
-      CC: gcc
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup common environment variables
-        run: ./.github/workflows/env.sh lint
-
-      - name: Install apt packages
-        run: |
-          sudo add-apt-repository ppa:neovim-ppa/stable
-          sudo apt-get update
-          sudo apt-get install -y \
-            autoconf \
-            automake \
-            build-essential \
-            ccache \
-            cmake \
-            flake8 \
-            gettext \
-            gperf \
-            libluajit-5.1-dev \
-            libmsgpack-dev \
-            libtermkey-dev \
-            libtool-bin \
-            libtree-sitter-dev \
-            libunibilium-dev \
-            libuv1-dev \
-            libvterm-dev \
-            locales \
-            lua-busted \
-            lua-check \
-            lua-filesystem \
-            lua-inspect \
-            lua-lpeg \
-            lua-luv-dev \
-            lua-nvim \
-            luajit \
-            ninja-build \
-            pkg-config
-
-      - name: Cache artifacts
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ env.CACHE_NVIM_DEPS_DIR }}
-            ~/.ccache
-          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!third-party/**CMakeLists.txt') }}-${{ github.base_ref }}
-
-      - name: Build third-party
-        run: ./ci/before_script.sh
-
-      - name: Build nvim
-        run: ./ci/run_tests.sh build_nvim
-
-      - if: "!cancelled()"
-        name: clint-full
-        run: ./ci/run_lint.sh clint-full
-
-      - if: "!cancelled()"
-        name: lualint
-        run: ./ci/run_lint.sh lualint
-
-      - if: "!cancelled()"
-        name: pylint
-        run: ./ci/run_lint.sh pylint
-
-      - if: "!cancelled()"
-        name: shlint
-        run: ./ci/run_lint.sh shlint
-
-      - if: "!cancelled()"
-        name: check-single-includes
-        run: ./ci/run_lint.sh check-single-includes
-
-      - name: Cache dependencies
-        run: ./ci/before_cache.sh
-
-  posix:
-    name: ${{ matrix.runner }} ${{ matrix.flavor }} (cc=${{ matrix.cc }})
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - flavor: asan
-            cc: clang-13
-            runner: ubuntu-20.04
-            os: linux
-          - flavor: tsan
-            cc: clang-13
-            runner: ubuntu-20.04
-            os: linux
-          - cc: clang
-            runner: macos-10.15
-            os: osx
-          - cc: clang
-            runner: macos-11.0
-            os: osx
-
-            # The functionaltest-lua test two things simultaneously:
-            # 1. Check that the tests pass with PUC Lua instead of LuaJIT.
-            # 2. Use as oldest/minimum versions of dependencies/build tools we
-            #    still explicitly support so we don't accidentally rely on
-            #    features that is only available on later versions.
-          - flavor: functionaltest-lua
-            cc: gcc
-            runner: ubuntu-20.04
-            os: linux
-            cmake: minimum_required
-    runs-on: ${{ matrix.runner }}
-    timeout-minutes: 45
-    if: github.event.pull_request.draft == false
-    env:
-      CC: ${{ matrix.cc }}
-      CI_OS_NAME: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup common environment variables
-        run: ./.github/workflows/env.sh ${{ matrix.flavor }}
-
-      - name: Install apt packages
-        if: matrix.os == 'linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y autoconf automake build-essential ccache cmake cpanminus cscope gcc-multilib gdb gettext gperf language-pack-tr libtool-bin locales ninja-build pkg-config python3 python3-pip python3-setuptools unzip valgrind xclip
-
-      - name: Install minimum required version of cmake
-        if: matrix.cmake == 'minimum_required'
-        env:
-          CMAKE_URL: 'https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.sh'
-          CMAKE_VERSION: '3.10.0'
-        shell: bash
-        run: |
-          curl --retry 5 --silent --show-error --fail -o /tmp/cmake-installer.sh "$CMAKE_URL"
-          mkdir -p "$HOME/.local/bin" /opt/cmake-custom
-          chmod a+x /tmp/cmake-installer.sh
-          /tmp/cmake-installer.sh --prefix=/opt/cmake-custom --skip-license
-          ln -sfn /opt/cmake-custom/bin/cmake "$HOME/.local/bin/cmake"
-          cmake_version="$(cmake --version | head -1)"
-          echo "$cmake_version" | grep -qF "cmake version $CMAKE_VERSION" || {
-            echo "Unexpected CMake version: $cmake_version"
-            exit 1
-          }
-
-      - name: Install new clang
-        if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
-        run: |
-          wget https://apt.llvm.org/llvm.sh
-          chmod a+x llvm.sh
-          sudo ./llvm.sh 13
-          rm llvm.sh
-
-      - name: Install brew packages
-        if: matrix.os == 'osx'
-        run: |
-          brew update --quiet
-          brew install automake ccache cpanminus ninja
-
-      - name: Setup interpreter packages
-        run: ./ci/install.sh
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: |
-            ${{ env.CACHE_NVIM_DEPS_DIR }}
-            ~/.ccache
-          key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'third-party/**', '**/CMakeLists.txt') }}-${{ github.base_ref }}
-
-      - name: Build third-party
-        run: ./ci/before_script.sh
-
-      - name: Build
-        run: ./ci/run_tests.sh build_nvim
-
-      - if: matrix.flavor != 'tsan' && matrix.flavor != 'functionaltest-lua' && !cancelled()
-        name: Unittests
-        run: ./ci/run_tests.sh unittests
-
-      - if: matrix.flavor != 'tsan' && !cancelled()
-        name: Functionaltests
-        run: ./ci/run_tests.sh functionaltests
-
-      - if: "!cancelled()"
-        name: Oldtests
-        run: ./ci/run_tests.sh oldtests
-
-      - if: "!cancelled()"
-        name: Install nvim
-        run: ./ci/run_tests.sh install_nvim
-
-      - name: Cache dependencies
-        run: ./ci/before_cache.sh
-
-  windows:
-    runs-on: windows-2019
-    timeout-minutes: 45
-    if: github.event.pull_request.draft == false
-    env:
-      DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
-      DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config: [ MINGW_64-gcov, MSVC_64 ]
-    name: windows (${{ matrix.config }})
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.DEPS_BUILD_DIR }}
-          key: ${{ matrix.config }}-${{ hashFiles('third-party\**') }}
-
-      - name: Run CI
-        run: powershell ci\build.ps1
-        env:
-          CONFIGURATION: ${{ matrix.config }}

.github/workflows/commitlint.yml

@@ -1,23 +0,0 @@
-name: "Commit Linter"
-on:
-  # Only pull_request and push honor [skip ci].  Since this workflow must pass
-  # to merge a PR, it can't be skipped, so use pull_request_target
-  pull_request_target:
-    types: [opened, synchronize, reopened, ready_for_review]
-    branches:
-      - 'master'
-jobs:
-  lint-commits:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.draft == false
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha }}
-          path: pr_nvim
-      - uses: rhysd/action-setup-vim@v1
-        with:
-          neovim: true
-      - run: wget https://raw.githubusercontent.com/neovim/neovim/master/scripts/lintcommit.lua
-      - run: nvim --clean -es +"cd pr_nvim" +"lua dofile('../lintcommit.lua').main({trace=true})"

.github/workflows/coverity-scan.yml

@@ -1,44 +0,0 @@
-name: Coverity
-on:
-  schedule:
-    - cron: '0 10 * * 1'  # Run every Monday at 00:10
-  workflow_dispatch:
-
-jobs:
-  scan:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y autoconf automake build-essential cmake gettext gperf libtool-bin locales ninja-build pkg-config unzip
-
-      - name: Download Coverity
-        run: |
-          wget -q https://scan.coverity.com/download/cxx/linux64 --post-data "token=$TOKEN&project=neovim%2Fneovim" -O coverity_tool.tgz
-          mkdir cov-scan
-          tar ax -f coverity_tool.tgz --strip-components=1 -C cov-scan
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-
-      - name: Build dependencies
-        run: make deps
-
-      - name: Build/scan neovim
-        run: |
-          env PATH=$(pwd)/cov-scan/bin:$PATH cov-build --dir cov-int make
-
-      - name: Submit results
-        run: |
-          tar zcf cov-scan.tgz cov-int
-          curl --form token=$TOKEN \
-            --form email=$EMAIL \
-            --form file=@cov-scan.tgz \
-            --form version="$(git rev-parse HEAD)" \
-            --form description="Weekly GHA scan" \
-            'https://scan.coverity.com/builds?project=neovim%2Fneovim'
-        env:
-          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-          EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}

.github/workflows/env.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-set -e -u
-
-FLAVOR=${1:-}
-
-cat <<EOF >> "$GITHUB_PATH"
-$HOME/.local/bin
-EOF
-
-cat <<EOF >> "$GITHUB_ENV"
-CACHE_ENABLE=true
-CI_TARGET=tests
-CI_BUILD_DIR=$GITHUB_WORKSPACE
-BUILD_DIR=$GITHUB_WORKSPACE/build
-DEPS_BUILD_DIR=$HOME/nvim-deps
-INSTALL_PREFIX=$HOME/nvim-install
-LOG_DIR=$GITHUB_WORKSPACE/build/log
-NVIM_LOG_FILE=$GITHUB_WORKSPACE/build/.nvimlog
-VALGRIND_LOG=$GITHUB_WORKSPACE/build/log/valgrind-%p.log
-CACHE_NVIM_DEPS_DIR=$HOME/.cache/nvim-deps
-CACHE_MARKER=$HOME/.cache/nvim-deps/.ci_cache_marker
-CCACHE_BASEDIR=$GITHUB_WORKSPACE
-CCACHE_COMPRESS=1
-CCACHE_SLOPPINESS=time_macros,file_macro
-CCACHE_DIR=$HOME/.ccache
-EOF
-
-DEPS_CMAKE_FLAGS=-DUSE_BUNDLED_GPERF=OFF
-FUNCTIONALTEST=functionaltest
-BUILD_FLAGS="CMAKE_FLAGS=-DCI_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=$HOME/nvim-install -DBUSTED_OUTPUT_TYPE=nvim -DDEPS_PREFIX=$HOME/nvim-deps/usr -DMIN_LOG_LEVEL=3"
-
-case "$FLAVOR" in
-  asan)
-    BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"
-    cat <<EOF >> "$GITHUB_ENV"
-CLANG_SANITIZER=ASAN_UBSAN
-SYMBOLIZER=asan_symbolize-13
-ASAN_OPTIONS=detect_leaks=1:check_initialization_order=1:log_path=$GITHUB_WORKSPACE/build/log/asan:intercept_tls_get_addr=0
-UBSAN_OPTIONS=print_stacktrace=1 log_path=$GITHUB_WORKSPACE/build/log/ubsan
-EOF
-    ;;
-  tsan)
-    cat <<EOF >> "$GITHUB_ENV"
-TSAN_OPTIONS=log_path=$GITHUB_WORKSPACE/build/log/tsan
-CLANG_SANITIZER=TSAN
-EOF
-    ;;
-  lint)
-# Re-enable once system deps are available
-#    BUILD_FLAGS="$BUILD_FLAGS -DLIBLUV_LIBRARY:FILEPATH=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/lua/5.1/luv.so -DLIBLUV_INCLUDE_DIR:PATH=/usr/include/lua5.1"
-    DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUV=ON"
-    cat <<EOF >> "$GITHUB_ENV"
-USE_BUNDLED=OFF
-CI_TARGET=lint
-EOF
-    ;;
-  functionaltest-lua)
-    BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"
-    FUNCTIONALTEST=functionaltest-lua
-    DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
-    ;;
-  *)
-    ;;
-esac
-
-cat <<EOF >> "$GITHUB_ENV"
-$BUILD_FLAGS
-DEPS_CMAKE_FLAGS=$DEPS_CMAKE_FLAGS
-FUNCTIONALTEST=$FUNCTIONALTEST
-EOF

.github/workflows/labeler.yml

@@ -1,49 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  pull_request_target:
-    types: [opened]
-jobs:
-
-  triage:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-    - uses: actions/labeler@main
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        sync-labels: ""
-
-  type-scope:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      GH_REPO: ${{ github.repository }}
-      PR_NUMBER: ${{ github.event.pull_request.number }}
-      PR_TITLE: ${{ github.event.pull_request.title }}
-    steps:
-    - name: "Extract commit type and add as label"
-      run: gh pr edit "$PR_NUMBER" --add-label "$(echo "$PR_TITLE" | sed -E 's|([[:alpha:]]+)(\(.*\))?!?:.*|\1|')" || true
-    - name: "Extract commit scope and add as label"
-      run: gh pr edit "$PR_NUMBER" --add-label "$(echo "$PR_TITLE" | sed -E 's|[[:alpha:]]+\((.+)\)!?:.*|\1|')" || true
-    - name: "Extract if the PR is a breaking change and add it as label"
-      run: gh pr edit "$PR_NUMBER" --add-label "$(echo "$PR_TITLE" | sed -E 's|[[:alpha:]]+(\(.*\))?!:.*|breaking-change|')" || true
-
-  request-reviewer:
-    if: github.event.pull_request.state == 'open' && github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    needs: ["triage", "type-scope"]
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@v2
-      - name: 'Request reviewers'
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const script = require('./.github/scripts/reviews.js')
-            await script({github, context})

.github/workflows/notes.md

@@ -1,64 +0,0 @@
-```
-${NVIM_VERSION}
-```
-
-## Install
-
-### Windows
-
-#### Zip
-
-1. Download **nvim-win64.zip**
-2. Extract the zip.
-3. Run `nvim-qt.exe`
-
-#### MSI
-
-1. Download **nvim-win64.msi**
-2. Run the MSI
-3. Search and run `nvim-qt.exe` or run `nvim.exe` on your CLI of choice.
-
-### macOS
-
-1. Download **nvim-macos.tar.gz**
-2. Extract: `tar xzvf nvim-macos.tar.gz`
-3. Run `./nvim-macos/bin/nvim`
-
-### Linux (x64)
-
-#### Tarball
-
-1. Download **nvim-linux64.tar.gz**
-2. Extract: `tar xzvf nvim-linux64.tar.gz`
-3. Run `./nvim-linux64/bin/nvim`
-
-#### Debian Package
-
-1. Download **nvim-linux64.deb**
-2. Install the package using `sudo apt install ./nvim-linux64.deb`
-3. Run `nvim`
-
-#### AppImage
-1. Download **nvim.appimage**
-2. Run `chmod u+x nvim.appimage && ./nvim.appimage`
-   - If your system does not have FUSE you can [extract the appimage](https://github.com/AppImage/AppImageKit/wiki/FUSE#type-2-appimage):
-     ```
-     ./nvim.appimage --appimage-extract
-     ./squashfs-root/usr/bin/nvim
-     ```
-
-### Other
-
-- Install by [package manager](https://github.com/neovim/neovim/wiki/Installing-Neovim)
-
-## SHA256 Checksums
-
-```
-${SHA_LINUX_64_TAR}
-${SHA_LINUX_64_DEB}
-${SHA_APP_IMAGE}
-${SHA_APP_IMAGE_ZSYNC}
-${SHA_MACOS}
-${SHA_WIN_64_ZIP}
-${SHA_WIN_64_MSI}
-```

.github/workflows/release.yml

@@ -1,243 +0,0 @@
-name: Release
-on:
-  schedule:
-    - cron: '5 5 * * *'
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Tag name for release'
-        required: false
-        default: nightly
-  push:
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-
-# Build on the oldest supported images, so we have broader compatibility
-# Upgrade to gcc-11 to prevent it from using its builtins (#14150)
-jobs:
-  linux:
-    runs-on: ubuntu-18.04
-    outputs:
-      version: ${{ steps.build.outputs.version }}
-      release: ${{ steps.build.outputs.release }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y autoconf automake build-essential cmake gcc-11 gettext gperf libtool-bin locales ninja-build pkg-config unzip
-      - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name != 'nightly')
-        run: printf 'NVIM_BUILD_TYPE=Release\n' >> $GITHUB_ENV
-      - if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
-        run: printf 'NVIM_BUILD_TYPE=RelWithDebInfo\n' >> $GITHUB_ENV
-      - name: Build release
-        id: build
-        run: |
-          CC=gcc-11 make CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH="
-          printf '::set-output name=version::%s\n' "$(./build/bin/nvim --version | head -n 3 | sed -z 's/\n/%0A/g')"
-          printf '::set-output name=release::%s\n' "$(./build/bin/nvim --version | head -n 1)"
-          make DESTDIR="$GITHUB_WORKSPACE/build/release/nvim-linux64" install
-          cd "$GITHUB_WORKSPACE/build/"
-          cpack -C $NVIM_BUILD_TYPE
-      - uses: actions/upload-artifact@v2
-        with:
-          name: nvim-linux64
-          path: build/nvim-linux64.tar.gz
-          retention-days: 1
-      - uses: actions/upload-artifact@v2
-        with:
-          name: nvim-linux64
-          path: build/nvim-linux64.deb
-          retention-days: 1
-
-  appimage:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y autoconf automake build-essential cmake gcc-11 gettext gperf libtool-bin locales ninja-build pkg-config unzip
-      - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name != 'nightly')
-        run: CC=gcc-11 make appimage-latest
-      - if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
-        run: CC=gcc-11 make appimage-nightly
-      - uses: actions/upload-artifact@v2
-        with:
-          name: appimage
-          path: build/bin/nvim.appimage
-          retention-days: 1
-      - uses: actions/upload-artifact@v2
-        with:
-          name: appimage
-          path: build/bin/nvim.appimage.zsync
-          retention-days: 1
-
-  macOS:
-    runs-on: macos-11
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Install brew packages
-        run: |
-          brew update --quiet
-          brew install automake ninja
-      - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name != 'nightly')
-        run: printf 'NVIM_BUILD_TYPE=Release\n' >> $GITHUB_ENV
-      - if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
-        run: printf 'NVIM_BUILD_TYPE=RelWithDebInfo\n' >> $GITHUB_ENV
-      - name: Provision universal `libintl`
-        run: |
-          GETTEXT_PREFIX="$(brew --prefix gettext)"
-          printf 'GETTEXT_PREFIX=%s\n' "$GETTEXT_PREFIX" >> $GITHUB_ENV
-          bottle_tag="arm64_big_sur"
-          brew fetch --bottle-tag="$bottle_tag" gettext
-          cd "$(mktemp -d)"
-          tar xf "$(brew --cache)"/**/*gettext*${bottle_tag}*.tar.gz
-          lipo gettext/*/lib/libintl.a "${GETTEXT_PREFIX}/lib/libintl.a" -create -output libintl.a
-          mv -f libintl.a /usr/local/lib/
-      - name: Ensure static linkage to `libintl`
-        run: |
-          # We're about to mangle `gettext`, so let's remove any potentially broken
-          # installs (e.g. curl, git) as those could interfere with our build.
-          brew uninstall $(brew uses --installed --recursive gettext)
-          brew unlink gettext
-          ln -sf "$(brew --prefix)/opt/$(readlink "${GETTEXT_PREFIX}")/bin"/* /usr/local/bin/
-          rm -f "$GETTEXT_PREFIX"
-      - name: Build release
-        run: |
-          export MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion | cut -f1 -d.)"
-          OSX_FLAGS="-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_ARCHITECTURES=arm64\;x86_64"
-          make CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} \
-               CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH= $OSX_FLAGS" \
-               DEPS_CMAKE_FLAGS="$OSX_FLAGS"
-          make DESTDIR="$GITHUB_WORKSPACE/build/release/nvim-macos" install
-      - name: Create package
-        run: |
-          cd "$GITHUB_WORKSPACE/build/release"
-          tar cfz nvim-macos.tar.gz nvim-macos
-      - uses: actions/upload-artifact@v3
-        with:
-          name: nvim-macos
-          path: build/release/nvim-macos.tar.gz
-          retention-days: 1
-
-  windows:
-    runs-on: windows-2019
-    env:
-      DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
-      DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
-    strategy:
-      matrix:
-        include:
-          - config: MSVC_64
-            archive: nvim-win64
-    name: windows (${{ matrix.config }})
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - run: powershell ci\build.ps1 -NoTests
-        env:
-          CONFIGURATION: ${{ matrix.config }}
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ matrix.archive }}
-          path: build/${{ matrix.archive }}.zip
-          retention-days: 1
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ matrix.archive }}
-          path: build/${{ matrix.archive }}.msi
-          retention-days: 1
-
-  publish:
-    needs: [linux, appimage, macOS, windows]
-    runs-on: ubuntu-20.04
-    env:
-      GH_REPO: ${{ github.repository }}
-    permissions:
-      contents: write
-    steps:
-      # Must perform checkout first, since it deletes the target directory
-      # before running, and would therefore delete the downloaded artifacts
-      - uses: actions/checkout@v2
-
-      - uses: actions/download-artifact@v2
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gettext-base
-
-      - if: github.event_name == 'workflow_dispatch'
-        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
-      - if: github.event_name == 'schedule'
-        run: echo 'TAG_NAME=nightly' >> $GITHUB_ENV
-      - if: github.event_name == 'push'
-        run: |
-          TAG_NAME=${{ github.ref }}
-          echo "TAG_NAME=${TAG_NAME#refs/tags/}" >> $GITHUB_ENV
-      - if: env.TAG_NAME == 'nightly'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          (echo 'SUBJECT=Nvim development (prerelease) build';
-           echo 'PRERELEASE=--prerelease') >> $GITHUB_ENV
-          gh release delete nightly --yes || true
-          git push origin :nightly || true
-      - if: env.TAG_NAME != 'nightly'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          (echo 'SUBJECT=Nvim release build';
-           echo 'PRERELEASE=') >> $GITHUB_ENV
-          gh release delete stable --yes || true
-          git push origin :stable || true
-      # `sha256sum` outputs <sha> <path>, so we cd into each dir to drop the
-      # containing folder from the output.
-      - name: Generate Linux64 SHA256 checksums
-        run: |
-          cd ./nvim-linux64
-          sha256sum nvim-linux64.tar.gz > nvim-linux64.tar.gz.sha256sum
-          echo "SHA_LINUX_64_TAR=$(cat nvim-linux64.tar.gz.sha256sum)" >> $GITHUB_ENV
-          sha256sum nvim-linux64.deb > nvim-linux64.deb.sha256sum
-          echo "SHA_LINUX_64_DEB=$(cat nvim-linux64.deb.sha256sum)" >> $GITHUB_ENV
-      - name: Generate App Image SHA256 checksums
-        run: |
-          cd ./appimage
-          sha256sum nvim.appimage > nvim.appimage.sha256sum
-          echo "SHA_APP_IMAGE=$(cat nvim.appimage.sha256sum)" >> $GITHUB_ENV
-      - name: Generate App Image Zsync SHA256 checksums
-        run: |
-          cd ./appimage
-          sha256sum nvim.appimage.zsync > nvim.appimage.zsync.sha256sum
-          echo "SHA_APP_IMAGE_ZSYNC=$(cat nvim.appimage.zsync.sha256sum)" >> $GITHUB_ENV
-      - name: Generate macOS SHA256 checksums
-        run: |
-          cd ./nvim-macos
-          sha256sum nvim-macos.tar.gz > nvim-macos.tar.gz.sha256sum
-          echo "SHA_MACOS=$(cat nvim-macos.tar.gz.sha256sum)" >> $GITHUB_ENV
-      - name: Generate Win64 SHA256 checksums
-        run: |
-          cd ./nvim-win64
-          sha256sum nvim-win64.zip > nvim-win64.zip.sha256sum
-          echo "SHA_WIN_64_ZIP=$(cat nvim-win64.zip.sha256sum)" >> $GITHUB_ENV
-          sha256sum nvim-win64.msi > nvim-win64.msi.sha256sum
-          echo "SHA_WIN_64_MSI=$(cat nvim-win64.msi.sha256sum)" >> $GITHUB_ENV
-      - name: Publish release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NVIM_VERSION: ${{ needs.linux.outputs.version }}
-          DEBUG: api
-        run: |
-          envsubst < "$GITHUB_WORKSPACE/.github/workflows/notes.md" > "$RUNNER_TEMP/notes.md"
-          gh release create $TAG_NAME $PRERELEASE --notes-file "$RUNNER_TEMP/notes.md" --title "$SUBJECT" --target $GITHUB_SHA nvim-macos/* nvim-linux64/* appimage/* nvim-win64/*
-          if [ "$TAG_NAME" != "nightly" ]; then
-            gh release create stable $PRERELEASE --notes-file "$RUNNER_TEMP/notes.md" --title "$SUBJECT" --target $GITHUB_SHA nvim-macos/* nvim-linux64/* appimage/* nvim-win64/*
-          fi

.github/workflows/remove-reviewers-on-draft.yml

@@ -1,17 +0,0 @@
-name: "Remove reviewers"
-on:
-  pull_request_target:
-    types: [converted_to_draft, closed]
-jobs:
-  remove-reviewers:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@v2
-      - name: 'Remove reviewers'
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const script = require('./.github/scripts/remove-reviewers.js')
-            await script({github, context})

.github/workflows/reviews.yml

@@ -1,18 +0,0 @@
-name: "Request reviews"
-on:
-  pull_request_target:
-    types: [labeled, ready_for_review]
-jobs:
-  request-reviewer:
-    if: github.event.pull_request.state == 'open' && github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: actions/checkout@v2
-      - name: 'Request reviewers'
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const script = require('./.github/scripts/reviews.js')
-            await script({github, context})

.github/workflows/vim-patches.yml

@@ -1,52 +0,0 @@
-name: vim-patches
-on:
-  schedule:
-    - cron: '3 3 * * *'
-
-jobs:
-  update-vim-patches:
-    runs-on: ubuntu-20.04
-    permissions:
-      contents: write
-      pull-requests: write
-    env:
-      VIM_SOURCE_DIR: ${{ format('{0}/vim-src', github.workspace) }}
-      VERSION_BRANCH: marvim/ci-version-update
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - uses: actions/checkout@v2
-        with:
-          repository: vim/vim
-          path: ${{ env.VIM_SOURCE_DIR }}
-          fetch-depth: 0
-
-      - run: |
-          gh release download -R neovim/neovim -p nvim.appimage
-          chmod a+x nvim.appimage
-          mkdir -p $HOME/.local/bin
-          mv nvim.appimage $HOME/.local/bin/nvim
-          printf '%s\n' "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Setup git config
-        run: |
-          git config --global user.name 'marvim'
-          git config --global user.email 'marvim@users.noreply.github.com'
-
-      - name: Update src/version.c
-        id: update-version
-        run: |
-          git checkout -b ${VERSION_BRANCH}
-          nvim -i NONE -u NONE --headless +'luafile scripts/vimpatch.lua' +q
-          printf '::set-output name=NEW_PATCHES::%s\n' $([ -z "$(git diff)" ]; echo $?)
-
-      - name: Automatic PR
-        if: ${{ steps.update-version.outputs.NEW_PATCHES != 0 }}
-        run: |
-          git add -u
-          git commit -m 'version.c: update [skip ci]'
-          git push --force https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY} ${VERSION_BRANCH}
-          gh pr create --draft --fill --label vim-patch --base ${GITHUB_REF#refs/heads/} --head ${VERSION_BRANCH} || true

.gitignore

@@ -1,23 +1,15 @@
 # Tools
-/venv/
-compile_commands.json
-/.luarc.json
-
-# IDEs
+.ropeproject/
+# Visual Studio
 /.vs/
-/.vscode/
-/.idea/
 
 # Build/deps dir
 /build/
+/cmake-build-debug/
+/dist/
 /.deps/
 /tmp/
-/.clangd/
-/.cache/clangd/
-/.ccls-cache/
-/.clang-tidy
 
-.DS_Store
 *.mo
 .*.sw?
 *~
@@ -25,6 +17,8 @@ compile_commands.json
 *.o
 *.so
 
+tags
+
 /src/nvim/po/vim.pot
 /src/nvim/po/*.ck
 
@@ -32,14 +26,13 @@ compile_commands.json
 /.nvimlog
 
 # Generated by scripts/vim-patch.sh
-/.vim-src
-*.rej
+/.vim-src/
 
 # Generated by old (Vim) tests.
 /src/nvim/testdir/del
 /src/nvim/testdir/test*.out
 /src/nvim/testdir/test*.res
-/src/nvim/testdir/test*.log
+/src/nvim/testdir/test.log
 /src/nvim/testdir/messages
 /src/nvim/testdir/viminfo
 /src/nvim/testdir/test.ok
@@ -47,29 +40,17 @@ compile_commands.json
 /src/nvim/testdir/X*
 /src/nvim/testdir/valgrind.*
 /src/nvim/testdir/.gdbinit
-/runtime/indent/testdir/*.out
-+runtime/indent/testdir/*.fail
-# Generated by src/nvim/testdir/runnvim.sh.
-/src/nvim/testdir/*.tlog
 
 # Generated by unit tests.
 /test/includes/post/
 
-# Generated by luacheck during `make lualint'
-.luacheckcache
+# Generated by luacheck during `make testlint'
+/test/.luacheckcache
 
 # local make targets
 local.mk
 
-# Generated from :help docs
-tags
+# runtime/doc
 /runtime/doc/*.html
 /runtime/doc/tags.ref
 /runtime/doc/errors.log
-
-# Generated by gen_vimdoc.py:
-/runtime/doc/*.mpack
-/tmp-*-doc
-
-# vim patches
-/vim-*.patch

.luacheckrc

@@ -1,35 +0,0 @@
--- vim: ft=lua tw=80
-
-stds.nvim = {
-  read_globals = { "jit" }
-}
-std = "lua51+nvim"
-
--- Ignore W211 (unused variable) with preload files.
-files["**/preload.lua"] = {ignore = { "211" }}
--- Allow vim module to modify itself, but only here.
-files["src/nvim/lua/vim.lua"] = {ignore = { "122/vim" }}
-
--- Don't report unused self arguments of methods.
-self = false
-
--- Rerun tests only if their modification time changed.
-cache = true
-
-ignore = {
-  "631",  -- max_line_length
-  "212/_.*",  -- unused argument, for vars with "_" prefix
-}
-
--- Global objects defined by the C code
-read_globals = {
-  "vim",
-}
-
-globals = {
-  "vim.g",
-}
-
-exclude_files = {
-  'test/functional/fixtures/lua/syntax_error.lua',
-}

.luacov

@@ -1,22 +0,0 @@
--- Configuration file for LuaCov
-
-local source = require("lfs").currentdir()
-
-local function pesc(s)
-  assert(type(s) == 'string', s)
-  return s:gsub('[%(%)%.%%%+%-%*%?%[%]%^%$]', '%%%1')
-end
-
-return {
-  include = {
-    -- Absolute paths (starting with source dir, not hidden (i.e. .deps)).
-    pesc(source) .. "[/\\][^.].+",
-    -- Relative (non-hidden) paths.
-    '^[^/\\.]',
-  },
-  modules = {
-    ['vim'] = 'runtime/lua/vim/shared.lua'
-  },
-}
-
--- vim: ft=lua tw=80 sw=2 et

.mailmap

@@ -1,134 +0,0 @@
-Abdelhakeem <abdelhakeem.osama@hotmail.com> Abdelhakeem Osama
-Alvaro Muñoz <alvaro@pwntester.com> Alvaro Muñoz
-Andreas Johansson <andreas@ndrs.xyz> <ndreas@users.noreply.github.com>
-Andrew Pyatkov <mrbiggfoot@gmail.com> <mrbiggfoot@users.noreply.github.com>
-Anmol Sethi <hi@nhooyr.io> <anmol@aubble.com>
-Anmol Sethi <hi@nhooyr.io> <me@anmol.io>
-Anmol Sethi <hi@nhooyr.io> <nhooyr@users.noreply.github.com>
-BK1603 <chouhan.shreyansh2702@gmail.com> Shreyansh Chouhan
-Billy Su <g4691821@gmail.com> Billy SU
-Billy Vong <billyvg@gmail.com> <billyvg@users.noreply.github.com>
-Björn Linse <bjorn.linse@gmail.com> bfredl
-Carlos Hernandez <carlos@techbyte.ca> <hurricanehrndz@users.noreply.github.com>
-Chris Kipp <ckipp@pm.me> ckipp01
-Christian Clason <c.clason@uni-graz.at> <christian.clason@uni-due.de>
-Cédric Barreteau <> <cbarrete@users.noreply.github.com>
-Dan Aloni <alonid@gmail.com> <dan@kernelim.com>
-Daniel Hahler <git@thequod.de> <github@thequod.de>
-Eisuke Kawashima <e-kwsm@users.noreply.github.com> E Kawashima
-ElPiloto <luis.r.piloto@gmail.com> Luis Piloto
-Eliseo Martínez <eliseomarmol@gmail.com> Eliseo Martínez
-Fabian Viöl <f.vioel@googlemail.com> Fabian
-Florian Walch <florian@fwalch.com> <fwalch@users.noreply.github.com>
-Gabriel Cruz <gabs.oficial98@gmail.com> <LTKills@users.noreply.github.com>
-Gaelan Steele <gbs@canishe.com> Gaelan
-Gavin D. Howard <gavin@schedmd.com> <yzena.tech@gmail.com>
-George Zhao <zhaozg@gmail.com> <zhaozg@aliyun.com>
-George Zhao <zhaozg@gmail.com> George  Zhao
-Gregory Anders <greg@gpanders.com> <8965202+gpanders@users.noreply.github.com>
-Gregory Anders <greg@gpanders.com> Greg Anders
-Grzegorz Milka <grzegorzmilka@gmail.com> Grzegorz
-Harm te Hennepe <dhtehennepe@gmail.com> <d.h.tehennepe@student.utwente.nl>
-Harm te Hennepe <dhtehennepe@gmail.com> <harm@tehennepe.org>
-Hirokazu Hata <h.hata.ai.t@gmail.com> <h-michael@users.noreply.github.com>
-Ihor Antonov <ngortheone@gmail.com> <ngortheone@users.noreply.github.com>
-J Phani Mahesh <phanimahesh@gmail.com> <github@phanimahesh.me>
-Jack Bracewell <FriedSock@users.noreply.github.com> <jack.bracewell@unboxedconsulting.com>
-Jack Bracewell <FriedSock@users.noreply.github.com> <jbtwentythree@gmail.com>
-Jacques Germishuys <jacquesg@striata.com> <jacquesg@users.noreply.github.com>
-Jakub Łuczyński <doubleloop@o2.pl> <doubleloop@users.noreply.github.com>
-James McCoy <jamessan@jamessan.com> <vega.james@gmail.com>
-Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> <janedmundlazo@hotmail.com>
-Jan Viljanen <jan.a.viljanen@gmail.com> <jan.viljanen@greenpeace.org>
-Javier Lopez <graulopezjavier@gmail.com> Javier López
-Jit Yao Yap <jityao@gmail.com> <jityao+github@gmail.com>
-Jit Yao Yap <jityao@gmail.com> Jit
-John Gehrig <jdg.gehrig@gmail.com> <jgehrig@users.noreply.github.com>
-John Schmidt <john.schmidt.h@gmail.com> John
-John Szakmeister <john@szakmeister.net> <jszakmeister@users.noreply.github.com>
-Jonathan de Boyne Pollard <J.deBoynePollard-newsgroups@NTLWorld.com> <jdebp@users.noreply.github.com>
-Jonathan de Boyne Pollard <J.deBoynePollard-newsgroups@NTLWorld.com> <postmaster@localhost>
-Jurica Bradaric <jbradaric@gmail.com> <jbradaric@users.noreply.github.com>
-Jurica Bradaric <jbradaric@gmail.com> <jurica.bradaric@avl.com>
-KillTheMule <KillTheMule@users.noreply.github.com> <github@pipsfrank.de>
-Kwon-Young Choi <kwon-young.choi@hotmail.fr> Kwon-Young
-Lucas Hoffmann <l-m-h@web.de> <lucc@posteo.de>
-Lucas Hoffmann <l-m-h@web.de> <lucc@users.noreply.github.com>
-Marco Hinz <mh.codebro@gmail.com> <mh.codebro+github@gmail.com>
-Marvim the Paranoid Android <marvim@users.noreply.github.com> marvim
-Mateusz Czapliński <czapkofan@gmail.com> Mateusz Czaplinski
-Mathias Fussenegger <f.mathias@zignar.net> <mfussenegger@users.noreply.github.com>
-Mathias Fussenegger <f.mathias@zignar.net> Mathias Fußenegger
-Matt Wozniski <godlygeek@gmail.com> <godlygeek+git@gmail.com>
-Matthieu Coudron <mattator@gmail.com> <coudron@iij.ad.jp>
-Matthieu Coudron <mattator@gmail.com> <matthieu.coudron@upmc.fr>
-Matthieu Coudron <mattator@gmail.com> <mcoudron@hotmail.com>
-Matthieu Coudron <mattator@gmail.com> <teto@users.noreply.github.com>
-MichaHoffmann <michoffmann.potsdam@gmail.com> Michael Hoffmann
-MichaHoffmann <michoffmann.potsdam@gmail.com> micha
-Michael Ennen <mike.ennen@gmail.com> <brcolow@users.noreply.github.com>
-Michael Ennen <mike.ennen@gmail.com> brcolow
-Michael Reed <m.reed@mykolab.com> <Pyrohh@users.noreply.github.com>
-Michael Schupikov <michael@schupikov.de> <DarkDeepBlue@users.noreply.github.com>
-Nicolas Hillegeer <nicolas@hillegeer.com> <nicolashillegeer@gmail.com>
-Panashe M. Fundira <fundirap@gmail.com> Panashe Fundira
-Patrice Peterson <patrice.peterson@mailbox.org> runiq
-Pavel Platto <hinidu@gmail.com> Hinidu
-Petter Wahlman <petter@wahlman.no> <pwahlman@cisco.com>
-Poh Zi How <poh.zihow@gmail.com> pohzipohzi
-Rich Wareham <rjw57@cam.ac.uk> <rjw57@cantab.net>
-Rui Abreu Ferreira <equalsraf@users.noreply.github.com> @equalsraf
-Rui Abreu Ferreira <raf-ep@gmx.com> <equalsraf@users.noreply.github.com>
-Rui Abreu Ferreira <raf-ep@gmx.com> <rap-ep@gmx.com>
-Sam Wilson <tecywiz121@hotmail.com> <sawilson@akamai.com>
-Sander Bosma <sanderbosma@gmail.com> sander2
-Santos Gallegos <stsewd@protonmail.com> <santos_g@outlook.com>
-Sebastian Parborg <darkdefende@gmail.com> DarkDefender
-Shirasaka <tk.shirasaka@gmail.com> tk-shirasaka
-Shota <shotat@users.noreply.github.com> shotat
-Shougo Matsushita <Shougo.Matsu@gmail.com> Shougo
-Stephan Seitz <stephan.seitz@fau.de> <stephan.lauf@yahoo.de>
-Steven Sojka <Steven.Sojka@tdameritrade.com> <steelsojka@gmail.com>
-Steven Sojka <steelsojka@gmail.com> <steelsojka@users.noreply.github.com>
-TJ DeVries <devries.timothyj@gmail.com> <timothydvrs1234@gmail.com>
-Thomas Fehér <thomas.feher@yahoo.de> <thomasfeher@web.de>
-Thomas Vigouroux <tomvig38@gmail.com> <39092278+vigoux@users.noreply.github.com>
-Utkarsh Maheshwari <UtkarshME96@gmail.com> UTkarsh Maheshwari
-Utkarsh Maheshwari <utkarshme96@gmail.com> <UtkarshME96@gmail.com>
-VVKot <volodymyr.kot.ua@gmail.com> Volodymyr Kot
-Victor Adam <victor.adam@cofelyineo-gdfsuez.com> <Victor.Adam@derpymail.org>
-Wang Shidong <wsdjeg@outlook.com> <wsdjeg@users.noreply.github.com>
-Wei Huang <daviseago@gmail.com> davix
-Xu Cheng <xucheng@me.com> <xu-cheng@users.noreply.github.com>
-Yamakaky <yamakaky@gmail.com> <yamakaky@yamaworld.fr>
-Yegappan Lakshmanan <yegappan@yahoo.com> <4298407+yegappan@users.noreply.github.com>
-Yichao Zhou <broken.zhoug@gmail.com> Yichao Zhou <broken.zhou@gmail.com>
-Yichao Zhou <broken.zhoug@gmail.com> zhou13 <broken.zhou@gmail.com>
-Yorick Peterse <git@yorickpeterse.com> <yorick@yorickpeterse.com>
-ZyX <kp-pav@yandex.ru> <kp-pav@ya.ru>
-ZyX <kp-pav@yandex.ru> Nikolai Aleksandrovich Pavlov
-aph <a.hewson@gmail.com> Ashley Hewson
-butwerenotthereyet <58348703+butwerenotthereyet@users.noreply.github.com> We're Yet
-chemzqm <chemzqm@gmail.com> Qiming zhao
-chentau <tchen1998@gmail.com> Tony Chen
-dedmass <carlo.abelli@gmail.com> Carlo Abelli
-equal-l2 <eng.equall2@gmail.com> <equal-l2@users.noreply.github.com>
-francisco souza <fsouza@users.noreply.github.com> <108725+fsouza@users.noreply.github.com>
-glacambre <code@lacamb.re> <me@r4>
-glacambre <code@lacamb.re> Ghjuvan Lacambre
-ii14 <ii14@users.noreply.github.com> <59243201+ii14@users.noreply.github.com>
-jdrouhard <john@jmdtech.org> <github@jmdtech.org>
-kuuote <znmxodq1@gmail.com> <36663503+kuuote@users.noreply.github.com>
-matveyt <matthewtarasov@gmail.com> <35012635+matveyt@users.noreply.github.com>
-nate <nateozemon@gmail.com> nateozem
-ray-x <rayx.cn@gmail.com> rayx
-relnod <mail@paul-schiffers.de> <relnod@users.noreply.github.com>
-rockerBOO <rockerboo@gmail.com> Dave Lage
-rpigott <rpigott@berkeley.edu> Ronan Pigott
-sach1t <sach0010t@gmail.com> <sach1t@users.noreply.github.com>
-shade-of-noon <73705427+shade-of-noon@users.noreply.github.com> Edwin Pujols
-shadmansaleh <shadmansaleh3@gmail.com> <13149513+shadmansaleh@users.noreply.github.com>
-shadmansaleh <shadmansaleh3@gmail.com> Shadman
-sohnryang <loop.infinitely@gmail.com> 손량
-timeyyy <timeyyy_da_man@hotmail.com> Timothy C Eichler
-timeyyy <timeyyy_da_man@hotmail.com> timothy eichler

.travis.yml

@@ -1,29 +1,17 @@
-dist: bionic
+dist: xenial
 
 language: c
 
 env:
   global:
-    # Encrypted environment variables, see
-    # http://docs.travis-ci.com/user/encryption-keys/
-    #
-    # SNAP_SECRET_KEY: generated by:
-    #   travis encrypt SNAP_SECRET_KEY=xx --add
-    # https://github.com/neovim/neovim/pull/11428
-    # snapcraft key expires after 1 year. Steps to refresh it:
-    #   1. snapcraft enable-ci travis --refresh
-    #   2. mv .snapcraft/travis_snapcraft.cfg ci/snap/travis_snapcraft.cfg
-    #   3. Copy after_success command to ci/snap/deploy.sh from .travis.yml
-    #   4. Undo changes to .travis.yml
-    - secure: hd0qn2u8ABbJg5Bx4pBRcUQbKYFmcSHoecyHIPTCnGJT+NI41Bvm/IkN/N5DhBF+LbD3Q2nmR/dzI5H/dqS7RxMFvEx1DuFLendFHHX3MYf0AuKpXYY3gwgMTmqx8p/v6srlU7RBGWNGzHCWqksAem+EIWCe3I7WvfdKo1/DV/Y=
-
-    - PATH="$HOME/.local/bin:$PATH"
     # Set "false" to force rebuild of third-party dependencies.
     - CACHE_ENABLE=true
     # Build directory for Neovim.
     - BUILD_DIR="$TRAVIS_BUILD_DIR/build"
     # Build directory for third-party dependencies.
     - DEPS_BUILD_DIR="$HOME/nvim-deps"
+    # Directory where third-party dependency sources are downloaded to.
+    - DEPS_DOWNLOAD_DIR="$TRAVIS_BUILD_DIR/deps-downloads"
     # Install directory for Neovim.
     - INSTALL_PREFIX="$HOME/nvim-install"
     # Log directory for Clang sanitizers and Valgrind.
@@ -31,22 +19,26 @@ env:
     # Nvim log file.
     - NVIM_LOG_FILE="$BUILD_DIR/.nvimlog"
     # Default CMake flags.
-    - CMAKE_FLAGS="-DCI_BUILD=ON
+    - CMAKE_FLAGS="-DTRAVIS_CI_BUILD=ON
                    -DCMAKE_BUILD_TYPE=Debug
                    -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX
                    -DBUSTED_OUTPUT_TYPE=nvim
                    -DDEPS_PREFIX=$DEPS_BUILD_DIR/usr
                    -DMIN_LOG_LEVEL=3"
-    - DEPS_CMAKE_FLAGS="-DUSE_BUNDLED_GPERF=OFF"
+    - DEPS_CMAKE_FLAGS="-DDEPS_DOWNLOAD_DIR:PATH=$DEPS_DOWNLOAD_DIR -DUSE_BUNDLED_GPERF=OFF"
+    # Additional CMake flags for 32-bit builds.
+    - CMAKE_FLAGS_32BIT="-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32
+                         -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib
+                         -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake"
     # Environment variables for Clang sanitizers.
     - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan"
     - TSAN_OPTIONS="log_path=$LOG_DIR/tsan"
     - UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan"
+    - ASAN_SYMBOLIZE=asan_symbolize
     # Environment variables for Valgrind.
     - VALGRIND_LOG="$LOG_DIR/valgrind-%p.log"
-    - CACHE_NVIM_DEPS_DIR="$HOME/.cache/nvim-deps"
     # If this file exists, the cache is valid (compile was successful).
-    - CACHE_MARKER="$CACHE_NVIM_DEPS_DIR/.ci_cache_marker"
+    - CACHE_MARKER="$HOME/.cache/nvim-deps/.travis_cache_marker"
     # default target name for functional tests
     - FUNCTIONALTEST=functionaltest
     - CI_TARGET=tests
@@ -54,29 +46,71 @@ env:
     - CCACHE_COMPRESS=1
     - CCACHE_SLOPPINESS=time_macros,file_macro
     - CCACHE_BASEDIR="$TRAVIS_BUILD_DIR"
-    - CI_OS_NAME="$TRAVIS_OS_NAME"
 
-anchors:
-  envs: &common-job-env
-    # Do not fall back to cache for "master" for PR on "release" branch:
-    # adds the target branch to the cache key.
-    FOR_TRAVIS_CACHE=v1-$TRAVIS_BRANCH
+jobs:
+  include:
+    - stage: normal builds
+      os: linux
+      compiler: clang-4.0
+      # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
+      env: >
+        CLANG_SANITIZER=ASAN_UBSAN
+        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        ASAN_SYMBOLIZE=asan_symbolize-4.0
+    - os: linux
+      compiler: gcc
+      env: >
+        FUNCTIONALTEST=functionaltest-lua
+        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
+    - os: linux
+      # Travis creates a cache per compiler. Set a different value here to
+      # store 32-bit dependencies in a separate cache.
+      compiler: gcc
+      env: BUILD_32BIT=ON
+    - os: osx
+      compiler: clang
+      osx_image: xcode9.4  # macOS 10.13
+    - os: osx
+      compiler: gcc
+      osx_image: xcode9.4  # macOS 10.13
+    - if: branch = master
+      os: linux
+      env: CI_TARGET=lint
+    - stage: Flaky builds
+      os: linux
+      compiler: gcc
+      env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+    - os: linux
+      compiler: clang
+      env: CLANG_SANITIZER=TSAN
+  allow_failures:
+    - env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+    - env: CLANG_SANITIZER=TSAN
+  fast_finish: true
+
+before_install: ci/before_install.sh
+install:        ci/install.sh
+before_script:  ci/before_script.sh
+script:         ci/script.sh
+before_cache:   ci/before_cache.sh
 
 addons:
   apt:
-    packages: &common-apt-packages
+    packages:
       - apport
       - autoconf
       - automake
       - build-essential
-      - clang
+      - clang-4.0
       - cmake
-      - cpanminus
       - cscope
+      - g++-multilib
       - gcc-multilib
       - gdb
       - gperf
       - language-pack-tr
+      - libc6-dev-i386
       - libtool-bin
       - locales
       - ninja-build
@@ -86,119 +120,9 @@ addons:
       - xclip
   homebrew:
     update: true
-    casks:
-      - powershell
     packages:
       - ccache
-      - cpanminus
       - ninja
-      - perl
-
-jobs:
-  include:
-    - name: gcc-coverage (gcc 9)
-      os: linux
-      compiler: gcc-9
-      env:
-        - GCOV=gcov-9
-        - CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
-        - GCOV_ERROR_FILE="/tmp/libgcov-errors.log"
-        - USE_LUACOV=1
-        - BUSTED_ARGS="--coverage"
-        - *common-job-env
-      addons:
-        snaps:
-          - name: powershell
-            confinement: classic
-        apt:
-          sources:
-            - sourceline: 'ppa:ubuntu-toolchain-r/test'
-          packages:
-            - *common-apt-packages
-            - gcc-9
-    - name: gcc-functionaltest-lua
-      os: linux
-      compiler: gcc
-      env:
-        - FUNCTIONALTEST=functionaltest-lua
-        - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
-        - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
-        - *common-job-env
-    - name: gcc-32bit
-      os: linux
-      # Travis creates a cache per compiler. Set a different value here to
-      # store 32-bit dependencies in a separate cache.
-      compiler: gcc
-      env:
-        - BUILD_32BIT=ON
-        - CMAKE_FLAGS="$CMAKE_FLAGS -m32 -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake"
-        - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -m32 -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake"
-        - *common-job-env
-    - name: big-endian
-      os: linux
-      arch: s390x
-      compiler: gcc
-      env:
-        - FUNCTIONALTEST=functionaltest-lua
-        - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
-        - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
-        - *common-job-env
-      addons:
-        apt:
-          packages:
-            - *common-apt-packages
-            - gettext
-            - python-pip
-            - python3-pip
-            - python-setuptools
-            - python3-setuptools
-            - python-dev
-            - python3-dev
-    - if: type != pull_request
-      name: snap
-      os: linux
-      env:
-        - LC_ALL: C.UTF-8
-        - LANG: C.UTF-8
-        - SNAPCRAFT_ENABLE_SILENT_REPORT: y
-        - SNAPCRAFT_ENABLE_DEVELOPER_DEBUG: y
-        - SNAPCRAFT_BUILD_ENVIRONMENT: lxd
-      addons:
-        snaps:
-          - name: snapcraft
-            channel: stable
-            classic: true
-          - name: http
-          - name: transfer
-          - name: lxd
-            channel: stable
-      # Override default before_install, before_cache.
-      before_install: /bin/true
-      before_cache: /bin/true
-      install: ci/snap/install.sh
-      before_script: echo "Building snap..."
-      script: ci/snap/script.sh
-      after_success: ci/snap/after_success.sh
-      deploy:
-        skip_cleanup: true
-        provider: script
-        script: ci/snap/deploy.sh
-        on:
-          branch: master
-  allow_failures:
-    - env:
-      - LC_ALL: C.UTF-8
-      - LANG: C.UTF-8
-      - SNAPCRAFT_ENABLE_SILENT_REPORT: y
-      - SNAPCRAFT_ENABLE_DEVELOPER_DEBUG: y
-      - SNAPCRAFT_BUILD_ENVIRONMENT: lxd
-  fast_finish: true
-
-before_install: ci/before_install.sh
-install:        ci/install.sh
-before_script:  ci/before_script.sh
-script:         ci/script.sh
-before_cache:   ci/before_cache.sh
 
 branches:
   only:
@@ -209,10 +133,9 @@ cache:
   apt: true
   ccache: true
   directories:
-    - "$CACHE_NVIM_DEPS_DIR"
-
-git:
-  quiet: true
+    - "$HOME/.cache/pip"
+    - "$HOME/.cache/nvim-deps"
+    - "$HOME/.cache/nvim-deps-downloads"
 
 notifications:
   webhooks:

BSDmakefile

@@ -1,4 +1,4 @@
 .DONE:
-	@echo "Use GNU Make (gmake) to build neovim"
+	@echo "Please use GNU Make (gmake) to build neovim"
 .DEFAULT:
-	@echo "Use GNU Make (gmake) to build neovim"
+	@echo "Please use GNU Make (gmake) to build neovim"

CMakeLists.txt

@@ -2,18 +2,14 @@
 #   intro: https://codingnest.com/basic-cmake/
 #   best practices (3.0+): https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1
 
-# Version should match the tested CMAKE_URL in .github/workflows/ci.yml.
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 2.8.12)
 project(nvim C)
 
-if(POLICY CMP0065)
-  cmake_policy(SET CMP0065 NEW)
-endif()
-if(POLICY CMP0060)
-  cmake_policy(SET CMP0060 NEW)
-endif()
-if(POLICY CMP0075)
-  cmake_policy(SET CMP0075 NEW)
+if(POLICY CMP0059)
+  # Needed for use of DEFINITIONS variable, which is used to collect the
+  # compilation flags for reporting in "nvim --version"
+  # https://github.com/neovim/neovim/pull/8558#issuecomment-398033140
+  cmake_policy(SET CMP0059 OLD)
 endif()
 
 # Point CMake at any custom modules we may ship
@@ -26,23 +22,9 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 # Prefer our bundled versions of dependencies.
 if(DEFINED ENV{DEPS_BUILD_DIR})
-  if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-    # pkg-config 29.2 has a bug on OpenBSD which causes it to drop any paths that
-    # *contain* system include paths. To avoid this, we prefix what would be
-    # "/usr/include" as "/_usr/include".
-    # This check is also performed in the third-party/CMakeLists.txt and in the
-    # else clause following here.
-    # https://github.com/neovim/neovim/pull/14745#issuecomment-860201794
-    set(DEPS_PREFIX "$ENV{DEPS_BUILD_DIR}/_usr" CACHE PATH "Path prefix for finding dependencies")
-  else()
-    set(DEPS_PREFIX "$ENV{DEPS_BUILD_DIR}/usr" CACHE PATH "Path prefix for finding dependencies")
-  endif()
+  set(DEPS_PREFIX "$ENV{DEPS_BUILD_DIR}/usr" CACHE PATH "Path prefix for finding dependencies")
 else()
-  if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-    set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/_usr" CACHE PATH "Path prefix for finding dependencies")
-  else()
-    set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
-  endif()
+  set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
   # When running from within CLion or Visual Studio,
   # build bundled dependencies automatically.
   if(NOT EXISTS ${DEPS_PREFIX}
@@ -71,8 +53,13 @@ else()
   endif()
 endif()
 
-list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
-set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+if(CMAKE_CROSSCOMPILING AND NOT UNIX)
+  list(INSERT CMAKE_FIND_ROOT_PATH 0 ${DEPS_PREFIX})
+  list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX}/../host/bin)
+else()
+  list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
+  set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+endif()
 
 # used for check_c_compiler_flag
 include(CheckCCompilerFlag)
@@ -95,8 +82,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 endif()
 
 if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  # Ignore case when comparing filenames on Windows and Mac.
-  set(CASE_INSENSITIVE_FILENAME TRUE)
   # Enable fixing case-insensitive filenames for Windows and Mac.
   set(USE_FNAME_CASE TRUE)
 endif()
@@ -112,67 +97,64 @@ else()
   option(ENABLE_LTO "enable link time optimization" ON)
 endif()
 
-message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
-
-# Build type.
+# Set default build type.
 if(NOT CMAKE_BUILD_TYPE)
-  message(STATUS "CMAKE_BUILD_TYPE not specified, default is 'Debug'")
+  message(STATUS "CMAKE_BUILD_TYPE not given, defaulting to 'Debug'")
   set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE)
-else()
-  message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
-endif()
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-  set(DEBUG 1)
-else()
-  set(DEBUG 0)
 endif()
+
 # Set available build types for CMake GUIs.
-# Other build types can still be set by -DCMAKE_BUILD_TYPE=...
+# A different build type can still be set by -DCMAKE_BUILD_TYPE=...
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
   STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 
 # If not in a git repo (e.g., a tarball) these tokens define the complete
 # version string, else they are combined with the result of `git describe`.
 set(NVIM_VERSION_MAJOR 0)
-set(NVIM_VERSION_MINOR 7)
-set(NVIM_VERSION_PATCH 1)
+set(NVIM_VERSION_MINOR 3)
+set(NVIM_VERSION_PATCH 7)
 set(NVIM_VERSION_PRERELEASE "") # for package maintainers
 
 # API level
-set(NVIM_API_LEVEL 9)         # Bump this after any API change.
+set(NVIM_API_LEVEL 5)         # Bump this after any API change.
 set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
 set(NVIM_API_PRERELEASE false)
 
+file(TO_CMAKE_PATH ${CMAKE_CURRENT_LIST_DIR}/.git FORCED_GIT_DIR)
+include(GetGitRevisionDescription)
+get_git_head_revision(GIT_REFSPEC NVIM_VERSION_COMMIT)
+if(NVIM_VERSION_COMMIT) # is a git repo
+  git_describe(NVIM_VERSION_MEDIUM)
+  # `git describe` annotates the most recent tagged release; for pre-release
+  # builds we must replace that with the unreleased version.
+  string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+"
+         "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}"
+         NVIM_VERSION_MEDIUM
+         ${NVIM_VERSION_MEDIUM})
+endif()
+
 set(NVIM_VERSION_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
 # NVIM_VERSION_CFLAGS set further below.
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# Log level (MIN_LOG_LEVEL in log.h)
-if("${MIN_LOG_LEVEL}" MATCHES "^$")
-  # Minimize logging for release-type builds.
-  if(CMAKE_BUILD_TYPE STREQUAL "Release"
-      OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"
-      OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-    message(STATUS "MIN_LOG_LEVEL not specified, default is 3 (ERROR) for release builds")
-    set(MIN_LOG_LEVEL 3)
-  else()
-    message(STATUS "MIN_LOG_LEVEL not specified, default is 1 (INFO)")
-    set(MIN_LOG_LEVEL 1)
-  endif()
-else()
-  if(NOT MIN_LOG_LEVEL MATCHES "^[0-3]$")
-    message(FATAL_ERROR "invalid MIN_LOG_LEVEL: " ${MIN_LOG_LEVEL})
-  endif()
-  message(STATUS "MIN_LOG_LEVEL=${MIN_LOG_LEVEL}")
-endif()
-
 # Default to -O2 on release builds.
 if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
   message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
   string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 endif()
 
+# Minimize logging for release-type builds.
+if(NOT CMAKE_C_FLAGS_RELEASE MATCHES DMIN_LOG_LEVEL)
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DMIN_LOG_LEVEL=3")
+endif()
+if(NOT CMAKE_C_FLAGS_MINSIZEREL MATCHES DMIN_LOG_LEVEL)
+  set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DMIN_LOG_LEVEL=3")
+endif()
+if(NOT CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES DMIN_LOG_LEVEL)
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DMIN_LOG_LEVEL=3")
+endif()
+
 if(CMAKE_COMPILER_IS_GNUCC)
   check_c_compiler_flag(-Og HAS_OG_FLAG)
 else()
@@ -190,6 +172,11 @@ if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES DNDEBUG)
   string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 endif()
 
+# Enable -Wconversion.
+if(NOT MSVC)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion")
+endif()
+
 # gcc 4.0+ sets _FORTIFY_SOURCE=2 automatically.  This currently
 # does not work with Neovim due to some uses of dynamically-sized structures.
 # https://github.com/neovim/neovim/issues/223
@@ -256,64 +243,28 @@ check_c_source_compiles("
 int main(void)
 {
   void *trace[1];
-  backtrace(trace, 1);
+  int trace_size = backtrace(trace, 1);
   return 0;
 }
 " HAVE_EXECINFO_BACKTRACE)
 
-check_c_source_compiles("
-int main(void)
-{
-  int a = 42;
-  __builtin_add_overflow(a, a, &a);
-  __builtin_sub_overflow(a, a, &a);
-  return 0;
-}
-" HAVE_BUILTIN_ADD_OVERFLOW)
-
 if(MSVC)
   # XXX: /W4 gives too many warnings. #3241
-  add_compile_options(/W3)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
+  add_definitions(/W3 -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
   add_definitions(-DWIN32)
 else()
-  add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter
-    -Wstrict-prototypes -std=gnu99 -Wshadow -Wconversion
-    -Wdouble-promotion
-    -Wmissing-noreturn
-    -Wmissing-format-attribute
-    -Wmissing-prototypes)
+  add_definitions(-Wall -Wextra -pedantic -Wno-unused-parameter
+    -Wstrict-prototypes -std=gnu99)
 
-  check_c_compiler_flag(-Wimplicit-fallthrough HAVE_WIMPLICIT_FALLTHROUGH_FLAG)
-  if(HAVE_WIMPLICIT_FALLTHROUGH_FLAG)
-    add_compile_options(-Wimplicit-fallthrough)
-  endif()
-
-  # Clang doesn't have -Wsuggest-attribute so check for each one.
-  check_c_compiler_flag(-Wsuggest-attribute=pure HAVE_WSUGGEST_ATTRIBUTE_PURE)
-  if(HAVE_WSUGGEST_ATTRIBUTE_PURE)
-    add_compile_options(-Wsuggest-attribute=pure)
-  endif()
-
-  check_c_compiler_flag(-Wsuggest-attribute=const HAVE_WSUGGEST_ATTRIBUTE_CONST)
-  if(HAVE_WSUGGEST_ATTRIBUTE_CONST)
-    add_compile_options(-Wsuggest-attribute=const)
-  endif()
-
-  check_c_compiler_flag(-Wsuggest-attribute=malloc HAVE_WSUGGEST_ATTRIBUTE_MALLOC)
-  if(HAVE_WSUGGEST_ATTRIBUTE_MALLOC)
-    add_compile_options(-Wsuggest-attribute=malloc)
-  endif()
-
-  check_c_compiler_flag(-Wsuggest-attribute=cold HAVE_WSUGGEST_ATTRIBUTE_COLD)
-  if(HAVE_WSUGGEST_ATTRIBUTE_COLD)
-    add_compile_options(-Wsuggest-attribute=cold)
+  check_c_compiler_flag(-Wimplicit-fallthrough HAS_WIMPLICIT_FALLTHROUGH_FLAG)
+  if(HAS_WIMPLICIT_FALLTHROUGH_FLAG)
+    add_definitions(-Wimplicit-fallthrough)
   endif()
 
   # On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang
   # 3.4.1 used there.
   if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-Wno-c11-extensions)
+    add_definitions(-Wno-c11-extensions)
   endif()
 endif()
 
@@ -329,7 +280,7 @@ endif()
 # OpenBSD's GCC (4.2.1) doesn't have -Wvla
 check_c_compiler_flag(-Wvla HAS_WVLA_FLAG)
 if(HAS_WVLA_FLAG)
-  add_compile_options(-Wvla)
+  add_definitions(-Wvla)
 endif()
 
 if(UNIX)
@@ -338,39 +289,46 @@ if(UNIX)
   check_c_compiler_flag(-fstack-protector HAS_FSTACK_PROTECTOR_FLAG)
 
   if(HAS_FSTACK_PROTECTOR_STRONG_FLAG)
-    add_compile_options(-fstack-protector-strong)
-    link_libraries(-fstack-protector-strong)
+    add_definitions(-fstack-protector-strong)
   elseif(HAS_FSTACK_PROTECTOR_FLAG)
-    add_compile_options(-fstack-protector --param ssp-buffer-size=4)
-    link_libraries(-fstack-protector --param ssp-buffer-size=4)
+    add_definitions(-fstack-protector --param ssp-buffer-size=4)
   endif()
 endif()
 
-check_c_compiler_flag(-fno-common HAVE_FNO_COMMON)
-if (HAVE_FNO_COMMON)
-  add_compile_options(-fno-common)
-endif()
-
 check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG)
 if(HAS_DIAG_COLOR_FLAG)
-  if(CMAKE_GENERATOR MATCHES "Ninja")
-    add_compile_options(-fdiagnostics-color=always)
-  else()
-    add_compile_options(-fdiagnostics-color=auto)
+  add_definitions(-fdiagnostics-color=auto)
+endif()
+
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  # 1. Array-bounds testing is broken in some GCC versions before 4.8.5.
+  #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56273
+  # 2. But _Pragma("...ignored") is broken (unresolved) in GCC 5+:
+  #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66099
+  # So we must disable -Warray-bounds globally for GCC (for kbtree.h, #7083).
+  check_c_compiler_flag(-Wno-array-bounds HAS_NO_ARRAY_BOUNDS_FLAG)
+  if(HAS_NO_ARRAY_BOUNDS_FLAG)
+    add_definitions(-Wno-array-bounds)
   endif()
 endif()
 
-option(CI_BUILD "CI, extra flags will be set" OFF)
+option(TRAVIS_CI_BUILD "Travis/QuickBuild CI, extra flags will be set" OFF)
 
-if(CI_BUILD)
-  message(STATUS "CI build enabled")
-  add_compile_options(-Werror)
+if(TRAVIS_CI_BUILD)
+  message(STATUS "Travis/QuickBuild CI build enabled")
+  add_definitions(-Werror)
   if(DEFINED ENV{BUILD_32BIT})
     # Get some test coverage for unsigned char
-    add_compile_options(-funsigned-char)
+    add_definitions(-funsigned-char)
   endif()
 endif()
 
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+  set(DEBUG 1)
+else()
+  set(DEBUG 0)
+endif()
+
 option(LOG_LIST_ACTIONS "Add list actions logging" OFF)
 
 add_definitions(-DINCLUDE_GENERATED_DECLARATIONS)
@@ -390,8 +348,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
   add_definitions(-D_GNU_SOURCE)
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT PREFER_LUA AND LUAJIT_VERSION LESS "2.1.0-beta3")
-  # Required for luajit < 2.1.0-beta3.
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+  # Required for luajit.
   set(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
   set(CMAKE_SHARED_LINKER_FLAGS
@@ -403,47 +361,12 @@ endif()
 include_directories("${PROJECT_BINARY_DIR}/config")
 include_directories("${PROJECT_SOURCE_DIR}/src")
 
-find_package(LibUV 1.28.0 REQUIRED)
+find_package(LibUV REQUIRED)
 include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS})
 
 find_package(Msgpack 1.0.0 REQUIRED)
 include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS})
 
-find_package(LibLUV 1.43.0 REQUIRED)
-include_directories(SYSTEM ${LIBLUV_INCLUDE_DIRS})
-
-find_package(TreeSitter REQUIRED)
-include_directories(SYSTEM ${TreeSitter_INCLUDE_DIRS})
-
-list(APPEND CMAKE_REQUIRED_INCLUDES "${TreeSitter_INCLUDE_DIRS}")
-list(APPEND CMAKE_REQUIRED_LIBRARIES "${TreeSitter_LIBRARIES}")
-check_c_source_compiles("
-#include <tree_sitter/api.h>
-int
-main(void)
-{
-  TSQueryCursor *cursor = ts_query_cursor_new();
-  ts_query_cursor_set_match_limit(cursor, 32);
-  return 0;
-}
-" TS_HAS_SET_MATCH_LIMIT)
-if(TS_HAS_SET_MATCH_LIMIT)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVIM_TS_HAS_SET_MATCH_LIMIT")
-endif()
-check_c_source_compiles("
-#include <stdlib.h>
-#include <tree_sitter/api.h>
-int
-main(void)
-{
-  ts_set_allocator(malloc, calloc, realloc, free);
-  return 0;
-}
-" TS_HAS_SET_ALLOCATOR)
-if(TS_HAS_SET_ALLOCATOR)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVIM_TS_HAS_SET_ALLOCATOR")
-endif()
-
 # Note: The test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
 option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
 
@@ -469,7 +392,7 @@ main(void)
   return MSGPACK_OBJECT_FLOAT32;
 }
 " MSGPACK_HAS_FLOAT32)
-list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${MSGPACK_INCLUDE_DIRS}")
+unset(CMAKE_REQUIRED_LIBRARIES)
 if(MSGPACK_HAS_FLOAT32)
   add_definitions(-DNVIM_MSGPACK_HAS_FLOAT32)
 endif()
@@ -477,7 +400,7 @@ endif()
 option(FEAT_TUI "Enable the Terminal UI" ON)
 
 if(FEAT_TUI)
-  find_package(UNIBILIUM 2.0 REQUIRED)
+  find_package(Unibilium REQUIRED)
   include_directories(SYSTEM ${UNIBILIUM_INCLUDE_DIRS})
 
   list(APPEND CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}")
@@ -491,8 +414,8 @@ if(FEAT_TUI)
     return unibi_num_from_var(unibi_var_from_num(0));
   }
   " UNIBI_HAS_VAR_FROM)
-  list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}")
-  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${UNIBILIUM_LIBRARIES}")
+  unset(CMAKE_REQUIRED_INCLUDES)
+  unset(CMAKE_REQUIRED_LIBRARIES)
   if(UNIBI_HAS_VAR_FROM)
     add_definitions(-DNVIM_UNIBI_HAS_VAR_FROM)
   endif()
@@ -501,7 +424,7 @@ if(FEAT_TUI)
   include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS})
 endif()
 
-find_package(LIBVTERM 0.1 REQUIRED)
+find_package(LibVterm REQUIRED)
 include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS})
 
 if(WIN32)
@@ -523,9 +446,20 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA
   message(FATAL_ERROR "Sanitizers are only supported for Clang")
 endif()
 
-if(ENABLE_LIBICONV)
-  find_package(Iconv REQUIRED)
-  include_directories(SYSTEM ${Iconv_INCLUDE_DIRS})
+if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD|FreeBSD|Windows")  # see #5318
+  message(STATUS "skipping jemalloc on this system: ${CMAKE_SYSTEM_NAME}")
+  option(ENABLE_JEMALLOC "enable jemalloc" OFF)
+else()
+  option(ENABLE_JEMALLOC "enable jemalloc" ON)
+endif()
+
+if(ENABLE_JEMALLOC)
+  if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
+    message(STATUS "Sanitizers enabled; disabling jemalloc")
+  else()
+    find_package(JeMalloc REQUIRED)
+    include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
+  endif()
 endif()
 
 if(ENABLE_LIBINTL)
@@ -534,6 +468,11 @@ if(ENABLE_LIBINTL)
   include_directories(SYSTEM ${LibIntl_INCLUDE_DIRS})
 endif()
 
+if(ENABLE_LIBICONV)
+  find_package(Iconv REQUIRED)
+  include_directories(SYSTEM ${Iconv_INCLUDE_DIRS})
+endif()
+
 # Determine platform's threading library. Set CMAKE_THREAD_PREFER_PTHREAD
 # explicitly to indicate a strong preference for pthread.
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
@@ -555,19 +494,18 @@ include(LuaHelpers)
 set(LUA_DEPENDENCIES lpeg mpack bit)
 if(NOT LUA_PRG)
   foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua)
-    unset(_CHECK_LUA_PRG CACHE)
+    # If LUA_PRG is set find_program() will not search
+    unset(LUA_PRG CACHE)
     unset(LUA_PRG_WORKS)
-    find_program(_CHECK_LUA_PRG ${CURRENT_LUA_PRG})
+    find_program(LUA_PRG ${CURRENT_LUA_PRG})
 
-    if(_CHECK_LUA_PRG)
-      check_lua_deps(${_CHECK_LUA_PRG} "${LUA_DEPENDENCIES}" LUA_PRG_WORKS)
+    if(LUA_PRG)
+      check_lua_deps(${LUA_PRG} "${LUA_DEPENDENCIES}" LUA_PRG_WORKS)
       if(LUA_PRG_WORKS)
-        set(LUA_PRG "${_CHECK_LUA_PRG}" CACHE FILEPATH "Path to a program.")
         break()
       endif()
     endif()
   endforeach()
-  unset(_CHECK_LUA_PRG CACHE)
 else()
   check_lua_deps(${LUA_PRG} "${LUA_DEPENDENCIES}" LUA_PRG_WORKS)
 endif()
@@ -578,33 +516,6 @@ endif()
 
 message(STATUS "Using Lua interpreter: ${LUA_PRG}")
 
-if(DEBUG)
-  option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" OFF)
-else()
-  option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" ON)
-endif()
-
-if(COMPILE_LUA AND NOT WIN32)
-  if(PREFER_LUA)
-    foreach(CURRENT_LUAC_PRG luac5.1 luac)
-      find_program(_CHECK_LUAC_PRG ${CURRENT_LUAC_PRG})
-      if(_CHECK_LUAC_PRG)
-        set(LUAC_PRG "${_CHECK_LUAC_PRG} -s -o - %s" CACHE STRING "Format for compiling to Lua bytecode")
-        break()
-      endif()
-    endforeach()
-  elseif(LUA_PRG MATCHES "luajit")
-    check_lua_module(${LUA_PRG} "jit.bcsave" LUAJIT_HAS_JIT_BCSAVE)
-    if(LUAJIT_HAS_JIT_BCSAVE)
-      set(LUAC_PRG "${LUA_PRG} -b -s %s -" CACHE STRING "Format for compiling to Lua bytecode")
-    endif()
-  endif()
-endif()
-
-if(LUAC_PRG)
-  message(STATUS "Using Lua compiler: ${LUAC_PRG}")
-endif()
-
 # Setup busted.
 find_program(BUSTED_PRG NAMES busted busted.bat)
 find_program(BUSTED_LUA_PRG busted-lua)
@@ -613,7 +524,6 @@ if(NOT BUSTED_OUTPUT_TYPE)
 endif()
 
 find_program(LUACHECK_PRG luacheck)
-find_program(FLAKE8_PRG flake8)
 find_program(GPERF_PRG gperf)
 
 include(InstallHelpers)
@@ -625,17 +535,27 @@ install_helper(
   FILES ${MANPAGES}
   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
-#
+# MIN_LOG_LEVEL for log.h
+if("${MIN_LOG_LEVEL}" MATCHES "^$")
+  message(STATUS "MIN_LOG_LEVEL not specified")
+else()
+  if(NOT MIN_LOG_LEVEL MATCHES "^[0-3]$")
+    message(FATAL_ERROR "invalid MIN_LOG_LEVEL: " ${MIN_LOG_LEVEL})
+  endif()
+  message(STATUS "MIN_LOG_LEVEL set to ${MIN_LOG_LEVEL}")
+endif()
+
 # Go down the tree.
-#
 
 add_subdirectory(src/nvim)
-get_directory_property(NVIM_VERSION_CFLAGS DIRECTORY src/nvim DEFINITION NVIM_VERSION_CFLAGS)
+# Read compilation flags from src/nvim, used in config subdirectory below.
+include(GetCompileFlags)
+get_compile_flags(NVIM_VERSION_CFLAGS)
+
 add_subdirectory(test/includes)
 add_subdirectory(config)
 add_subdirectory(test/functional/fixtures)  # compile test programs
 add_subdirectory(runtime)
-get_directory_property(GENERATED_HELP_TAGS DIRECTORY runtime DEFINITION GENERATED_HELP_TAGS)
 if(WIN32)
   install_helper(
     FILES ${DEPS_PREFIX}/share/nvim-qt/runtime/plugin/nvim_gui_shim.vim
@@ -652,10 +572,15 @@ if(BUSTED_PRG)
   # console pool: to do so we need to use the USES_TERMINAL
   # option, but this is only available in CMake 3.2
   set(TEST_TARGET_ARGS)
-  list(APPEND TEST_TARGET_ARGS "USES_TERMINAL")
+  if(NOT (${CMAKE_VERSION} VERSION_LESS 3.2.0))
+    list(APPEND TEST_TARGET_ARGS "USES_TERMINAL")
+  endif()
 
   set(UNITTEST_PREREQS nvim-test unittest-headers)
-  set(FUNCTIONALTEST_PREREQS nvim printenv-test printargs-test shell-test pwsh-test streams-test tty-test ${GENERATED_HELP_TAGS})
+  set(FUNCTIONALTEST_PREREQS nvim printargs-test shell-test)
+  if(NOT WIN32)
+    list(APPEND FUNCTIONALTEST_PREREQS tty-test)
+  endif()
   set(BENCHMARK_PREREQS nvim tty-test)
 
   # Useful for automated build systems, if they want to manually run the tests.
@@ -680,6 +605,7 @@ if(BUSTED_PRG)
         -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
         -DBUILD_DIR=${CMAKE_BINARY_DIR}
         -DTEST_TYPE=unit
+        -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME}
         -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
       DEPENDS ${UNITTEST_PREREQS}
       ${TEST_TARGET_ARGS})
@@ -710,6 +636,7 @@ if(BUSTED_PRG)
       -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
       -DBUILD_DIR=${CMAKE_BINARY_DIR}
       -DTEST_TYPE=functional
+      -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME}
       -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
     DEPENDS ${FUNCTIONALTEST_PREREQS}
     ${TEST_TARGET_ARGS})
@@ -726,6 +653,7 @@ if(BUSTED_PRG)
       -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
       -DBUILD_DIR=${CMAKE_BINARY_DIR}
       -DTEST_TYPE=benchmark
+      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
       -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
     DEPENDS ${BENCHMARK_PREREQS}
     ${TEST_TARGET_ARGS})
@@ -743,6 +671,7 @@ if(BUSTED_LUA_PRG)
       -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
       -DBUILD_DIR=${CMAKE_BINARY_DIR}
       -DTEST_TYPE=functional
+      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
       -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
     DEPENDS ${FUNCTIONALTEST_PREREQS}
     ${TEST_TARGET_ARGS})
@@ -750,27 +679,50 @@ if(BUSTED_LUA_PRG)
 endif()
 
 if(LUACHECK_PRG)
-  add_custom_target(lualint
-    COMMAND ${LUACHECK_PRG} -q runtime/ scripts/ src/ test/
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-else()
-  add_custom_target(lualint false
-    COMMENT "lualint: LUACHECK_PRG not defined")
+  add_custom_target(testlint
+    COMMAND ${CMAKE_COMMAND}
+      -DLUACHECK_PRG=${LUACHECK_PRG}
+      -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
+      -DIGNORE_PATTERN="*/preload.lua"
+      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
+      -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake)
+
+  add_custom_target(
+    lintbuiltinlua
+    COMMAND
+      ${CMAKE_COMMAND}
+        -DLUACHECK_PRG=${LUACHECK_PRG}
+        -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/lua
+        -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
+        -DREAD_GLOBALS=vim
+        -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake
+  )
+  add_custom_target(
+    lintruntimelua
+    COMMAND
+      ${CMAKE_COMMAND}
+        -DLUACHECK_PRG=${LUACHECK_PRG}
+        -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/runtime/lua
+        -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
+        -DREAD_GLOBALS=vim
+        -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake
+  )
+  # TODO(ZyX-I): Run linter for all lua code in src
+  add_custom_target(
+    lualint
+    DEPENDS lintruntimelua
+    DEPENDS lintbuiltinlua
+  )
 endif()
 
-
-#add uninstall target
-if(NOT TARGET uninstall)
-    configure_file(
-        "cmake/UninstallHelper.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/UninstallHelper.cmake"
-        IMMEDIATE @ONLY)
-
-    add_custom_target(uninstall
-        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/UninstallHelper.cmake)
-endif()
-
-
-if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-  add_subdirectory(packaging)
-endif()
+set(CPACK_PACKAGE_NAME "Neovim")
+set(CPACK_PACKAGE_VENDOR "neovim.io")
+set(CPACK_PACKAGE_VERSION ${NVIM_VERSION_MEDIUM})
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "Neovim")
+# Set toplevel directory/installer name as Neovim
+set(CPACK_PACKAGE_FILE_NAME "Neovim")
+set(CPACK_TOPLEVEL_TAG "Neovim")
+set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
+set(CPACK_NSIS_MODIFY_PATH ON)
+set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+include(CPack)

CONTRIBUTING.md

@@ -1,5 +1,4 @@
-Contributing to Neovim
-======================
+# Contributing to Neovim
 
 Getting started
 ---------------
@@ -7,44 +6,40 @@ Getting started
 If you want to help but don't know where to start, here are some
 low-risk/isolated tasks:
 
+- [Merge a Vim patch].
 - Try a [complexity:low] issue.
-- Fix bugs found by [Clang](#clang-scan-build), [PVS](#pvs-studio) or
-  [Coverity](#coverity).
-- [Improve documentation][wiki-contribute-help]
-- [Merge a Vim patch] (familiarity with Vim is *strongly* recommended)
-
-Reporting problems
-------------------
-
-- [Check the FAQ][wiki-faq].
-- [Search existing issues][github-issues] (including closed!)
-- Update Neovim to the latest version to see if your problem persists.
-- Try to reproduce with `nvim --clean` ("factory defaults").
-- [Bisect](https://neovim.io/doc/user/starting.html#bisect) your config: disable plugins incrementally, to narrow down the cause of the issue.
-- [Bisect][git-bisect] Neovim's source code to find the cause of a regression, if you can. This is _extremely_ helpful.
-- When reporting a crash, [include a stacktrace](https://github.com/neovim/neovim/wiki/FAQ#backtrace-linux).
-- Use [ASAN/UBSAN](#clang-sanitizers-asan-and-ubsan) to get detailed errors for segfaults and undefined behavior.
-- Check the logs. `:edit $NVIM_LOG_FILE`
-- Include `cmake --system-information` for build-related issues.
+- Fix bugs found by [clang scan-build](#clang-scan-build),
+  [coverity](#coverity), and [PVS](#pvs-studio).
 
 Developer guidelines
 --------------------
 
-- Read `:help dev` if you are working on Nvim core.
-- Read `:help dev-ui` if you are developing a UI.
-- Read `:help dev-api-client` if you are developing an API client.
-- Install `ninja` for faster builds of Nvim.
+- Nvim contributors should read `:help dev` (especially `:help dev-api`).
+- 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)
+Reporting problems
+------------------
+
+- Check the [**FAQ**][wiki-faq].
+- Search [existing issues][github-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](https://github.com/neovim/neovim/wiki/Development-tips#backtrace-linux).
+- [Bisect][git-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** issues.
+
+Pull requests ("PRs")
 ---------------------
 
-- To avoid duplicate work, create a draft pull request.
-- Your PR must include [test coverage][run-tests].
+- To avoid duplicate work, create a `[WIP]` pull request as soon as possible.
 - Avoid cosmetic changes to unrelated files in the same commit.
 - Use a [feature branch][git-feature-branch] instead of the master branch.
 - Use a **rebase workflow** for small PRs.
@@ -63,55 +58,43 @@ Pull requests (PRs)
 - During a squash/fixup, use `exec make -C build unittest` between each
   pick/edit/reword.
 
-### Stages: Draft and Ready for review
+### Stages: WIP, RFC, RDY
 
-Pull requests have two stages: Draft and Ready for review.
+Pull requests have three stages: `[WIP]` (Work In Progress), `[RFC]` (Request
+For Comment) and `[RDY]` (Ready).
 
-1. [Create a Draft PR][pr-draft] while you are _not_ requesting feedback as
-  you are still working on the PR.
-    - You can skip this if your PR is ready for review.
-2. [Change your PR to ready][pr-ready] when the PR is ready for review.
-    - You can convert back to Draft at any time.
+- Untagged PRs are assumed to be `[RFC]`, i.e. you are requesting a review.
+- Prepend `[WIP]` to the PR title if you are _not_ requesting feedback and the
+  work is still in flux.
+- Prepend `[RDY]` to the PR title if you are _done_ with the PR and are only
+  waiting on it to be merged.
 
-Do __not__ add labels like `[RFC]` or `[WIP]` in the title to indicate the
-state of your PR: this just adds noise. Non-Draft PRs are assumed to be open
-for comments; if you want feedback from specific people, `@`-mention them in
-a comment.
+For example, a typical workflow is:
+
+1. You open a `[WIP]` PR where the work is _not_ ready for feedback, you just want to
+   let others know what you are doing.
+2. Once the PR is ready for review, you replace `[WIP]` in the title with `[RFC]`.
+   You may add fix up commits to address issues that come up during review.
+3. Once the PR is ready for merging, you rebase/squash your work appropriately and
+   then replace `[RFC]` in the title with `[RDY]`.
 
 ### Commit messages
 
-Follow the [conventional commits guidelines][conventional_commits] to *make reviews easier* and to make
-the VCS/git logs more valuable. The general structure of a commit message is:
+Follow [commit message hygiene][hygiene] to *make reviews easier* and to make
+the VCS/git logs more valuable.
 
-```
-<type>([optional scope]): <description>
-
-[optional body]
-
-[optional footer(s)]
-```
-
-- Prefix the commit subject with one of these [_types_](https://github.com/commitizen/conventional-commit-types/blob/master/index.json):
-    - `build`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`, `test`, `vim-patch`, `chore`
-    - You can **ignore this for "fixup" commits** or any commits you expect to be squashed.
-- Append optional scope to _type_ such as `(lsp)`, `(treesitter)`, `(float)`, …
-- _Description_ shouldn't start with a capital letter or end in a period.
-- Use the _imperative voice_: "Fix bug" rather than "Fixed bug" or "Fixes bug."
 - Try to keep the first line under 72 characters.
-- A blank line must follow the subject.
-- Breaking API changes must be indicated by
-    1. "!" after the type/scope, and
-    2. a "BREAKING CHANGE" footer describing the change.
-       Example:
-       ```
-       refactor(provider)!: drop support for Python 2
-
-       BREAKING CHANGE: refactor to use Python 3 features since Python 2 is no longer supported.
-       ```
+- **Prefix the commit subject with a _scope_:** `doc:`, `test:`, `foo.c:`,
+  `runtime:`, ...
+    - For commits that contain only style/lint changes, a single-word subject
+      line is preferred: `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 [sourcehut] and [GitHub Actions].
+Each pull request must pass the automated builds on [travis CI], [quickbuild]
+and [AppVeyor].
 
 - CI builds are compiled with [`-Werror`][gcc-warnings], so compiler warnings
   will fail the build.
@@ -122,133 +105,47 @@ Each pull request must pass the automated builds on [sourcehut] and [GitHub Acti
 - 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](#lint) build checks modified lines _and their immediate
-  neighbors_, to encourage incrementally updating the legacy style to meet our
-  [style](#style). (See [#3174][3174] for background.)
-- CI for freebsd and openbsd runs on [sourcehut].
-    - To get a backtrace on freebsd (after connecting via ssh):
-      ```sh
-      sudo pkg install tmux  # If you want tmux.
-      lldb build/bin/nvim -c nvim.core
+- The `lint` build ([#3174][3174]) checks modified lines _and their immediate
+  neighbors_. This is to encourage incrementally updating the legacy style to
+  meet our style guidelines.
+    - A single word (`lint` or `style`) is sufficient as the subject line of
+      a commit that contains only style changes.
+- [How to investigate QuickBuild failures](https://github.com/neovim/neovim/pull/4718#issuecomment-217631350)
+
+QuickBuild uses this invocation:
+
+    mkdir -p build/${params.get("buildType")} \
+    && cd build/${params.get("buildType")} \
+    && cmake -G "Unix Makefiles" -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_BUILD_TYPE=${params.get("buildType")}
+    -DTRAVIS_CI_BUILD=ON ../.. && ${node.getAttribute("make", "make")}
+    VERBOSE=1 nvim unittest-prereqs functionaltest-prereqs
 
-      # To get a full backtrace:
-      #   1. Rebuild with debug info.
-      rm -rf nvim.core build
-      gmake CMAKE_BUILD_TYPE=RelWithDebInfo CMAKE_EXTRA_FLAGS="-DCI_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](https://clang-analyzer.llvm.org/scan-build.html) analyzer.
+The auto-generated [clang-scan] report presents walk-throughs of bugs found by
+Clang's [scan-build](https://clang-analyzer.llvm.org/scan-build.html) static
+analyzer. To verify a fix locally, run `scan-build` like this:
 
-- 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](https://neovim.io/doc/reports/pvs/PVS-studio.html.d/) to
-see potential bugs found by [PVS Studio](https://www.viva64.com/en/pvs-studio/).
-
-- Use this format for commit messages (where `{id}` is the PVS warning-id)):
-  ```
-  fix(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.
+    rm -rf build/
+    scan-build --use-analyzer=/usr/bin/clang make
 
 ### Coverity
 
 [Coverity](https://scan.coverity.com/projects/neovim-neovim) 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](https://github.com/neovim/neovim/pull/804))):
-  ```
-  fix(coverity/{id}): {description}
-  ```
-- Search the Neovim commit history to find examples:
-  ```
-  git log --oneline --no-merges --grep coverity
-  ```
+Use this commit-message format for coverity fixes:
 
-### Clang sanitizers (ASAN and UBSAN)
+    coverity/<id>: <description of what fixed the defect>
 
-  ASAN/UBSAN can be used to detect memory errors and other common forms of undefined behavior at runtime in debug builds.
+where `<id>` is the Coverity ID (CID). For example see [#804](https://github.com/neovim/neovim/pull/804).
 
-- To build Neovim with sanitizers enabled, use
-  ```
-  rm -rf build && CMAKE_EXTRA_FLAGS="-DCMAKE_C_COMPILER=clang -DCLANG_ASAN_UBSAN=1" make
-  ```
-- When running Neovim, use
-  ```
-  UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=log_path=/tmp/nvim_asan nvim args...
-  ```
-- If Neovim exits unexpectedly, check `/tmp/nvim_asan.{PID}` (or your preferred `log_path`) for log files with error messages.
-
-
-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
-
-- Style rules are (mostly) defined by `src/uncrustify.cfg` which tries to match
-  the [style-guide]. To use the Nvim `gq` command with `uncrustify`:
-  ```
-  if !empty(findfile('src/uncrustify.cfg', ';'))
-    setlocal formatprg=uncrustify\ -q\ -l\ C\ -c\ src/uncrustify.cfg\ --no-backup
-  endif
-  ```
-  The required version of `uncrustify` is specified in `uncrustify.cfg`.
-- There is also `.clang-format` which has drifted from the [style-guide], but
-  is available for reference. To use the Nvim `gq` command with `clang-format`:
-  ```
-  if !empty(findfile('.clang-format', ';'))
-    setlocal formatprg=clang-format\ -style=file
-  endif
-  ```
-
-### Navigate
-
-- Set `blame.ignoreRevsFile` to ignore [noise commits](https://github.com/neovim/neovim/commit/2d240024acbd68c2d3f82bc72cb12b1a4928c6bf) in git blame:
-  ```
-  git config blame.ignoreRevsFile .git-blame-ignore-revs
-  ```
-- Use **[universal-ctags](https://github.com/universal-ctags/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](https://sourcegraph.com/github.com/neovim/neovim).
-- If using [lua-language-server][], symlink `contrib/luarc.json` into the
-  project root:
-
-      $ ln -s contrib/luarc.json .luarc.json
+### PVS-Studio
 
+View the [PVS analysis report](https://neovim.io/doc/reports/pvs/) to see bugs
+found by [PVS Studio](https://www.viva64.com/en/pvs-studio/).
+You can run `scripts/pvscheck.sh` locally to run PVS on your machine.
 
 Reviewing
 ---------
@@ -256,10 +153,10 @@ Reviewing
 To help review pull requests, start with [this checklist][review-checklist].
 
 Reviewing can be done on GitHub, but you may find it easier to do locally.
-Using [GitHub CLI][gh], you can create a new branch with the contents of a pull
+Using [`hub`][hub], you can create a new branch with the contents of a pull
 request, e.g. [#1820][1820]:
 
-    gh pr checkout https://github.com/neovim/neovim/pull/1820
+    hub checkout https://github.com/neovim/neovim/pull/1820
 
 Use [`git log -p master..FETCH_HEAD`][git-history-filtering] to list all
 commits in the feature branch which aren't in the `master` branch; `-p`
@@ -274,22 +171,17 @@ as context, use the `-W` argument as well.
 [git-rebasing]: http://git-scm.com/book/en/v2/Git-Branching-Rebasing
 [github-issues]: https://github.com/neovim/neovim/issues
 [1820]: https://github.com/neovim/neovim/pull/1820
-[gh]: https://cli.github.com/
-[conventional_commits]: https://www.conventionalcommits.org
-[style-guide]: https://neovim.io/doc/user/dev_style.html#dev-style
+[hub]: https://hub.github.com/
+[hygiene]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[style-guide]: http://neovim.io/develop/style-guide.xml
 [ASan]: http://clang.llvm.org/docs/AddressSanitizer.html
 [run-tests]: https://github.com/neovim/neovim/blob/master/test/README.md#running-tests
 [wiki-faq]: https://github.com/neovim/neovim/wiki/FAQ
 [review-checklist]: https://github.com/neovim/neovim/wiki/Code-review-checklist
 [3174]: https://github.com/neovim/neovim/issues/3174
-[sourcehut]: https://builds.sr.ht/~jmk
-[GitHub Actions]: https://github.com/neovim/neovim/actions
+[travis CI]: https://travis-ci.org/neovim/neovim
+[quickbuild]: http://neovim-qb.szakmeister.net/dashboard
+[AppVeyor]: https://ci.appveyor.com/project/neovim/neovim
 [Merge a Vim patch]: https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-Vim
-[Clang report]: https://neovim.io/doc/reports/clang/
+[clang-scan]: https://neovim.io/doc/reports/clang/
 [complexity:low]: https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow
-[master error list]: https://raw.githubusercontent.com/neovim/doc/gh-pages/reports/clint/errors.json
-[wiki-contribute-help]: https://github.com/neovim/neovim/wiki/contribute-%3Ahelp
-[pr-draft]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request
-[pr-ready]: https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request
-[uncrustify]: http://uncrustify.sourceforge.net/
-[lua-language-server]: https://github.com/sumneko/lua-language-server/

ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+<!-- Before reporting: search existing issues and check the FAQ. -->
+
+- `nvim --version`:
+- Vim (version: ) behaves differently?
+- Operating system/version:
+- Terminal name/version:
+- `$TERM`:
+
+### Steps to reproduce using `nvim -u NORC`
+
+```
+nvim -u NORC
+
+```
+
+### Actual behaviour
+
+### Expected behaviour
+

LICENSE

@@ -189,17 +189,8 @@ contributed under the Vim license and (2) externally maintained libraries.
 The externally maintained libraries used by Neovim are:
 
   - Klib: a Generic Library in C. MIT/X11 license.
-  - Lua: MIT license
-  - LuaJIT: a Just-In-Time Compiler for Lua. Copyright Mike Pall. MIT license.
-  - Luv: Apache 2.0 license
-  - libmpack: MIT license
-  - libtermkey: MIT license
   - libuv. Copyright Joyent, Inc. and other Node contributors. Node.js license.
-  - libvterm: MIT license
-  - lua-compat: MIT license
-  - tree-sitter: MIT license
-  - xdiff: LGPL license
-  - lua-cjson: MIT license
+  - LuaJIT: a Just-In-Time Compiler for Lua. Copyright Mike Pall. MIT license.
 
 ====
 

MAINTAIN.md

@@ -3,20 +3,14 @@ Maintaining the Neovim project
 
 Notes on maintaining the Neovim project.
 
-General guidelines
-------------------
+See also: https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt
 
-* Decide by cost-benefit
-* Write down what was decided
-* Constraints are good
-* Use automation to solve problems
-* Never break the API... but sometimes break the UI
-
-Ticket triage
+Ticket Triage
 -------------
 
-In practice we haven't found a way to forecast more precisely than "next" and
-"after next". So there are usually one or two (at most) planned milestones:
+In practice we haven't found a meaningful way to forecast more precisely than
+"next" and "after next". That means there are usually one or two (at most)
+planned milestones:
 
 - Next bugfix-release (1.0.x)
 - Next feature-release (1.x.0)
@@ -24,75 +18,31 @@ In practice we haven't found a way to forecast more precisely than "next" and
 The forecasting problem might be solved with an explicit priority system (like
 Bram's todo.txt). Meanwhile the Neovim priority system is defined by:
 
-- PRs nearing completion.
-- Issue labels. E.g. the `+plan` label increases the ticket's priority merely
-  for having a plan written down: it is _closer to completion_ than tickets
-  without a plan.
+- PRs nearing completion (RDY).
+- Issue labels. E.g. the +plan label increases the ticket's priority merely for
+  having a plan written down: it is _closer to completion_ than tickets without
+  a plan.
 - Comment activity or new information.
 
-Anything that isn't in the next milestone, and doesn't have a finished PR—is
+Anything that isn't in the next milestone, and doesn't have a RDY PR ... is
 just not something you care very much about, by construction. Post-release you
 can review open issues, but chances are your next milestone is already getting
-full... :)
+full :)
 
-Release policy
+Release Policy
 --------------
 
-Release "often", but not "early".
+The goal is "early and often".
 
-The (unreleased) `master` branch is the "early" channel; it should not be
-released if it's not stable. High-risk changes may be merged to `master` if
-the next release is not imminent.
+Up to now we use only one branch, the `master` branch.
 
-For maintenance releases, create a `release-x.y` branch. If the current release
-has a major bug:
+- If `master` is unstable we don't release.
+- If the last release has a major bug, we:
+  1. Fix the bug on `master`.
+  2. Disable or remove any known risks present on `master`.
+  3. Cut a release from `master`.
 
-1. Fix the bug on `master`.
-2. Cherry-pick the fix to `release-x.y`.
-3. Cut a release from `release-x.y`.
-    - Run `./scripts/release.sh`
-    - Update (force-push) the remote `stable` tag.
-    - The [nightly job](https://github.com/neovim/neovim/blob/master/.github/workflows/release.yml#L4)
-      will update the release assets based on the `stable` tag.
+This is a bit silly, but it works ok. And it keeps `master` from biting off
+more feature-creep than it can chew.
 
-The neovim repository includes a backport [github action](https://github.com/zeebe-io/backport-action).
-In order to trigger the action, a PR must be labeled with a label matching the
-form `backport release-0.X`. If the label is applied before the PR is merged,
-the backport will be filed automatically against the target branch. Otherwise,
-comment `\backport` on the merged PR *after* the label has been applied to trigger
-a backport. Note, the PR must have a description in the issue body, or the backport
-will fail.
-
-Third-party dependencies
---------------
-
-These "bundled" dependencies can be updated by bumping their versions in `third-party/CMakeLists.txt`:
-  - [Lua](https://www.lua.org/download.html)
-  - [LuaJIT](https://github.com/LuaJIT/LuaJIT)
-  - [Luv](https://github.com/luvit/luv)
-  - [libtermkey](https://github.com/neovim/libtermkey)
-  - [libuv](https://github.com/libuv/libuv)
-  - [libvterm](http://www.leonerd.org.uk/code/libvterm/)
-  - [lua-compat](https://github.com/keplerproject/lua-compat-5.3)
-  - [tree-sitter](https://github.com/tree-sitter/tree-sitter)
-
-`scripts/bump-dep.sh` is a script that can automate this process for `LuaJIT`, `Luv`, `libuv` & `tree-sitter`. See usage guide:
-  - Run `./scripts/bump-deps.sh --dep Luv --version 1.43.0-0` to update a dependency.
-  See `./scripts/bump-deps.sh -h` for more detailed usage
-  - Run `./scripts/bump-deps.sh --pr` to create a pr
-  To generate the default PR title and body, the script uses the most recent commit (not in `master`) with prefix `build(deps): `
-
-These dependencies are "vendored" (inlined), we need to update the sources manually:
-  - [libmpack](https://github.com/libmpack/libmpack)
-  - [xdiff](https://github.com/git/git/tree/master/xdiff)
-  - [lua-cjson](https://github.com/openresty/lua-cjson)
-  - [Klib](https://github.com/attractivechaos/klib)
-
-We also maintain some forks, particularly for Windows, if we are waiting on upstream changes:
-https://github.com/neovim/neovim/wiki/Deps
-
-See also
---------
-
-- https://github.com/neovim/neovim/issues/862
-- https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt
+See also: https://github.com/neovim/neovim/issues/862

Makefile

@@ -1,76 +1,48 @@
-MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-MAKEFILE_DIR  := $(dir $(MAKEFILE_PATH))
-
+THIS_DIR = $(shell pwd)
 filter-false = $(strip $(filter-out 0 off OFF false FALSE,$1))
 filter-true = $(strip $(filter-out 1 on ON true TRUE,$1))
 
 # See contrib/local.mk.example
 -include local.mk
 
-all: nvim
-
 CMAKE_PRG ?= $(shell (command -v cmake3 || echo cmake))
 CMAKE_BUILD_TYPE ?= Debug
+
 CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE)
-# Extra CMake flags which extend the default set
-CMAKE_EXTRA_FLAGS ?=
-NVIM_PRG := $(MAKEFILE_DIR)/build/bin/nvim
 
-# CMAKE_INSTALL_PREFIX
-#   - May be passed directly or as part of CMAKE_EXTRA_FLAGS.
-#   - `checkprefix` target checks that it matches the CMake-cached value. #9615
-ifneq (,$(CMAKE_INSTALL_PREFIX)$(CMAKE_EXTRA_FLAGS))
-CMAKE_INSTALL_PREFIX := $(shell echo $(CMAKE_EXTRA_FLAGS) | 2>/dev/null \
-    grep -o 'CMAKE_INSTALL_PREFIX=[^ ]\+' | cut -d '=' -f2)
-endif
-ifneq (,$(CMAKE_INSTALL_PREFIX))
-override CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX)
-
-checkprefix:
-	@if [ -f build/.ran-cmake ]; then \
-	  cached_prefix=$(shell $(CMAKE_PRG) -L -N build | 2>/dev/null grep 'CMAKE_INSTALL_PREFIX' | cut -d '=' -f2); \
-	  if ! [ "$(CMAKE_INSTALL_PREFIX)" = "$$cached_prefix" ]; then \
-	    printf "Re-running CMake: CMAKE_INSTALL_PREFIX '$(CMAKE_INSTALL_PREFIX)' does not match cached value '%s'.\n" "$$cached_prefix"; \
-	    $(RM) build/.ran-cmake; \
-	  fi \
-	fi
-else
-checkprefix: ;
-endif
-
-CMAKE_GENERATOR ?= $(shell (command -v ninja > /dev/null 2>&1 && echo "Ninja") || \
+BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || \
     echo "Unix Makefiles")
 DEPS_BUILD_DIR ?= .deps
+
 ifneq (1,$(words [$(DEPS_BUILD_DIR)]))
   $(error DEPS_BUILD_DIR must not contain whitespace)
 endif
 
 ifeq (,$(BUILD_TOOL))
-  ifeq (Ninja,$(CMAKE_GENERATOR))
+  ifeq (Ninja,$(BUILD_TYPE))
     ifneq ($(shell $(CMAKE_PRG) --help 2>/dev/null | grep Ninja),)
-      BUILD_TOOL = ninja
+      BUILD_TOOL := ninja
     else
       # User's version of CMake doesn't support Ninja
       BUILD_TOOL = $(MAKE)
-      CMAKE_GENERATOR := Unix Makefiles
+      BUILD_TYPE := Unix Makefiles
     endif
   else
     BUILD_TOOL = $(MAKE)
   endif
 endif
 
-
-# Only need to handle Ninja here.  Make will inherit the VERBOSE variable, and the -j, -l, and -n flags.
-ifeq ($(CMAKE_GENERATOR),Ninja)
-  ifneq ($(VERBOSE),)
-    BUILD_TOOL += -v
-  endif
-  BUILD_TOOL += $(shell printf '%s' '$(MAKEFLAGS)' | grep -o -- ' *-[jl][0-9]\+ *')
-  ifeq (n,$(findstring n,$(firstword -$(MAKEFLAGS))))
-    BUILD_TOOL += -n
+ifneq ($(VERBOSE),)
+  # Only need to handle Ninja here.  Make will inherit the VERBOSE variable.
+  ifeq ($(BUILD_TYPE),Ninja)
+    VERBOSE_FLAG := -v
   endif
 endif
 
+BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG)
+
+# Extra CMake flags which extend the default set
+CMAKE_EXTRA_FLAGS ?=
 DEPS_CMAKE_FLAGS ?=
 # Back-compat: USE_BUNDLED_DEPS was the old name.
 USE_BUNDLED ?= $(USE_BUNDLED_DEPS)
@@ -88,142 +60,104 @@ endif
 # a warning, but we need to keep SCRIPTS argument.
 SINGLE_MAKE = export MAKEFLAGS= ; $(MAKE)
 
+all: nvim
+
 nvim: build/.ran-cmake deps
-	+$(BUILD_TOOL) -C build
+	+$(BUILD_CMD) -C build
 
 libnvim: build/.ran-cmake deps
-	+$(BUILD_TOOL) -C build libnvim
+	+$(BUILD_CMD) -C build libnvim
 
 cmake:
 	touch CMakeLists.txt
 	$(MAKE) build/.ran-cmake
 
 build/.ran-cmake: | deps
-	cd build && $(CMAKE_PRG) -G '$(CMAKE_GENERATOR)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) $(MAKEFILE_DIR)
+	cd build && $(CMAKE_PRG) -G '$(BUILD_TYPE)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) $(THIS_DIR)
 	touch $@
 
 deps: | build/.ran-third-party-cmake
 ifeq ($(call filter-true,$(USE_BUNDLED)),)
-	+$(BUILD_TOOL) -C $(DEPS_BUILD_DIR)
+	+$(BUILD_CMD) -C $(DEPS_BUILD_DIR)
 endif
 
+build/.ran-third-party-cmake:
 ifeq ($(call filter-true,$(USE_BUNDLED)),)
-$(DEPS_BUILD_DIR):
-	mkdir -p "$@"
-build/.ran-third-party-cmake:: $(DEPS_BUILD_DIR)
+	mkdir -p $(DEPS_BUILD_DIR)
 	cd $(DEPS_BUILD_DIR) && \
-		$(CMAKE_PRG) -G '$(CMAKE_GENERATOR)' $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) \
-		$(DEPS_CMAKE_FLAGS) $(MAKEFILE_DIR)/third-party
+		$(CMAKE_PRG) -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) \
+		$(DEPS_CMAKE_FLAGS) $(THIS_DIR)/third-party
 endif
-build/.ran-third-party-cmake::
 	mkdir -p build
 	touch $@
 
 # TODO: cmake 3.2+ add_custom_target() has a USES_TERMINAL flag.
-oldtest: | nvim build/runtime/doc/tags
+oldtest: | nvim helptags
 	+$(SINGLE_MAKE) -C src/nvim/testdir clean
 ifeq ($(strip $(TEST_FILE)),)
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) $(MAKEOVERRIDES)
+	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG="$(realpath build/bin/nvim)" $(MAKEOVERRIDES)
 else
-	@# Handle TEST_FILE=test_foo{,.res,.vim}.
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst %.vim,%,$(patsubst %.res,%,$(TEST_FILE)))
+	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG="$(realpath build/bin/nvim)" NEW_TESTS=$(TEST_FILE) SCRIPTS= $(MAKEOVERRIDES)
 endif
-# Build oldtest by specifying the relative .vim filename.
-.PHONY: phony_force
-src/nvim/testdir/%.vim: phony_force
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst src/nvim/testdir/%.vim,%,$@)
 
-build/runtime/doc/tags helptags: | nvim
-	+$(BUILD_TOOL) -C build runtime/doc/tags
+helptags: | nvim
+	+$(BUILD_CMD) -C build helptags
 
 # Builds help HTML _and_ checks for invalid help tags.
-helphtml: | nvim build/runtime/doc/tags
-	+$(BUILD_TOOL) -C build doc_html
+helphtml: | nvim helptags
+	+$(BUILD_CMD) -C build doc_html
 
 functionaltest: | nvim
-	+$(BUILD_TOOL) -C build functionaltest
+	+$(BUILD_CMD) -C build functionaltest
 
 functionaltest-lua: | nvim
-	+$(BUILD_TOOL) -C build functionaltest-lua
+	+$(BUILD_CMD) -C build functionaltest-lua
+
+testlint: | build/.ran-cmake deps
+	$(BUILD_CMD) -C build testlint
 
 lualint: | build/.ran-cmake deps
-	$(BUILD_TOOL) -C build lualint
-
-shlint:
-	@shellcheck --version | head -n 2
-	shellcheck scripts/vim-patch.sh
-
-_opt_shlint:
-	@command -v shellcheck && { $(MAKE) shlint; exit $$?; } \
-		|| echo "SKIP: shlint (shellcheck not found)"
-
-pylint:
-	flake8 contrib/ scripts/ src/ test/
-
-# Run pylint only if flake8 is installed.
-_opt_pylint:
-	@command -v flake8 && { $(MAKE) pylint; exit $$?; } \
-		|| echo "SKIP: pylint (flake8 not found)"
-
-commitlint:
-	$(NVIM_PRG) -u NONE -es +"lua require('scripts.lintcommit').main({trace=false})"
-
-_opt_commitlint:
-	@test -x build/bin/nvim && { $(MAKE) commitlint; exit $$?; } \
-		|| echo "SKIP: commitlint (build/bin/nvim not found)"
+	$(BUILD_CMD) -C build lualint
 
 unittest: | nvim
-	+$(BUILD_TOOL) -C build unittest
+	+$(BUILD_CMD) -C build unittest
 
 benchmark: | nvim
-	+$(BUILD_TOOL) -C build benchmark
+	+$(BUILD_CMD) -C build benchmark
 
 test: functionaltest unittest
 
 clean:
-	+test -d build && $(BUILD_TOOL) -C build clean || true
+	+test -d build && $(BUILD_CMD) -C build clean || true
 	$(MAKE) -C src/nvim/testdir clean
 	$(MAKE) -C runtime/doc clean
-	$(MAKE) -C runtime/indent clean
 
-distclean:
+distclean: clean
 	rm -rf $(DEPS_BUILD_DIR) build
-	$(MAKE) clean
 
-install: checkprefix nvim
-	+$(BUILD_TOOL) -C build install
+install: | nvim
+	+$(BUILD_CMD) -C build install
 
 clint: build/.ran-cmake
-	+$(BUILD_TOOL) -C build clint
+	+$(BUILD_CMD) -C build clint
 
 clint-full: build/.ran-cmake
-	+$(BUILD_TOOL) -C build clint-full
+	+$(BUILD_CMD) -C build clint-full
 
 check-single-includes: build/.ran-cmake
-	+$(BUILD_TOOL) -C build check-single-includes
+	+$(BUILD_CMD) -C build check-single-includes
 
 generated-sources: build/.ran-cmake
-	+$(BUILD_TOOL) -C build generated-sources
+	+$(BUILD_CMD) -C build generated-sources
 
 appimage:
 	bash scripts/genappimage.sh
 
-# Build an appimage with embedded update information.
-#   appimage-nightly: for nightly builds
-#   appimage-latest: for a release
+# Build an appimage with embedded update information appimage-nightly for
+# nightly builds or appimage-latest for a release
 appimage-%:
 	bash scripts/genappimage.sh $*
 
-lint: check-single-includes clint lualint _opt_pylint _opt_shlint _opt_commitlint
+lint: check-single-includes clint testlint lualint
 
-# Generic pattern rules, allowing for `make build/bin/nvim` etc.
-# Does not work with "Unix Makefiles".
-ifeq ($(CMAKE_GENERATOR),Ninja)
-build/%: phony_force
-	$(BUILD_TOOL) -C build $(patsubst build/%,%,$@)
-
-$(DEPS_BUILD_DIR)/%: phony_force
-	$(BUILD_TOOL) -C $(DEPS_BUILD_DIR) $(patsubst $(DEPS_BUILD_DIR)/%,%,$@)
-endif
-
-.PHONY: test lualint pylint shlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage checkprefix commitlint
+.PHONY: test testlint lualint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage

README.md

@@ -1,12 +1,13 @@
-<h1 align="center">
-  <img src="https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo-300x87.png" alt="Neovim">
-</h1>
+[![Neovim](https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo-600x173.png)](https://neovim.io)
 
-[Documentation](https://neovim.io/doc/general/) |
-[Chat](https://app.element.io/#/room/#neovim:matrix.org) |
-[Twitter](https://twitter.com/Neovim)
+[Wiki](https://github.com/neovim/neovim/wiki) |
+[Documentation](https://neovim.io/doc) |
+[Twitter](https://twitter.com/Neovim) |
+[Community](https://neovim.io/community/) |
+[Gitter **Chat**](https://gitter.im/neovim/neovim)
 
-[![GitHub CI](https://github.com/neovim/neovim/workflows/CI/badge.svg)](https://github.com/neovim/neovim/actions?query=workflow%3ACI+branch%3Amaster+event%3Apush)
+[![Travis build status](https://travis-ci.org/neovim/neovim.svg?branch=master)](https://travis-ci.org/neovim/neovim)
+[![AppVeyor build status](https://ci.appveyor.com/api/projects/status/urdqjrik5u521fac/branch/master?svg=true)](https://ci.appveyor.com/project/neovim/neovim/branch/master)
 [![Codecov coverage](https://img.shields.io/codecov/c/github/neovim/neovim.svg)](https://codecov.io/gh/neovim/neovim)
 [![Coverity Scan analysis](https://scan.coverity.com/projects/2227/badge.svg)](https://scan.coverity.com/projects/2227)
 [![Clang analysis](https://neovim.io/doc/reports/clang/badge.svg)](https://neovim.io/doc/reports/clang)
@@ -15,7 +16,6 @@
 [![Packages](https://repology.org/badge/tiny-repos/neovim.svg)](https://repology.org/metapackage/neovim)
 [![Debian CI](https://badges.debian.net/badges/debian/testing/neovim/version.svg)](https://buildd.debian.org/neovim)
 [![Downloads](https://img.shields.io/github/downloads/neovim/neovim/total.svg?maxAge=2592001)](https://github.com/neovim/neovim/releases/)
-[![nvim](https://snapcraft.io//nvim/badge.svg)](https://snapcraft.io/nvim)
 
 Neovim is a project that seeks to aggressively refactor Vim in order to:
 
@@ -27,13 +27,15 @@ Neovim is a project that seeks to aggressively refactor Vim in order to:
 See the [Introduction](https://github.com/neovim/neovim/wiki/Introduction) wiki page and [Roadmap]
 for more information.
 
+[![Throughput Graph](https://graphs.waffle.io/neovim/neovim/throughput.svg)](https://waffle.io/neovim/neovim/metrics)
+
 Features
 --------
 
 - Modern [GUIs](https://github.com/neovim/neovim/wiki/Related-projects#gui)
-- [API access](https://github.com/neovim/neovim/wiki/Related-projects#api-clients)
-  from any language including C/C++, C#, Clojure, D, Elixir, Go, Haskell, Java,
-  JavaScript/Node.js, Julia, Lisp, Lua, Perl, Python, Racket, Ruby, Rust
+- [API](https://github.com/neovim/neovim/wiki/Related-projects#api-clients)
+  access from any language including Clojure, Lisp, Go, Haskell, Lua,
+  JavaScript, Perl, Python, Ruby, and Rust
 - Embedded, scriptable [terminal emulator](https://neovim.io/doc/user/nvim_terminal_emulator.html)
 - Asynchronous [job control](https://github.com/neovim/neovim/pull/2247)
 - [Shared data (shada)](https://github.com/neovim/neovim/pull/2506) among multiple editor instances
@@ -48,30 +50,50 @@ Install from package
 Pre-built packages for Windows, macOS, and Linux are found on the
 [Releases](https://github.com/neovim/neovim/releases/) page.
 
-[Managed packages] are in [Homebrew], [Debian], [Ubuntu], [Fedora], [Arch Linux], [Void Linux], [Gentoo], and more!
+Managed packages are in [Homebrew], [Debian], [Ubuntu], [Fedora], [Arch Linux], [Gentoo],
+and [more](https://github.com/neovim/neovim/wiki/Installing-Neovim)!
 
 Install from source
 -------------------
 
-See the [Building Neovim](https://github.com/neovim/neovim/wiki/Building-Neovim) wiki page for details.
-
-The build is CMake-based, but a Makefile is provided as a convenience.
-After installing the dependencies, run the following command.
-
     make CMAKE_BUILD_TYPE=RelWithDebInfo
     sudo make install
 
-To install to a non-default location:
+To install to a non-default location, set `CMAKE_INSTALL_PREFIX`:
 
-    make CMAKE_INSTALL_PREFIX=/full/path/
+    make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=/full/path/"
     make install
 
-CMake hints for inspecting the build:
+To skip bundled (`third-party/*`) dependencies:
 
-- `cmake --build build --target help` lists all build targets.
-- `build/CMakeCache.txt` (or `cmake -LAH build/`) contains the resolved values of all CMake variables.
+1. Install the dependencies using a package manager.
+   ```
+   sudo apt install gperf luajit luarocks libuv1-dev libluajit-5.1-dev libunibilium-dev libmsgpack-dev libtermkey-dev libvterm-dev libjemalloc-dev
+   sudo luarocks build mpack
+   sudo luarocks build lpeg
+   sudo luarocks build inspect
+   ```
+2. Build with `USE_BUNDLED=OFF`:
+   ```
+   make CMAKE_BUILD_TYPE=RelWithDebInfo USE_BUNDLED=OFF
+   sudo make install
+   ```
+
+CMake features:
+
+- List all build targets:
+  ```
+  cmake --build build --target help
+  ```
+- Print all variable definitions:
+  ```
+  cmake -LAH
+  ```
+- `build/CMakeCache.txt` contains the resolved values of all CMake variables.
 - `build/compile_commands.json` shows the full compiler invocations for each translation unit.
 
+See the [Building Neovim](https://github.com/neovim/neovim/wiki/Building-Neovim) wiki page for details.
+
 Transitioning from Vim
 --------------------
 
@@ -99,9 +121,17 @@ Project layout
 License
 -------
 
-Neovim contributions since [b17d96][license-commit] are licensed under the
-Apache 2.0 license, except for contributions copied from Vim (identified by the
-`vim-patch` token). See LICENSE for details.
+Neovim is licensed under the terms of the Apache 2.0 license, except for
+parts that were contributed under the Vim license.
+
+- Contributions committed before [b17d96][license-commit] remain under the Vim
+  license.
+
+- Contributions committed after [b17d96][license-commit] are licensed under
+  Apache 2.0 unless those contributions were copied from Vim (identified in
+  the commit logs by the `vim-patch` token).
+
+See `LICENSE` for details.
 
     Vim is Charityware.  You can use and copy it as much as you like, but you are
     encouraged to make a donation for needy children in Uganda.  Please see the
@@ -118,13 +148,11 @@ Apache 2.0 license, except for contributions copied from Vim (identified by the
 [nvim-features]: https://neovim.io/doc/user/vim_diff.html#nvim-features
 [Roadmap]: https://neovim.io/roadmap/
 [advanced UIs]: https://github.com/neovim/neovim/wiki/Related-projects#gui
-[Managed packages]: https://github.com/neovim/neovim/wiki/Installing-Neovim#install-from-package
+[Homebrew]: https://github.com/neovim/homebrew-neovim#installation
 [Debian]: https://packages.debian.org/testing/neovim
 [Ubuntu]: http://packages.ubuntu.com/search?keywords=neovim
-[Fedora]: https://packages.fedoraproject.org/pkgs/neovim/neovim/
+[Fedora]: https://apps.fedoraproject.org/packages/neovim
 [Arch Linux]: https://www.archlinux.org/packages/?q=neovim
-[Void Linux]: https://voidlinux.org/packages/?arch=x86_64&q=neovim
 [Gentoo]: https://packages.gentoo.org/packages/app-editors/neovim
-[Homebrew]: https://formulae.brew.sh/formula/neovim
 
 <!-- vim: set tw=80: -->

appveyor.yml

@@ -0,0 +1,25 @@
+version: '{build}'
+environment:
+  APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9"
+image: Visual Studio 2017
+configuration:
+- MSVC_64
+- MSVC_32
+- MINGW_64
+- MINGW_32
+- MINGW_64-gcov
+matrix:
+  allow_failures:
+    - configuration: MINGW_64-gcov
+install: []
+before_build:
+- ps: Install-Product node 8
+build_script:
+- powershell ci\build.ps1
+cache:
+- C:\msys64\var\cache\pacman\pkg -> ci\build.ps1
+- .deps -> ci\build.ps1
+- .deps -> third-party\**
+artifacts:
+- path: build/Neovim.zip
+- path: build/bin/nvim.exe

busted/outputHandlers/TAP.lua

@@ -0,0 +1,94 @@
+-- TODO(jkeyes): Use the upstream version when busted releases it. (But how to
+-- inject our call to global_helpers.read_nvim_log() ?)
+
+local pretty = require 'pl.pretty'
+local global_helpers = require('test.helpers')
+
+return function(options)
+  local busted = require 'busted'
+  local handler = require 'busted.outputHandlers.base'()
+
+  local success = 'ok %u - %s'
+  local failure = 'not ' .. success
+  local skip = 'ok %u - # SKIP %s'
+  local counter = 0
+
+  handler.suiteReset = function()
+    counter = 0
+    return nil, true
+  end
+
+  handler.suiteEnd = function()
+    io.write(global_helpers.read_nvim_log())
+    print('1..' .. counter)
+    io.flush()
+    return nil, true
+  end
+
+  local function showFailure(t)
+    local message = t.message
+    local trace = t.trace or {}
+
+    if message == nil then
+      message = 'Nil error'
+    elseif type(message) ~= 'string' then
+      message = pretty.write(message)
+    end
+
+    print(failure:format(counter, t.name))
+    print('# ' .. t.element.trace.short_src .. ' @ ' .. t.element.trace.currentline)
+    if t.randomseed then print('# Random seed: ' .. t.randomseed) end
+    print('# Failure message: ' .. message:gsub('\n', '\n# '))
+    if options.verbose and trace.traceback then
+      print('# ' .. trace.traceback:gsub('^\n', '', 1):gsub('\n', '\n# '))
+    end
+  end
+
+  handler.testStart = function(element, parent)
+    local trace = element.trace
+    if options.verbose and trace and trace.short_src then
+      local fileline = trace.short_src .. ' @ ' ..  trace.currentline .. ': '
+      local testName = fileline .. handler.getFullName(element)
+      print('# ' .. testName)
+    end
+    io.flush()
+
+    return nil, true
+  end
+
+  handler.testEnd = function(element, parent, status, trace)
+    counter = counter + 1
+    if status == 'success' then
+      local t = handler.successes[#handler.successes]
+      print(success:format(counter, t.name))
+    elseif status == 'pending' then
+      local t = handler.pendings[#handler.pendings]
+      print(skip:format(counter, (t.message or t.name)))
+    elseif status == 'failure' then
+      showFailure(handler.failures[#handler.failures])
+    elseif status == 'error' then
+      showFailure(handler.errors[#handler.errors])
+    end
+    io.flush()
+
+    return nil, true
+  end
+
+  handler.error = function(element, parent, message, debug)
+    if element.descriptor ~= 'it' then
+      counter = counter + 1
+      showFailure(handler.errors[#handler.errors])
+    end
+    io.flush()
+
+    return nil, true
+  end
+
+  busted.subscribe({ 'suite', 'reset' }, handler.suiteReset)
+  busted.subscribe({ 'suite', 'end' }, handler.suiteEnd)
+  busted.subscribe({ 'test', 'start' }, handler.testStart, { predicate = handler.cancelOnPending })
+  busted.subscribe({ 'test', 'end' }, handler.testEnd, { predicate = handler.cancelOnPending })
+  busted.subscribe({ 'error' }, handler.error)
+
+  return handler
+end

busted/outputHandlers/nvim.lua

@@ -1,8 +1,15 @@
+local s = require 'say'
 local pretty = require 'pl.pretty'
+local term = require 'term'
+local global_helpers = require('test.helpers')
 
--- Colors are disabled by default. #15610
-local colors = setmetatable({}, {__index = function() return function(s) return s == nil and '' or tostring(s) end end})
-if os.getenv "TEST_COLORS" then
+local colors
+
+local isWindows = package.config:sub(1,1) == '\\'
+
+if isWindows then
+  colors = setmetatable({}, {__index = function() return function(s) return s end end})
+else
   colors = require 'term.colors'
 end
 
@@ -58,6 +65,8 @@ return function(options)
     },
   }
 
+  c = nil
+
   local fileCount = 0
   local fileTestCount = 0
   local testCount = 0
@@ -67,6 +76,7 @@ return function(options)
   local errorCount = 0
 
   local pendingDescription = function(pending)
+    local name = pending.name
     local string = ''
 
     if type(pending.message) == 'string' then
@@ -165,7 +175,7 @@ return function(options)
     return nil, true
   end
 
-  handler.suiteStart = function(_suite, count, total, randomseed)
+  handler.suiteStart = function(suite, count, total, randomseed)
     if total > 1 then
       io.write(repeatSuiteString:format(count, total))
     end
@@ -186,11 +196,12 @@ return function(options)
     end
   end
 
-  handler.suiteEnd = function(suite, _count, _total)
+  handler.suiteEnd = function(suite, count, total)
     local elapsedTime_ms = getElapsedTime(suite)
     local tests = (testCount == 1 and 'test' or 'tests')
     local files = (fileCount == 1 and 'file' or 'files')
     io.write(globalTeardown)
+    io.write(global_helpers.read_nvim_log())
     io.write(suiteEndString:format(testCount, tests, fileCount, files, elapsedTime_ms))
     io.write(getSummaryString())
     io.flush()
@@ -214,19 +225,15 @@ return function(options)
     return nil, true
   end
 
-  handler.testStart = function(element, _parent)
+  handler.testStart = function(element, parent)
     io.write(runString:format(handler.getFullName(element)))
     io.flush()
 
     return nil, true
   end
 
-  local function write_status(element, string)
-    io.write(timeString:format(getElapsedTime(element)) .. ' ' .. string)
-    io.flush()
-  end
-
-  handler.testEnd = function(element, _parent, status, _debug)
+  handler.testEnd = function(element, parent, status, debug)
+    local elapsedTime_ms = getElapsedTime(element)
     local string
 
     fileTestCount = fileTestCount + 1
@@ -239,21 +246,45 @@ return function(options)
       string = skippedString
     elseif status == 'failure' then
       failureCount = failureCount + 1
-      string = failureString .. failureDescription(handler.failures[#handler.failures])
+      string = nil
     elseif status == 'error' then
       errorCount = errorCount + 1
-      string = errorString .. failureDescription(handler.errors[#handler.errors])
-    else
-      string = "unexpected test status! ("..status..")"
+      string = nil
+    end
+
+    if string ~= nil then
+      if elapsedTime_ms == elapsedTime_ms then
+        string = timeString:format(elapsedTime_ms) .. ' ' .. string
+      end
+      io.write(string)
+      io.flush()
     end
-    write_status(element, string)
 
     return nil, true
   end
 
-  handler.error = function(element, _parent, _message, _debug)
+  handler.testFailure = function(element, parent, message, debug)
+    io.write(failureString)
+    io.flush()
+
+    io.write(failureDescription(handler.failures[#handler.failures]))
+    io.flush()
+    return nil, true
+  end
+
+  handler.testError = function(element, parent, message, debug)
+    io.write(errorString)
+    io.flush()
+
+    io.write(failureDescription(handler.errors[#handler.errors]))
+    io.flush()
+    return nil, true
+  end
+
+  handler.error = function(element, parent, message, debug)
     if element.descriptor ~= 'it' then
-      write_status(element, failureDescription(handler.errors[#handler.errors]))
+      io.write(failureDescription(handler.errors[#handler.errors]))
+      io.flush()
       errorCount = errorCount + 1
     end
 
@@ -267,6 +298,8 @@ return function(options)
   busted.subscribe({ 'file', 'end' }, handler.fileEnd)
   busted.subscribe({ 'test', 'start' }, handler.testStart, { predicate = handler.cancelOnPending })
   busted.subscribe({ 'test', 'end' }, handler.testEnd, { predicate = handler.cancelOnPending })
+  busted.subscribe({ 'failure', 'it' }, handler.testFailure)
+  busted.subscribe({ 'error', 'it' }, handler.testError)
   busted.subscribe({ 'failure' }, handler.error)
   busted.subscribe({ 'error' }, handler.error)
 

ci/before_cache.sh

@@ -7,22 +7,23 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/suite.sh"
 
-mkdir -p "${HOME}/.cache"
+# Don't cache pip's log and selfcheck.
+rm -rf "${HOME}/.cache/pip/log"
+rm -f "${HOME}/.cache/pip/selfcheck.json"
 
 echo "before_cache.sh: cache size"
-du -chd 1 "${HOME}/.cache" | sort -rh | head -20
+du -d 2 "${HOME}/.cache" | sort -n
 
 echo "before_cache.sh: ccache stats"
 ccache -s 2>/dev/null || true
-# Do not keep ccache stats (uploaded to cache otherwise; reset initially anyway).
-find "${HOME}/.ccache" -name stats -delete
 
 # Update the third-party dependency cache only if the build was successful.
-if ended_successfully && [ -d "${DEPS_BUILD_DIR}" ]; then
-  # Do not cache downloads.  They should not be needed with up-to-date deps.
-  rm -rf "${DEPS_BUILD_DIR}/build/downloads"
-  rm -rf "${CACHE_NVIM_DEPS_DIR}"
-  mv "${DEPS_BUILD_DIR}" "${CACHE_NVIM_DEPS_DIR}"
+if ended_successfully; then
+  rm -rf "${HOME}/.cache/nvim-deps"
+  mv "${DEPS_BUILD_DIR}" "${HOME}/.cache/nvim-deps"
+
+  rm -rf "${HOME}/.cache/nvim-deps-downloads"
+  mv "${DEPS_DOWNLOAD_DIR}" "${HOME}/.cache/nvim-deps-downloads"
 
   touch "${CACHE_MARKER}"
   echo "Updated third-party dependencies (timestamp: $(_stat "${CACHE_MARKER}"))."

ci/before_install.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ "${CI_TARGET}" == lint ]]; then
+  exit
+fi
+
+echo 'python info:'
+(
+  2>&1 python --version || true
+  2>&1 python2 --version || true
+  2>&1 python3 --version || true
+  2>&1 pip --version || true
+  2>&1 pip2 --version || true
+  2>&1 pip3 --version || true
+  echo 'pyenv versions:'
+  2>&1 pyenv versions || true
+) | sed 's/^/  /'
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  echo "Upgrade Python 3 pip"
+  python3 -m pip -q install --user --upgrade pip
+else
+  echo "Upgrade Python 2 pip"
+  python2.7 -m pip -q install --user --upgrade pip
+  echo "Upgrade Python 3 pip"
+  # Allow failure. pyenv pip3 on travis is broken:
+  # https://github.com/travis-ci/travis-ci/issues/8363
+  python3 -m pip -q install --user --upgrade pip || true
+fi
+
+echo "Install node (LTS)"
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]] || [ ! -f ~/.nvm/nvm.sh ]; then
+  curl -o ~/.nvm/nvm.sh https://raw.githubusercontent.com/creationix/nvm/master/nvm.sh
+fi
+
+source ~/.nvm/nvm.sh
+nvm install --lts
+nvm use --lts

ci/before_script.sh

@@ -3,6 +3,10 @@
 set -e
 set -o pipefail
 
+if [[ "${CI_TARGET}" == lint ]]; then
+  exit
+fi
+
 CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 
@@ -16,18 +20,18 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the
   exit 1
 fi
 
-echo "before_script.sh: ccache stats (will be cleared)"
-ccache -s
-# Reset ccache stats for real results in before_cache.
-ccache --zero-stats
+# Show ccache stats so we can compare in before_cache
+ccache -s 2>/dev/null || true
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  # Adds user to a dummy group.
+  # That allows to test changing the group of the file by `os_fchown`.
+  sudo dscl . -create /Groups/chown_test
+  sudo dscl . -append /Groups/chown_test GroupMembership "${USER}"
+fi
 
 # Compile dependencies.
 build_deps
 
-# Install cluacov for Lua coverage.
-if [[ "$USE_LUACOV" == 1 ]]; then
-  "${DEPS_BUILD_DIR}/usr/bin/luarocks" install cluacov
-fi
-
 rm -rf "${LOG_DIR}"
 mkdir -p "${LOG_DIR}"

ci/build.ps1

@@ -1,45 +1,32 @@
-param([switch]$NoTests)
-Set-StrictMode -Version Latest
-$ErrorActionPreference = 'Stop'
-$ProgressPreference = 'SilentlyContinue'
+$ErrorActionPreference = 'stop'
+Set-PSDebug -Strict -Trace 1
 
 $env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$'
 $compiler = $Matches.compiler
-$compileOption = if ($Matches -contains 'option') {$Matches.option} else {''}
+$compileOption = $Matches.option
 $bits = $Matches.bits
-$cmakeBuildType = $(if ($env:CMAKE_BUILD_TYPE -ne $null) {$env:CMAKE_BUILD_TYPE} else {'RelWithDebInfo'});
-$buildDir = [System.IO.Path]::GetFullPath("$(pwd)")
+$cmakeBuildType = 'RelWithDebInfo'
 $depsCmakeVars = @{
   CMAKE_BUILD_TYPE = $cmakeBuildType;
 }
 $nvimCmakeVars = @{
   CMAKE_BUILD_TYPE = $cmakeBuildType;
   BUSTED_OUTPUT_TYPE = 'nvim';
-  DEPS_PREFIX=$(if ($env:DEPS_PREFIX -ne $null) {$env:DEPS_PREFIX} else {".deps/usr"});
-}
-if ($env:DEPS_BUILD_DIR -eq $null) {
-  $env:DEPS_BUILD_DIR = ".deps";
 }
 $uploadToCodeCov = $false
 
+# For pull requests, skip some build configurations to save time.
+if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32|MINGW_64-gcov)$') {
+  exit 0
+}
+
 function exitIfFailed() {
   if ($LastExitCode -ne 0) {
+    Set-PSDebug -Off
     exit $LastExitCode
   }
 }
 
-if (-not $NoTests) {
-  node --version
-  npm.cmd --version
-}
-
-if (-Not (Test-Path -PathType container $env:DEPS_BUILD_DIR)) {
-  write-host "cache dir not found: $($env:DEPS_BUILD_DIR)"
-  mkdir $env:DEPS_BUILD_DIR
-} else {
-  write-host "cache dir $($env:DEPS_BUILD_DIR) size: $(Get-ChildItem $env:DEPS_BUILD_DIR -recurse | Measure-Object -property length -sum | Select -expand sum)"
-}
-
 if ($compiler -eq 'MINGW') {
   if ($bits -eq 32) {
     $arch = 'i686'
@@ -50,18 +37,13 @@ if ($compiler -eq 'MINGW') {
   if ($compileOption -eq 'gcov') {
     $nvimCmakeVars['USE_GCOV'] = 'ON'
     $uploadToCodecov = $true
-    $env:GCOV = "C:\msys64\mingw$bits\bin\gcov"
-
-    # Setup/build Lua coverage.
-    $env:USE_LUACOV = 1
-    $env:BUSTED_ARGS = "--coverage"
   }
   # These are native MinGW builds, but they use the toolchain inside
   # MSYS2, this allows using all the dependencies and tools available
   # in MSYS2, but we cannot build inside the MSYS2 shell.
   $cmakeGenerator = 'Ninja'
   $cmakeGeneratorArgs = '-v'
-  $mingwPackages = @('ninja', 'cmake', 'diffutils').ForEach({
+  $mingwPackages = @('ninja', 'cmake', 'perl', 'diffutils', 'unibilium').ForEach({
     "mingw-w64-$arch-$_"
   })
 
@@ -72,117 +54,84 @@ if ($compiler -eq 'MINGW') {
   & C:\msys64\usr\bin\mkdir -p /var/cache/pacman/pkg
 
   # Build third-party dependencies
-  C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Syu" ; exitIfFailed
-  # Update again in case updating pacman changes pacman.conf
-  C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Syu" ; exitIfFailed
+  C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" ; exitIfFailed
   C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S $mingwPackages" ; exitIfFailed
 }
 elseif ($compiler -eq 'MSVC') {
   $cmakeGeneratorArgs = '/verbosity:normal'
-  $cmakeGenerator = 'Visual Studio 16 2019'
-}
-
-if ($compiler -eq 'MSVC') {
-  $installationPath = vswhere.exe -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
-  if ($installationPath -and (test-path "$installationPath\Common7\Tools\vsdevcmd.bat")) {
-    & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x${bits} -no_logo && set" | foreach-object {
-      $name, $value = $_ -split '=', 2
-      set-content env:\"$name" $value
-    }
+  if ($bits -eq 32) {
+    $cmakeGenerator = 'Visual Studio 15 2017'
+  }
+  elseif ($bits -eq 64) {
+    $cmakeGenerator = 'Visual Studio 15 2017 Win64'
   }
 }
 
-if (-not $NoTests) {
-  python -m ensurepip
-  python -m pip install pynvim ; exitIfFailed
-  # Sanity check
-  python  -c "import pynvim; print(str(pynvim))" ; exitIfFailed
+# Setup python (use AppVeyor system python)
+C:\Python27\python.exe -m pip install pynvim ; exitIfFailed
+C:\Python35\python.exe -m pip install pynvim ; exitIfFailed
+# Disambiguate python3
+move c:\Python35\python.exe c:\Python35\python3.exe
+$env:PATH = "C:\Python35;C:\Python27;$env:PATH"
+# Sanity check
+python  -c "import pynvim; print(str(pynvim))" ; exitIfFailed
+python3 -c "import pynvim; print(str(pynvim))" ; exitIfFailed
 
-  gem.cmd install --pre neovim
-  Get-Command -CommandType Application neovim-ruby-host.bat
+$env:PATH = "C:\Ruby24\bin;$env:PATH"
+gem.cmd install neovim
+Get-Command -CommandType Application neovim-ruby-host.bat
 
-  npm.cmd install -g neovim
-  Get-Command -CommandType Application neovim-node-host.cmd
-  npm.cmd link neovim
-}
+npm.cmd install -g neovim
+Get-Command -CommandType Application neovim-node-host.cmd
+npm.cmd link neovim
 
 function convertToCmakeArgs($vars) {
   return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
 }
 
-cd $env:DEPS_BUILD_DIR
-if ($compiler -eq 'MSVC') {
-  if ($bits -eq 32) {
-    cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
-  } else {
-    cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
-  }
-} else {
-  cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
+if (-Not (Test-Path -PathType container .deps)) {
+  mkdir .deps
 }
+cd .deps
+cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) ..\third-party\ ; exitIfFailed
 cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-cd $buildDir
+cd ..
 
 # Build Neovim
 mkdir build
 cd build
-if ($compiler -eq 'MSVC') {
-  if ($bits -eq 32) {
-    cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
-  } else {
-    cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
-  }
-} else {
-  cmake -G $cmakeGenerator $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
-}
+cmake -G $cmakeGenerator $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
 cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-.\bin\nvim --version ; exitIfFailed
+bin\nvim --version ; exitIfFailed
 
-# Ensure that the "win32" feature is set.
-.\bin\nvim -u NONE --headless -c 'exe !has(\"win32\").\"cq\"' ; exitIfFailed
+# Functional tests
+# The $LastExitCode from MSBuild can't be trusted
+$failed = $false
+# Temporarily turn off tracing to reduce log file output
+Set-PSDebug -Off
+cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
+  foreach { $failed = $failed -or
+    $_ -match 'functional tests failed with error'; $_ }
+if ($failed) {
+  exit $LastExitCode
+}
+Set-PSDebug -Strict -Trace 1
 
-if ($env:USE_LUACOV -eq 1) {
-  & $env:DEPS_PREFIX\luarocks\luarocks.bat install cluacov
+
+if ($uploadToCodecov) {
+  C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) -c -F functionaltest || echo 'codecov upload failed.'"
 }
 
-if (-not $NoTests) {
-  # Functional tests
-  # The $LastExitCode from MSBuild can't be trusted
-  $failed = $false
+# Old tests
+$env:PATH = "C:\msys64\usr\bin;$env:PATH"
+& "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1
 
-  # Run only this test file:
-  # $env:TEST_FILE = "test\functional\foo.lua"
-  cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGeneratorArgs 2>&1 |
-    foreach { $failed = $failed -or
-      $_ -match 'functional tests failed with error'; $_ }
-
-  if ($uploadToCodecov) {
-    if ($env:USE_LUACOV -eq 1) {
-      & $env:DEPS_PREFIX\bin\luacov.bat
-    }
-    bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
-  }
-  if ($failed) {
-    exit $LastExitCode
-  }
-
-  # Old tests
-  # Add MSYS to path, required for e.g. `find` used in test scripts.
-  # But would break functionaltests, where its `more` would be used then.
-  $OldPath = $env:PATH
-  $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-  & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 ; exitIfFailed
-  $env:PATH = $OldPath
-
-  if ($uploadToCodecov) {
-    bash -l /c/projects/neovim/ci/common/submit_coverage.sh oldtest
-  }
-}
-
-# Ensure choco's cpack is not in PATH otherwise, it conflicts with CMake's
-if (Test-Path -Path $env:ChocolateyInstall\bin\cpack.exe) {
-  Remove-Item -Path $env:ChocolateyInstall\bin\cpack.exe -Force
+if ($uploadToCodecov) {
+  C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) -c -F oldtest || echo 'codecov upload failed.'"
 }
 
 # Build artifacts
-cpack -C $cmakeBuildType
+cpack -G ZIP -C RelWithDebInfo
+if ($env:APPVEYOR_REPO_TAG_NAME -ne $null) {
+  cpack -G NSIS -C RelWithDebInfo
+}

ci/common/build.sh

@@ -1,5 +1,5 @@
 _stat() {
-  if test "${CI_OS_NAME}" = osx ; then
+  if test "${TRAVIS_OS_NAME}" = osx ; then
     stat -f %Sm "${@}"
   else
     stat -c %y "${@}"
@@ -8,6 +8,8 @@ _stat() {
 
 top_make() {
   printf '%78s\n' | tr ' ' '='
+  # Travis has 1.5 virtual cores according to:
+  # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM
   ninja "$@"
 }
 
@@ -16,47 +18,54 @@ build_make() {
 }
 
 build_deps() {
+  if test "${BUILD_32BIT}" = ON ; then
+    DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
+  fi
   if test "${FUNCTIONALTEST}" = "functionaltest-lua" \
      || test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
   fi
 
   mkdir -p "${DEPS_BUILD_DIR}"
+  mkdir -p "${DEPS_DOWNLOAD_DIR}"
 
   # Use cached dependencies if $CACHE_MARKER exists.
   if test "${CACHE_ENABLE}" = "false" ; then
     export CCACHE_RECACHE=1
   elif test -f "${CACHE_MARKER}" ; then
-    echo "Using third-party dependencies from cache (last update: $(_stat "${CACHE_MARKER}"))."
-    cp -a "${CACHE_NVIM_DEPS_DIR}"/. "${DEPS_BUILD_DIR}"
+    echo "Using third-party dependencies from Travis cache (last update: $(_stat "${CACHE_MARKER}"))."
+    cp -r "${HOME}/.cache/nvim-deps"/. "${DEPS_BUILD_DIR}"
+    cp -r "${HOME}/.cache/nvim-deps-downloads"/. "${DEPS_DOWNLOAD_DIR}"
   fi
 
   # Even if we're using cached dependencies, run CMake and make to
   # update CMake configuration and update to newer deps versions.
   cd "${DEPS_BUILD_DIR}"
   echo "Configuring with '${DEPS_CMAKE_FLAGS}'."
-  CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${CI_BUILD_DIR}/third-party/"
+  CC= cmake -G Ninja ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/"
 
   if ! top_make; then
     exit 1
   fi
 
-  cd "${CI_BUILD_DIR}"
+  cd "${TRAVIS_BUILD_DIR}"
 }
 
-build_nvim() {
-  check_core_dumps --delete quiet
-
+prepare_build() {
   if test -n "${CLANG_SANITIZER}" ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
   fi
+  if test "${BUILD_32BIT}" = ON ; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
+  fi
 
   mkdir -p "${BUILD_DIR}"
   cd "${BUILD_DIR}"
   echo "Configuring with '${CMAKE_FLAGS} $@'."
-  cmake -G Ninja ${CMAKE_FLAGS} "$@" "${CI_BUILD_DIR}"
-
+  cmake -G Ninja ${CMAKE_FLAGS} "$@" "${TRAVIS_BUILD_DIR}"
+}
 
+build_nvim() {
   echo "Building nvim."
   if ! top_make nvim ; then
     exit 1
@@ -77,11 +86,21 @@ build_nvim() {
   fi
 
   # Invoke nvim to trigger *San early.
-  if ! (bin/nvim --version && bin/nvim -u NONE -e -cq | cat -vet) ; then
-    check_sanitizer "${LOG_DIR}"
+  if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall') ; then
+    asan_check "${LOG_DIR}"
     exit 1
   fi
-  check_sanitizer "${LOG_DIR}"
+  asan_check "${LOG_DIR}"
 
-  cd "${CI_BUILD_DIR}"
+
+  cd "${TRAVIS_BUILD_DIR}"
+}
+
+macos_rvm_dance() {
+  # neovim-ruby gem requires a ruby newer than the macOS default.
+  source ~/.rvm/scripts/rvm
+  rvm get stable --auto-dotfiles
+  rvm reload
+  rvm use 2.2.5
+  rvm use
 }

ci/common/submit_coverage.sh

@@ -1,56 +0,0 @@
-#!/bin/sh
-# Collect and submit coverage reports.
-#
-# Args:
-# $1: Flag(s) for codecov, separated by comma.
-
-set -e
-
-# Change to grandparent dir (POSIXly).
-CDPATH='' cd -P -- "$(dirname -- "$0")/../.." || exit
-
-echo "=== running submit_coverage in $PWD: $* ==="
-"$GCOV" --version
-
-# Download/install codecov-bash and gcovr once.
-codecov_sh="${TEMP:-/tmp}/codecov.bash"
-if ! [ -f "$codecov_sh" ]; then
-  curl --retry 5 --silent --fail -o "$codecov_sh" https://codecov.io/bash
-  chmod +x "$codecov_sh"
-
-  python -m pip install --quiet --user gcovr
-fi
-
-(
-  cd build
-  python -m gcovr --branches --exclude-unreachable-branches --print-summary -j 2 --exclude '.*/auto/.*' --root .. --delete -o ../coverage.xml --xml
-)
-
-# Upload to codecov.
-# -X gcov: disable gcov, done manually above.
-# -X fix: disable fixing of reports (not necessary, rather slow)
-# -Z: exit non-zero on failure
-# -F: flag(s)
-# NOTE: ignoring flags for now, since this causes timeouts on codecov.io then,
-#       which they know about for about a year already...
-# Flags must match pattern ^[\w\,]+$ ("," as separator).
-codecov_flags="$(uname -s),${1}"
-codecov_flags=$(echo "$codecov_flags" | sed 's/[^,_a-zA-Z0-9]/_/g')
-if ! "$codecov_sh" -f coverage.xml -X gcov -X fix -Z -F "${codecov_flags}"; then
-  echo "codecov upload failed."
-fi
-
-# Cleanup always, especially collected data.
-find . \( -name '*.gcov' -o -name '*.gcda' \) -ls -delete | wc -l
-rm -f coverage.xml
-
-# Upload Lua coverage  (generated manually on AppVeyor/Windows).
-if [ "$USE_LUACOV" = 1 ] && [ "$1" != "oldtest" ]; then
-  if [ -x "${DEPS_BUILD_DIR}/usr/bin/luacov" ]; then
-    "${DEPS_BUILD_DIR}/usr/bin/luacov"
-  fi
-  if ! "$codecov_sh" -f luacov.report.out -X gcov -X fix -Z -F "lua,${codecov_flags}"; then
-    echo "codecov upload failed."
-  fi
-  rm luacov.stats.out
-fi

ci/common/suite.sh

@@ -1,3 +1,9 @@
+# HACK: get newline for use in strings given that "\n" and $'' do not work.
+NL="$(printf '\nE')"
+NL="${NL%E}"
+
+FAIL_SUMMARY=""
+
 # Test success marker. If END_MARKER file exists, we know that all tests 
 # finished. If FAIL_SUMMARY_FILE exists we know that some tests failed, this 
 # file will contain information about failed tests. Build is considered 
@@ -5,27 +11,172 @@
 END_MARKER="$BUILD_DIR/.tests_finished"
 FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors"
 
+ANSI_CLEAR="\033[0K"
+
+travis_fold() {
+  local action="$1"
+  local name="$2"
+  name="$(echo -n "$name" | tr '\n\0' '--' | sed 's/[^A-Za-z0-9]\{1,\}/-/g')"
+  name="$(echo -n "$name" | sed 's/-$//')"
+  echo -en "travis_fold:${action}:${name}\r${ANSI_CLEAR}"
+}
+
+if test "$TRAVIS" != "true" ; then
+  travis_fold() {
+    return 0
+  }
+fi
+
+enter_suite() {
+  set +x
+  FAILED=0
+  rm -f "${END_MARKER}"
+  local suite_name="$1"
+  export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE}/$suite_name"
+  travis_fold start "${NVIM_TEST_CURRENT_SUITE}"
+  set -x
+}
+
+exit_suite() {
+  set +x
+  travis_fold end "${NVIM_TEST_CURRENT_SUITE}"
+  if test $FAILED -ne 0 ; then
+    echo "Suite ${NVIM_TEST_CURRENT_SUITE} failed, summary:"
+    echo "${FAIL_SUMMARY}"
+  fi
+  export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE%/*}"
+  if test "$1" != "--continue" ; then
+    exit $FAILED
+  else
+    local saved_failed=$FAILED
+    FAILED=0
+    return $saved_failed
+  fi
+}
+
 fail() {
   local test_name="$1"
-  local message="$2"
+  local fail_char="$2"
+  local message="$3"
 
+  : ${fail_char:=F}
   : ${message:=Test $test_name failed}
 
-  local full_msg="$test_name :: $message"
+  local full_msg="$fail_char $NVIM_TEST_CURRENT_SUITE|$test_name :: $message"
+  FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
   echo "${full_msg}" >> "${FAIL_SUMMARY_FILE}"
   echo "Failed: $full_msg"
   FAILED=1
 }
 
+run_test() {
+  local cmd="$1"
+  test $# -gt 0 && shift
+  local test_name="$1"
+  : ${test_name:=$cmd}
+  test $# -gt 0 && shift
+  if ! eval "$cmd" ; then
+    fail "${test_name}" "$@"
+  fi
+}
+
+run_test_wd() {
+  local hang_ok=
+  if test "$1" = "--allow-hang" ; then
+    hang_ok=1
+    shift
+  fi
+
+  local timeout="$1"
+  test $# -gt 0 && shift
+
+  local cmd="$1"
+  test $# -gt 0 && shift
+
+  local restart_cmd="$1"
+  : ${restart_cmd:=true}
+  test $# -gt 0 && shift
+
+  local test_name="$1"
+  : ${test_name:=$cmd}
+  test $# -gt 0 && shift
+
+  local output_file="$(mktemp)"
+  local status_file="$(mktemp)"
+  local sid_file="$(mktemp)"
+
+  local restarts=5
+  local prev_tmpsize=-1
+  while test $restarts -gt 0 ; do
+    : > "$status_file"
+    : > "$sid_file"
+    setsid \
+      env \
+        output_file="$output_file" \
+        status_file="$status_file" \
+        sid_file="$sid_file" \
+        cmd="$cmd" \
+        CI_DIR="$CI_DIR" \
+        sh -c '
+          . "${CI_DIR}/common/test.sh"
+          ps -o sid= > "$sid_file"
+          (
+            ret=0
+            if ! eval "$cmd" 2>&1 ; then
+              ret=1
+            fi
+            echo "$ret" > "$status_file"
+          ) | tee -a "$output_file"
+        '
+    while test "$(stat -c "%s" "$status_file")" -eq 0 ; do
+      prev_tmpsize=$tmpsize
+      sleep $timeout
+      tmpsize="$(stat -c "%s" "$output_file")"
+      if test $tempsize -eq $prev_temsize ; then
+        # no output, assuming either hang or exit
+        break
+      fi
+    done
+    restarts=$(( restarts - 1 ))
+    if test "$(stat -c "%s" "$status_file")" -eq 0 ; then
+      # Status file not updated, assuming hang
+
+      # SID not known, this should not ever happen
+      if test "$(stat -c "%s" "$sid_file")" -eq 0 ; then
+        fail "$test_name" E "Shell did not run"
+        break
+      fi
+
+      # Kill all processes which belong to one session: should get rid of test
+      # processes as well as sh itself.
+      pkill -KILL -s$(cat "$sid_file")
+
+      if test $restarts -eq 0 ; then
+        if test -z "$hang_ok" ; then
+          fail "$test_name" E "Test hang up"
+        fi
+      else
+        echo "Test ${test_name} hang up, restarting"
+        eval "$restart_cmd"
+      fi
+    else
+      local new_failed="$(cat "$status_file")"
+      if test "$new_failed" != "0" ; then
+        fail "$test_name" F "Test failed in run_test_wd"
+      fi
+      break
+    fi
+  done
+
+  rm -f "$output_file"
+  rm -f "$status_file"
+  rm -f "$sid_file"
+}
+
 ended_successfully() {
   if test -f "${FAIL_SUMMARY_FILE}" ; then
     echo 'Test failed, complete summary:'
     cat "${FAIL_SUMMARY_FILE}"
-
-    if [[ "$GITHUB_ACTIONS" == "true" ]]; then
-        rm -f "$FAIL_SUMMARY_FILE"
-    fi
-
     return 1
   fi
   if ! test -f "${END_MARKER}" ; then

ci/common/test.sh

@@ -3,7 +3,10 @@
 
 submit_coverage() {
   if [ -n "${GCOV}" ]; then
-    "${CI_DIR}/common/submit_coverage.sh" "$@" || echo 'codecov upload failed.'
+    if curl --fail --output codecov.bash --silent https://codecov.io/bash; then
+      bash codecov.bash -c -F "$1" || echo "codecov upload failed."
+      rm -f codecov.bash
+    fi
   fi
 }
 
@@ -15,7 +18,7 @@ print_core() {
     return 0
   fi
   echo "======= Core file $core ======="
-  if test "${CI_OS_NAME}" = osx ; then
+  if test "${TRAVIS_OS_NAME}" = osx ; then
     lldb -Q -o "bt all" -f "${app}" -c "${core}"
   else
     gdb -n -batch -ex 'thread apply all bt full' "${app}" -c "${core}"
@@ -29,12 +32,11 @@ check_core_dumps() {
     shift
   fi
   local app="${1:-${BUILD_DIR}/bin/nvim}"
-  local cores
-  if test "${CI_OS_NAME}" = osx ; then
-    cores="$(find /cores/ -type f -print)"
+  if test "${TRAVIS_OS_NAME}" = osx ; then
+    local cores="$(find /cores/ -type f -print)"
     local _sudo='sudo'
   else
-    cores="$(find ./ -type f \( -name 'core.*' -o -name core -o -name nvim.core \) -print)"
+    local cores="$(find ./ -type f -name 'core.*' -print)"
     local _sudo=
   fi
 
@@ -51,7 +53,7 @@ check_core_dumps() {
     fi
   done
   if test "$app" != quiet ; then
-    fail 'cores' 'Core dumps found'
+    fail 'cores' E 'Core dumps found'
   fi
 }
 
@@ -69,10 +71,9 @@ check_logs() {
   for log in $(find "${1}" -type f -name "${2}" -size +0); do
     cat "${log}"
     err=1
-    rm "${log}"
   done
   if test -n "${err}" ; then
-    fail 'logs' 'Runtime errors detected.'
+    fail 'logs' E 'Runtime errors detected.'
   fi
 }
 
@@ -80,45 +81,52 @@ valgrind_check() {
   check_logs "${1}" "valgrind-*"
 }
 
-check_sanitizer() {
-  if test -n "${CLANG_SANITIZER}"; then
-    check_logs "${1}" "*san.*" | ${SYMBOLIZER:-cat}
+asan_check() {
+  if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then
+    check_logs "${1}" "*san.*" | $ASAN_SYMBOLIZE
   fi
 }
 
-unittests() {(
+run_unittests() {(
+  enter_suite unittests
   ulimit -c unlimited || true
   if ! build_make unittest ; then
-    fail 'unittests' 'Unit tests failed'
+    fail 'unittests' F 'Unit tests failed'
   fi
   submit_coverage unittest
-  check_core_dumps "$(command -v luajit)"
+  check_core_dumps "$(which luajit)"
+  exit_suite
 )}
 
-functionaltests() {(
+run_functionaltests() {(
+  enter_suite functionaltests
   ulimit -c unlimited || true
   if ! build_make ${FUNCTIONALTEST}; then
-    fail 'functionaltests' 'Functional tests failed'
+    fail 'functionaltests' F 'Functional tests failed'
   fi
   submit_coverage functionaltest
-  check_sanitizer "${LOG_DIR}"
+  asan_check "${LOG_DIR}"
   valgrind_check "${LOG_DIR}"
   check_core_dumps
+  exit_suite
 )}
 
-oldtests() {(
+run_oldtests() {(
+  enter_suite oldtests
   ulimit -c unlimited || true
-  if ! make oldtest; then
+  if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then
     reset
-    fail 'oldtests' 'Legacy tests failed'
+    fail 'oldtests' F 'Legacy tests failed'
   fi
   submit_coverage oldtest
-  check_sanitizer "${LOG_DIR}"
+  asan_check "${LOG_DIR}"
   valgrind_check "${LOG_DIR}"
   check_core_dumps
+  exit_suite
 )}
 
 check_runtime_files() {(
+  set +x
   local test_name="$1" ; shift
   local message="$1" ; shift
   local tst="$1" ; shift
@@ -129,25 +137,27 @@ check_runtime_files() {(
     # Prefer failing the build over using more robust construct because files
     # with IFS are not welcome.
     if ! test -e "$file" ; then
-      fail "$test_name" "It appears that $file is only a part of the file name"
+      fail "$test_name" E \
+        "It appears that $file is only a part of the file name"
     fi
     if ! test "$tst" "$INSTALL_PREFIX/share/nvim/runtime/$file" ; then
-      fail "$test_name" "$(printf "$message" "$file")"
+      fail "$test_name" F "$(printf "$message" "$file")"
     fi
   done
 )}
 
 install_nvim() {(
+  enter_suite 'install_nvim'
   if ! build_make install ; then
-    fail 'install' 'make install failed'
-    exit 1
+    fail 'install' E 'make install failed'
+    exit_suite
   fi
 
   "${INSTALL_PREFIX}/bin/nvim" --version
   if ! "${INSTALL_PREFIX}/bin/nvim" -u NONE -e -c ':help' -c ':qall' ; then
     echo "Running ':help' in the installed nvim failed."
     echo "Maybe the helptags have not been generated properly."
-    fail 'help' 'Failed running :help'
+    fail 'help' F 'Failed running :help'
   fi
 
   # Check that all runtime files were installed
@@ -168,6 +178,13 @@ install_nvim() {(
   local genvimsynf=syntax/vim/generated.vim
   local gpat='syn keyword vimFuncName .*eval'
   if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf" ; then
-    fail 'funcnames' "It appears that $genvimsynf does not contain $gpat."
+    fail 'funcnames' F "It appears that $genvimsynf does not contain $gpat."
   fi
+
+  exit_suite
 )}
+
+csi_clean() {
+  find "${BUILD_DIR}/bin" -name 'test-includes-*' -delete
+  find "${BUILD_DIR}" -name '*test-include*.o' -delete
+}

ci/install.sh

@@ -3,18 +3,30 @@
 set -e
 set -o pipefail
 
-# Use default CC to avoid compilation problems when installing Python modules.
-echo "Install neovim module for Python."
-CC=cc python -m pip -q install --user --upgrade pynvim
+if [[ "${CI_TARGET}" == lint ]]; then
+  exit
+fi
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  export PATH="/usr/local/opt/ccache/libexec:$PATH"
+fi
+
+echo "Install neovim module for Python 3."
+# Allow failure. pyenv pip3 on travis is broken:
+# https://github.com/travis-ci/travis-ci/issues/8363
+CC=cc python3 -m pip -q install --user --upgrade neovim || true
+
+if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then
+  # Update PATH for pip.
+  export PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH"
+  # Use default CC to avoid compilation problems when installing Python modules.
+  echo "Install neovim module for Python 2."
+  CC=cc python2.7 -m pip -q install --user --upgrade neovim
+fi
 
 echo "Install neovim RubyGem."
-gem install --no-document --bindir "$HOME/.local/bin" --user-install --pre neovim
+gem install --no-document --version ">= 0.8.0" neovim
 
 echo "Install neovim npm package"
 npm install -g neovim
 npm link neovim
-
-if [[ $CI_OS_NAME != osx ]]; then
-  sudo cpanm -n Neovim::Ext || cat "$HOME/.cpanm/build.log"
-  perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION'
-fi

ci/run_lint.sh

@@ -8,17 +8,33 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/suite.sh"
 
-rm -f "$END_MARKER"
+enter_suite 'clint'
 
-# Run all tests if no input argument is given
-if (($# == 0)); then
-  tests=('clint-full' 'lualint' 'pylint' 'shlint' 'check-single-includes')
-else
-  tests=("$@")
-fi
+run_test 'make clint-full' clint
 
-for i in "${tests[@]}"; do
-  make "$i" || fail "$i"
-done
+exit_suite --continue
+
+enter_suite 'testlint'
+
+run_test 'make testlint' testlint
+
+exit_suite --continue
+
+enter_suite 'lualint'
+
+run_test 'make lualint' lualint
+
+exit_suite --continue
+
+enter_suite single-includes
+
+CLICOLOR_FORCE=1 run_test_wd \
+  --allow-hang \
+  10s \
+  'make check-single-includes' \
+  'csi_clean' \
+  single-includes
+
+exit_suite --continue
 
 end_tests

ci/run_tests.sh

@@ -8,28 +8,29 @@ source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
 source "${CI_DIR}/common/suite.sh"
 
-rm -f "$END_MARKER"
+enter_suite build
 
-# Run all tests (with some caveats) if no input argument is given
-if (($# == 0)); then
-  tests=('build_nvim')
+check_core_dumps --delete quiet
 
-  if test "$CLANG_SANITIZER" != "TSAN"; then
-    # Additional threads are only created when the builtin UI starts, which
-    # doesn't happen in the unit/functional tests
-    if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
-      tests+=('unittests')
-    fi
-    tests+=('functionaltests')
+prepare_build
+build_nvim
+
+exit_suite --continue
+
+enter_suite tests
+
+if test "$CLANG_SANITIZER" != "TSAN" ; then
+  # Additional threads are only created when the builtin UI starts, which
+  # doesn't happen in the unit/functional tests
+  if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
+    run_test run_unittests
   fi
-
-  tests+=('oldtests' 'install_nvim')
-else
-  tests=("$@")
+  run_test run_functionaltests
 fi
+run_test run_oldtests
 
-for i in "${tests[@]}"; do
-  eval "$i" || fail "$i"
-done
+run_test install_nvim
+
+exit_suite --continue
 
 end_tests

ci/script.sh

@@ -3,10 +3,11 @@
 set -e
 set -o pipefail
 
-ci/run_${CI_TARGET}.sh
-
-if [[ -s "${GCOV_ERROR_FILE}" ]]; then
-  echo '=== Unexpected gcov errors: ==='
-  cat "${GCOV_ERROR_FILE}"
-  exit 1
+# This will pass the environment variables down to a bash process which runs
+# as $USER, while retaining the environment variables defined and belonging
+# to secondary groups given above in usermod.
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  sudo -E su "${USER}" -c "ci/run_${CI_TARGET}.sh"
+else
+  ci/run_${CI_TARGET}.sh
 fi

ci/snap/.snapcraft_payload

@@ -1,194 +0,0 @@
-{
-  "ref": "refs/heads/master",
-  "before": "66b136c43c12df3dcf8f19ff48f206ad2e4f43fc",
-  "after": "1bf69c32217cc455603ce8aa2b5415d9717f0fa2",
-  "repository": {
-    "id": 292861950,
-    "node_id": "MDEwOlJlcG9zaXRvcnkyOTI4NjE5NTA=",
-    "name": "neovim-snap",
-    "full_name": "hurricanehrndz/neovim-snap",
-    "private": false,
-    "owner": {
-      "name": "hurricanehrndz",
-      "email": "hurricanehrndz@users.noreply.github.com",
-      "login": "hurricanehrndz",
-      "id": 5804237,
-      "node_id": "MDQ6VXNlcjU4MDQyMzc=",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/5804237?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/hurricanehrndz",
-      "html_url": "https://github.com/hurricanehrndz",
-      "followers_url": "https://api.github.com/users/hurricanehrndz/followers",
-      "following_url": "https://api.github.com/users/hurricanehrndz/following{/other_user}",
-      "gists_url": "https://api.github.com/users/hurricanehrndz/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/hurricanehrndz/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/hurricanehrndz/subscriptions",
-      "organizations_url": "https://api.github.com/users/hurricanehrndz/orgs",
-      "repos_url": "https://api.github.com/users/hurricanehrndz/repos",
-      "events_url": "https://api.github.com/users/hurricanehrndz/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/hurricanehrndz/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "html_url": "https://github.com/hurricanehrndz/neovim-snap",
-    "description": "snap build for neovim",
-    "fork": false,
-    "url": "https://github.com/hurricanehrndz/neovim-snap",
-    "forks_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/forks",
-    "keys_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/keys{/key_id}",
-    "collaborators_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/collaborators{/collaborator}",
-    "teams_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/teams",
-    "hooks_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/hooks",
-    "issue_events_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/issues/events{/number}",
-    "events_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/events",
-    "assignees_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/assignees{/user}",
-    "branches_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/branches{/branch}",
-    "tags_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/tags",
-    "blobs_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/blobs{/sha}",
-    "git_tags_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/tags{/sha}",
-    "git_refs_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/refs{/sha}",
-    "trees_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/trees{/sha}",
-    "statuses_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/statuses/{sha}",
-    "languages_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/languages",
-    "stargazers_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/stargazers",
-    "contributors_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/contributors",
-    "subscribers_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/subscribers",
-    "subscription_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/subscription",
-    "commits_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/commits{/sha}",
-    "git_commits_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/git/commits{/sha}",
-    "comments_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/comments{/number}",
-    "issue_comment_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/issues/comments{/number}",
-    "contents_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/contents/{+path}",
-    "compare_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/compare/{base}...{head}",
-    "merges_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/merges",
-    "archive_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/{archive_format}{/ref}",
-    "downloads_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/downloads",
-    "issues_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/issues{/number}",
-    "pulls_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/pulls{/number}",
-    "milestones_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/milestones{/number}",
-    "notifications_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/notifications{?since,all,participating}",
-    "labels_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/labels{/name}",
-    "releases_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/releases{/id}",
-    "deployments_url": "https://api.github.com/repos/hurricanehrndz/neovim-snap/deployments",
-    "created_at": 1599227980,
-    "updated_at": "2020-09-04T14:02:38Z",
-    "pushed_at": 1599228352,
-    "git_url": "git://github.com/hurricanehrndz/neovim-snap.git",
-    "ssh_url": "git@github.com:hurricanehrndz/neovim-snap.git",
-    "clone_url": "https://github.com/hurricanehrndz/neovim-snap.git",
-    "svn_url": "https://github.com/hurricanehrndz/neovim-snap",
-    "homepage": null,
-    "size": 0,
-    "stargazers_count": 0,
-    "watchers_count": 0,
-    "language": null,
-    "has_issues": true,
-    "has_projects": true,
-    "has_downloads": true,
-    "has_wiki": true,
-    "has_pages": false,
-    "forks_count": 0,
-    "mirror_url": null,
-    "archived": false,
-    "disabled": false,
-    "open_issues_count": 0,
-    "license": {
-      "key": "mit",
-      "name": "MIT License",
-      "spdx_id": "MIT",
-      "url": "https://api.github.com/licenses/mit",
-      "node_id": "MDc6TGljZW5zZTEz"
-    },
-    "forks": 0,
-    "open_issues": 0,
-    "watchers": 0,
-    "default_branch": "master",
-    "stargazers": 0,
-    "master_branch": "master"
-  },
-  "pusher": {
-    "name": "hurricanehrndz",
-    "email": "hurricanehrndz@users.noreply.github.com"
-  },
-  "sender": {
-    "login": "hurricanehrndz",
-    "id": 5804237,
-    "node_id": "MDQ6VXNlcjU4MDQyMzc=",
-    "avatar_url": "https://avatars0.githubusercontent.com/u/5804237?v=4",
-    "gravatar_id": "",
-    "url": "https://api.github.com/users/hurricanehrndz",
-    "html_url": "https://github.com/hurricanehrndz",
-    "followers_url": "https://api.github.com/users/hurricanehrndz/followers",
-    "following_url": "https://api.github.com/users/hurricanehrndz/following{/other_user}",
-    "gists_url": "https://api.github.com/users/hurricanehrndz/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/hurricanehrndz/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/hurricanehrndz/subscriptions",
-    "organizations_url": "https://api.github.com/users/hurricanehrndz/orgs",
-    "repos_url": "https://api.github.com/users/hurricanehrndz/repos",
-    "events_url": "https://api.github.com/users/hurricanehrndz/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/hurricanehrndz/received_events",
-    "type": "User",
-    "site_admin": false
-  },
-  "created": false,
-  "deleted": false,
-  "forced": false,
-  "base_ref": null,
-  "compare": "https://github.com/hurricanehrndz/neovim-snap/compare/66b136c43c12...1bf69c32217c",
-  "commits": [
-    {
-      "id": "1bf69c32217cc455603ce8aa2b5415d9717f0fa2",
-      "tree_id": "62ea83a2349be8c930c45fdc199f71b08bf5927e",
-      "distinct": true,
-      "message": "Build of latest tag",
-      "timestamp": "2020-09-04T14:05:40Z",
-      "url": "https://github.com/hurricanehrndz/neovim-snap/commit/1bf69c32217cc455603ce8aa2b5415d9717f0fa2",
-      "author": {
-        "name": "Carlos Hernandez",
-        "email": "carlos@techbyte.ca",
-        "username": "hurricanehrndz"
-      },
-      "committer": {
-        "name": "Carlos Hernandez",
-        "email": "carlos@techbyte.ca",
-        "username": "hurricanehrndz"
-      },
-      "added": [
-
-      ],
-      "removed": [
-
-      ],
-      "modified": [
-        "snap/snapcraft.yaml"
-      ]
-    }
-  ],
-  "head_commit": {
-    "id": "1bf69c32217cc455603ce8aa2b5415d9717f0fa2",
-    "tree_id": "62ea83a2349be8c930c45fdc199f71b08bf5927e",
-    "distinct": true,
-    "message": "Build of latest tag",
-    "timestamp": "2020-09-04T14:05:40Z",
-    "url": "https://github.com/hurricanehrndz/neovim-snap/commit/1bf69c32217cc455603ce8aa2b5415d9717f0fa2",
-    "author": {
-      "name": "Carlos Hernandez",
-      "email": "carlos@techbyte.ca",
-      "username": "hurricanehrndz"
-    },
-    "committer": {
-      "name": "Carlos Hernandez",
-      "email": "carlos@techbyte.ca",
-      "username": "hurricanehrndz"
-    },
-    "added": [
-
-    ],
-    "removed": [
-
-    ],
-    "modified": [
-      "snap/snapcraft.yaml"
-    ]
-  }
-}

ci/snap/after_success.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-
-RESULT_SNAP=$(find ./ -name "*.snap")
-
-sudo snap install "$RESULT_SNAP" --dangerous --classic
-
-/snap/bin/nvim --version
-
-SHA256=$(sha256sum "$RESULT_SNAP")
-echo "SHA256: ${SHA256} ."

ci/snap/deploy.sh

@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-SNAP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-WEBHOOK_PAYLOAD="$(cat "${SNAP_DIR}/.snapcraft_payload")"
-PAYLOAD_SIG="${SECRET_SNAP_SIG}"
-
-
-snap_release_needed() {
-  last_committed_tag="$(git tag -l --sort=refname|head -1)"
-  last_snap_release="$(snap info nvim | awk '$1 == "latest/edge:" { print $2 }' | perl -lpe 's/v\d.\d.\d-//g')"
-  git fetch -f --tags
-  git checkout "${last_committed_tag}" 2> /dev/null
-  last_git_release="$(git describe --first-parent 2> /dev/null | perl -lpe 's/v\d.\d.\d-//g')"
-
-  if [[ -z "$(echo $last_snap_release | perl -ne "print if /${last_git_release}.*/")" ]]; then
-    return 0
-  fi
-  return 1
-}
-
-
-trigger_snapcraft_webhook() {
-  [[ -n "${PAYLOAD_SIG}" ]] || exit
-  echo "Triggering new snap release via webhook..."
-  curl -X POST \
-    -H "Content-Type: application/json" \
-    -H "X-Hub-Signature: sha1=${PAYLOAD_SIG}" \
-    --data "${WEBHOOK_PAYLOAD}" \
-    https://snapcraft.io/nvim/webhook/notify
-}
-
-
-if $(snap_release_needed); then
-  echo "New snap release required"
-  trigger_snapcraft_webhook
-fi

ci/snap/install.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-sudo apt update
-sudo usermod -aG lxd $USER
-sudo /snap/bin/lxd.migrate -yes
-sudo /snap/bin/lxd waitready
-sudo /snap/bin/lxd init --auto
-

ci/snap/script.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-mkdir -p "$CI_BUILD_DIR/snaps-cache"
-sg lxd -c snapcraft
-

cmake/FindJeMalloc.cmake

@@ -0,0 +1,50 @@
+# - Try to find jemalloc
+# Once done this will define
+#  JEMALLOC_FOUND - System has jemalloc
+#  JEMALLOC_INCLUDE_DIRS - The jemalloc include directories
+#  JEMALLOC_LIBRARIES - The libraries needed to use jemalloc
+
+if(NOT USE_BUNDLED_JEMALLOC)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
+  endif()
+else()
+  set(PC_JEMALLOC_INCLUDEDIR)
+  set(PC_JEMALLOC_INCLUDE_DIRS)
+  set(PC_JEMALLOC_LIBDIR)
+  set(PC_JEMALLOC_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+endif()
+
+set(JEMALLOC_DEFINITIONS ${PC_JEMALLOC_CFLAGS_OTHER})
+
+find_path(JEMALLOC_INCLUDE_DIR jemalloc/jemalloc.h
+          PATHS ${PC_JEMALLOC_INCLUDEDIR} ${PC_JEMALLOC_INCLUDE_DIRS}
+          ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libjemalloc.a as a preferred library name.
+if(JEMALLOC_USE_STATIC)
+  list(APPEND JEMALLOC_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}jemalloc${CMAKE_STATIC_LIBRARY_SUFFIX}")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  list(INSERT JEMALLOC_NAMES 0
+    "${CMAKE_STATIC_LIBRARY_PREFIX}jemalloc${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
+list(APPEND JEMALLOC_NAMES jemalloc)
+
+find_library(JEMALLOC_LIBRARY NAMES ${JEMALLOC_NAMES}
+  HINTS ${PC_JEMALLOC_LIBDIR} ${PC_JEMALLOC_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
+
+set(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY})
+set(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(JeMalloc DEFAULT_MSG
+  JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR)
+
+mark_as_advanced(JEMALLOC_INCLUDE_DIR JEMALLOC_LIBRARY)

cmake/FindLIBVTERM.cmake

@@ -1,10 +0,0 @@
-# - Try to find libvterm
-# Once done this will define
-#  LIBVTERM_FOUND - System has libvterm
-#  LIBVTERM_INCLUDE_DIRS - The libvterm include directories
-#  LIBVTERM_LIBRARIES - The libraries needed to use libvterm
-
-include(LibFindMacros)
-
-libfind_pkg_detect(LIBVTERM vterm FIND_PATH vterm.h FIND_LIBRARY vterm)
-libfind_process(LIBVTERM REQUIRED)

cmake/FindLibIntl.cmake

@@ -31,16 +31,15 @@ find_library(LibIntl_LIBRARY
 )
 
 if (LibIntl_INCLUDE_DIR)
-  list(APPEND CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
+  set(CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
 endif()
+
 # On some systems (linux+glibc) libintl is passively available.
 # So only specify the library if one was found.
 if (LibIntl_LIBRARY)
-  list(APPEND CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
-endif()
-if (MSVC)
-  list(APPEND CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
+  set(CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
 endif()
+
 check_c_source_compiles("
 #include <libintl.h>
 
@@ -51,15 +50,6 @@ int main(int argc, char** argv) {
   bind_textdomain_codeset(\"foo\", \"bar\");
   textdomain(\"foo\");
 }" HAVE_WORKING_LIBINTL)
-if (MSVC)
-  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
-endif()
-if (LibIntl_INCLUDE_DIR)
-  list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
-endif()
-if (LibIntl_LIBRARY)
-  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
-endif()
 
 if (HAVE_WORKING_LIBINTL)
   # On some systems (linux+glibc) libintl is passively available.
@@ -68,7 +58,6 @@ if (HAVE_WORKING_LIBINTL)
   if(LibIntl_FIND_REQUIRED)
     unset(LibIntl_FIND_REQUIRED)
   endif()
-  set(LibIntl_FIND_QUIETLY ON)
 
   check_variable_exists(_nl_msg_cat_cntr HAVE_NL_MSG_CAT_CNTR)
 endif()

cmake/FindLibLUV.cmake

@@ -1,32 +0,0 @@
-# - Try to find luv
-# Once done this will define
-#  LIBLUV_FOUND - System has libluv
-#  LIBLUV_INCLUDE_DIRS - The libluv include directories
-#  LIBLUV_LIBRARIES - The libraries needed to use libluv
-
-find_package(PkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_LIBLUV QUIET luv)
-endif()
-
-set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER})
-
-find_path(LIBLUV_INCLUDE_DIR luv/luv.h
-          PATHS ${PC_LIBLUV_INCLUDEDIR} ${PC_LIBLUV_INCLUDE_DIRS})
-
-# Explicitly look for luv.so. #10407
-list(APPEND LIBLUV_NAMES luv_a luv libluv_a luv${CMAKE_SHARED_LIBRARY_SUFFIX})
-
-find_library(LIBLUV_LIBRARY NAMES ${LIBLUV_NAMES}
-  HINTS ${PC_LIBLUV_LIBDIR} ${PC_LIBLUV_LIBRARY_DIRS})
-
-set(LIBLUV_LIBRARIES ${LIBLUV_LIBRARY})
-set(LIBLUV_INCLUDE_DIRS ${LIBLUV_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBLUV_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibLUV DEFAULT_MSG
-  LIBLUV_LIBRARY LIBLUV_INCLUDE_DIR)
-
-mark_as_advanced(LIBLUV_INCLUDE_DIR LIBLUV_LIBRARY)

cmake/FindLibTermkey.cmake

@@ -4,20 +4,36 @@
 #  LIBTERMKEY_INCLUDE_DIRS - The libtermkey include directories
 #  LIBTERMKEY_LIBRARIES - The libraries needed to use libtermkey
 
-find_package(PkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_LIBTERMKEY QUIET termkey)
+if(NOT USE_BUNDLED_LIBTERMKEY)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LIBTERMKEY QUIET termkey)
+  endif()
+else()
+  set(PC_LIBTERMKEY_INCLUDEDIR)
+  set(PC_LIBTERMKEY_INCLUDE_DIRS)
+  set(PC_LIBTERMKEY_LIBDIR)
+  set(PC_LIBTERMKEY_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
 endif()
 
 set(LIBTERMKEY_DEFINITIONS ${PC_LIBTERMKEY_CFLAGS_OTHER})
 
 find_path(LIBTERMKEY_INCLUDE_DIR termkey.h
-          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS})
+          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS}
+          ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libuv.a as a preferred library name.
+if(LIBTERMKEY_USE_STATIC)
+  list(APPEND LIBTERMKEY_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}termkey${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
 
 list(APPEND LIBTERMKEY_NAMES termkey)
 
 find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES}
-  HINTS ${PC_LIBTERMKEY_LIBDIR} ${PC_LIBTERMKEY_LIBRARY_DIRS})
+  HINTS ${PC_LIBTERMKEY_LIBDIR} ${PC_LIBTERMKEY_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
 
 set(LIBTERMKEY_LIBRARIES ${LIBTERMKEY_LIBRARY})
 set(LIBTERMKEY_INCLUDE_DIRS ${LIBTERMKEY_INCLUDE_DIR})

cmake/FindLibUV.cmake

@@ -4,19 +4,38 @@
 #  LIBUV_FOUND - system has libuv
 #  LIBUV_INCLUDE_DIRS - the libuv include directories
 #  LIBUV_LIBRARIES - link these to use libuv
+#
+# Set the LIBUV_USE_STATIC variable to specify if static libraries should
+# be preferred to shared ones.
 
-find_package(PkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_LIBUV QUIET libuv)
+if(NOT USE_BUNDLED_LIBUV)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LIBUV QUIET libuv)
+  endif()
+else()
+  set(PC_LIBUV_INCLUDEDIR)
+  set(PC_LIBUV_INCLUDE_DIRS)
+  set(PC_LIBUV_LIBDIR)
+  set(PC_LIBUV_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
 endif()
 
 find_path(LIBUV_INCLUDE_DIR uv.h
-  HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS})
+  HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS}
+  ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libuv.a as a preferred library name.
+if(LIBUV_USE_STATIC)
+  list(APPEND LIBUV_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}uv${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif(LIBUV_USE_STATIC)
 
 list(APPEND LIBUV_NAMES uv)
 
 find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES}
-  HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS})
+  HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
 
 mark_as_advanced(LIBUV_INCLUDE_DIR LIBUV_LIBRARY)
 
@@ -75,14 +94,6 @@ if(WIN32)
   list(APPEND LIBUV_LIBRARIES ws2_32)
 endif()
 
-find_package(Threads)
-if(Threads_FOUND)
-  # TODO: Fix the cmake file to properly handle static deps for bundled builds.
-  # Meanwhile just include the threads library if CMake tells us there's one to
-  # use.
-  list(APPEND LIBUV_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
 include(FindPackageHandleStandardArgs)
 
 # handle the QUIETLY and REQUIRED arguments and set LIBUV_FOUND to TRUE

cmake/FindLibVterm.cmake

@@ -0,0 +1,47 @@
+# - Try to find libvterm
+# Once done this will define
+#  LIBVTERM_FOUND - System has libvterm
+#  LIBVTERM_INCLUDE_DIRS - The libvterm include directories
+#  LIBVTERM_LIBRARIES - The libraries needed to use libvterm
+
+if(NOT USE_BUNDLED_LIBVTERM)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LIBVTERM QUIET vterm)
+  endif()
+else()
+  set(PC_LIBVTERM_INCLUDEDIR)
+  set(PC_LIBVTERM_INCLUDE_DIRS)
+  set(PC_LIBVTERM_LIBDIR)
+  set(PC_LIBVTERM_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+endif()
+
+set(LIBVTERM_DEFINITIONS ${PC_LIBVTERM_CFLAGS_OTHER})
+
+find_path(LIBVTERM_INCLUDE_DIR vterm.h
+          PATHS ${PC_LIBVTERM_INCLUDEDIR} ${PC_LIBVTERM_INCLUDE_DIRS}
+          ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libuv.a as a preferred library name.
+if(LIBVTERM_USE_STATIC)
+  list(APPEND LIBVTERM_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}vterm${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
+list(APPEND LIBVTERM_NAMES vterm)
+
+find_library(LIBVTERM_LIBRARY NAMES ${LIBVTERM_NAMES}
+  HINTS ${PC_LIBVTERM_LIBDIR} ${PC_LIBVTERM_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
+
+set(LIBVTERM_LIBRARIES ${LIBVTERM_LIBRARY})
+set(LIBVTERM_INCLUDE_DIRS ${LIBVTERM_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LIBVTERM_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(LibVterm DEFAULT_MSG
+  LIBVTERM_LIBRARY LIBVTERM_INCLUDE_DIR)
+
+mark_as_advanced(LIBVTERM_INCLUDE_DIR LIBVTERM_LIBRARY)

cmake/FindLua.cmake

@@ -42,7 +42,7 @@ unset(_lua_append_versions)
 
 # this is a function only to have all the variables inside go away automatically
 function(_lua_set_version_vars)
-    set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0)
+    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
 
     if (Lua_FIND_VERSION_EXACT)
         if (Lua_FIND_VERSION_COUNT GREATER 1)

cmake/FindLuaJit.cmake

@@ -4,16 +4,32 @@
 #  LUAJIT_INCLUDE_DIRS - The luajit include directories
 #  LUAJIT_LIBRARIES - The libraries needed to use luajit
 
-find_package(PkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_LUAJIT QUIET luajit)
+if(NOT USE_BUNDLED_LUAJIT)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_LUAJIT QUIET luajit)
+  endif()
+else()
+  set(PC_LUAJIT_INCLUDEDIR)
+  set(PC_LUAJIT_INCLUDE_DIRS)
+  set(PC_LUAJIT_LIBDIR)
+  set(PC_LUAJIT_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
 endif()
 
 set(LUAJIT_DEFINITIONS ${PC_LUAJIT_CFLAGS_OTHER})
 
 find_path(LUAJIT_INCLUDE_DIR luajit.h
           PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}
-          PATH_SUFFIXES luajit-2.0 luajit-2.1)
+          PATH_SUFFIXES luajit-2.0
+          ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libluajit-5.1.a as a preferred
+# library name.
+if(LUAJIT_USE_STATIC)
+  list(APPEND LUAJIT_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}luajit-5.1${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
 
 if(MSVC)
   list(APPEND LUAJIT_NAMES lua51)
@@ -24,7 +40,8 @@ else()
 endif()
 
 find_library(LUAJIT_LIBRARY NAMES ${LUAJIT_NAMES}
-             PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS})
+             PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS}
+             ${LIMIT_SEARCH})
 
 set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
 set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})

cmake/FindMsgpack.cmake

@@ -4,17 +4,26 @@
 #  MSGPACK_INCLUDE_DIRS - The msgpack include directories
 #  MSGPACK_LIBRARIES - The libraries needed to use msgpack
 
-find_package(PkgConfig)
-if (PKG_CONFIG_FOUND)
-  pkg_search_module(PC_MSGPACK QUIET
-    msgpackc>=${Msgpack_FIND_VERSION}
-    msgpack>=${Msgpack_FIND_VERSION})
+if(NOT USE_BUNDLED_MSGPACK)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_search_module(PC_MSGPACK QUIET
+      msgpackc>=${Msgpack_FIND_VERSION}
+      msgpack>=${Msgpack_FIND_VERSION})
+  endif()
+else()
+  set(PC_MSGPACK_INCLUDEDIR)
+  set(PC_MSGPACK_INCLUDE_DIRS)
+  set(PC_MSGPACK_LIBDIR)
+  set(PC_MSGPACK_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
 endif()
 
 set(MSGPACK_DEFINITIONS ${PC_MSGPACK_CFLAGS_OTHER})
 
 find_path(MSGPACK_INCLUDE_DIR msgpack/version_master.h
-  HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS})
+  HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS}
+  ${LIMIT_SEARCH})
 
 if(MSGPACK_INCLUDE_DIR)
   file(READ ${MSGPACK_INCLUDE_DIR}/msgpack/version_master.h msgpack_version_h)
@@ -26,6 +35,13 @@ else()
   set(MSGPACK_VERSION_STRING)
 endif()
 
+# If we're asked to use static linkage, add libmsgpack{,c}.a as a preferred library name.
+if(MSGPACK_USE_STATIC)
+  list(APPEND MSGPACK_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpackc${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
 if(MSVC)
   # The import library for the msgpack DLL has a different name
   list(APPEND MSGPACK_NAMES msgpackc_import)
@@ -37,7 +53,8 @@ find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
   # Check each directory for all names to avoid using headers/libraries from
   # different places.
   NAMES_PER_DIR
-  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS})
+  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
 
 mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)
 

cmake/FindTreeSitter.cmake

@@ -1,11 +0,0 @@
-# - Try to find tree-sitter
-# Once done, this will define
-#
-#  TreeSitter_FOUND        - system has tree-sitter
-#  TreeSitter_INCLUDE_DIRS - the tree-sitter include directories
-#  TreeSitter_LIBRARIES    - link these to use tree-sitter
-
-include(LibFindMacros)
-
-libfind_pkg_detect(TreeSitter tree-sitter FIND_PATH tree_sitter/api.h FIND_LIBRARY tree-sitter)
-libfind_process(TreeSitter)

cmake/FindUNIBILIUM.cmake

@@ -1,12 +0,0 @@
-# - Try to find unibilium
-# Once done this will define
-#  UNIBILIUM_FOUND - System has unibilium
-#  UNIBILIUM_INCLUDE_DIRS - The unibilium include directories
-#  UNIBILIUM_LIBRARIES - The libraries needed to use unibilium
-
-include(LibFindMacros)
-
-libfind_pkg_detect(UNIBILIUM unibilium
-  FIND_PATH unibilium.h
-  FIND_LIBRARY unibilium)
-libfind_process(UNIBILIUM)

cmake/FindUnibilium.cmake

@@ -0,0 +1,47 @@
+# - Try to find unibilium
+# Once done this will define
+#  UNIBILIUM_FOUND - System has unibilium
+#  UNIBILIUM_INCLUDE_DIRS - The unibilium include directories
+#  UNIBILIUM_LIBRARIES - The libraries needed to use unibilium
+
+if(NOT USE_BUNDLED_UNIBILIUM)
+  find_package(PkgConfig)
+  if (PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_UNIBILIUM QUIET unibilium)
+  endif()
+else()
+  set(PC_UNIBILIUM_INCLUDEDIR)
+  set(PC_UNIBILIUM_INCLUDE_DIRS)
+  set(PC_UNIBILIUM_LIBDIR)
+  set(PC_UNIBILIUM_LIBRARY_DIRS)
+  set(LIMIT_SEARCH NO_DEFAULT_PATH)
+endif()
+
+set(UNIBILIUM_DEFINITIONS ${PC_UNIBILIUM_CFLAGS_OTHER})
+
+find_path(UNIBILIUM_INCLUDE_DIR unibilium.h
+          PATHS ${PC_UNIBILIUM_INCLUDEDIR} ${PC_UNIBILIUM_INCLUDE_DIRS}
+          ${LIMIT_SEARCH})
+
+# If we're asked to use static linkage, add libunibilium.a as a preferred library name.
+if(UNIBILIUM_USE_STATIC)
+  list(APPEND UNIBILIUM_NAMES
+    "${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+
+list(APPEND UNIBILIUM_NAMES unibilium)
+
+find_library(UNIBILIUM_LIBRARY NAMES ${UNIBILIUM_NAMES}
+  HINTS ${PC_UNIBILIUM_LIBDIR} ${PC_UNIBILIUM_LIBRARY_DIRS}
+  ${LIMIT_SEARCH})
+
+set(UNIBILIUM_LIBRARIES ${UNIBILIUM_LIBRARY})
+set(UNIBILIUM_INCLUDE_DIRS ${UNIBILIUM_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set UNIBILIUM_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(unibilium DEFAULT_MSG
+  UNIBILIUM_LIBRARY UNIBILIUM_INCLUDE_DIR)
+
+mark_as_advanced(UNIBILIUM_INCLUDE_DIR UNIBILIUM_LIBRARY)

cmake/GenerateHelptags.cmake.in

@@ -0,0 +1,39 @@
+if(DEFINED ENV{DESTDIR})
+  file(TO_CMAKE_PATH
+    $ENV{DESTDIR}/@CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc
+    HELPTAGS_WORKING_DIRECTORY)
+else()
+  file(TO_CMAKE_PATH
+    @CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc
+    HELPTAGS_WORKING_DIRECTORY)
+endif()
+
+message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}")
+if(EXISTS ${HELPTAGS_WORKING_DIRECTORY}/)
+  message(STATUS "${HELPTAGS_WORKING_DIRECTORY} already exists")
+  # If the doc directory already exists, helptags could fail due to duplicate
+  # tags. Tell the user to remove the directory and try again.
+  set(TROUBLESHOOTING "\nRemove \"${HELPTAGS_WORKING_DIRECTORY}\" and try again.")
+endif()
+
+# Workaround for hanging "yes | nvim -c 'helptags ++t .'"
+# and therefore hanging "yes | make install":
+# Set INPUT_FILE to an empty file, causing execute_process
+# to disregard other standard input (such as "yes |").
+set(EMPTY_FILE ${CMAKE_CURRENT_BINARY_DIR}/.GenerateHelptags)
+file(WRITE ${EMPTY_FILE} "")
+execute_process(
+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/nvim
+    -u NONE
+    -es
+    -c "helptags ++t ."
+    -c quit
+  WORKING_DIRECTORY ${HELPTAGS_WORKING_DIRECTORY}
+  INPUT_FILE ${EMPTY_FILE}
+  OUTPUT_VARIABLE err
+  ERROR_VARIABLE err
+  RESULT_VARIABLE res)
+
+if(NOT res EQUAL 0)
+  message(FATAL_ERROR "Generating helptags failed: ${err} - ${res}${TROUBLESHOOTING}")
+endif()

cmake/GetCompileFlags.cmake

@@ -1,51 +1,21 @@
 function(get_compile_flags _compile_flags)
   # Create template akin to CMAKE_C_COMPILE_OBJECT.
-  set(compile_flags "<CMAKE_C_COMPILER> <CFLAGS> <BUILD_TYPE_CFLAGS> <COMPILE_OPTIONS><COMPILE_DEFINITIONS> <INCLUDES>")
+  set(compile_flags "<CMAKE_C_COMPILER> <CFLAGS> <BUILD_TYPE_CFLAGS> <DEFINITIONS> <INCLUDES>")
 
   # Get C compiler.
-  if(CMAKE_C_COMPILER_ARG1)
-    string(REPLACE
-      "<CMAKE_C_COMPILER>"
-      "<CMAKE_C_COMPILER> ${CMAKE_C_COMPILER_ARG1}"
-      compile_flags
-      "${compile_flags}")
-  endif()
   string(REPLACE
     "<CMAKE_C_COMPILER>"
     "${CMAKE_C_COMPILER}"
     compile_flags
     "${compile_flags}")
 
-  # Get flags set by add_definitions().
-  get_property(compile_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
-  get_target_property(compile_definitions_target nvim COMPILE_DEFINITIONS)
-  if(compile_definitions_target)
-    list(APPEND compile_definitions ${compile_definitions_target})
-    list(REMOVE_DUPLICATES compile_definitions)
-  endif()
-  # NOTE: list(JOIN) requires CMake 3.12, string(CONCAT) requires CMake 3.
-  string(REPLACE ";" " -D" compile_definitions "${compile_definitions}")
-  if(compile_definitions)
-    set(compile_definitions " -D${compile_definitions}")
-  endif()
+  # Get flags set by add_definition().
+  get_directory_property(definitions
+    DIRECTORY "src/nvim"
+    DEFINITIONS)
   string(REPLACE
-    "<COMPILE_DEFINITIONS>"
-    "${compile_definitions}"
-    compile_flags
-    "${compile_flags}")
-
-  # Get flags set by add_compile_options().
-  get_property(compile_options DIRECTORY PROPERTY COMPILE_OPTIONS)
-  get_target_property(compile_options_target nvim COMPILE_OPTIONS)
-  if(compile_options_target)
-    list(APPEND compile_options ${compile_options_target})
-    list(REMOVE_DUPLICATES compile_options)
-  endif()
-  # NOTE: list(JOIN) requires CMake 3.12.
-  string(REPLACE ";" " " compile_options "${compile_options}")
-  string(REPLACE
-    "<COMPILE_OPTIONS>"
-    "${compile_options}"
+    "<DEFINITIONS>"
+    "${definitions}"
     compile_flags
     "${compile_flags}")
 
@@ -65,7 +35,9 @@ function(get_compile_flags _compile_flags)
     "${compile_flags}")
 
   # Get include directories.
-  get_property(include_directories_list DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
+  get_directory_property(include_directories_list
+    DIRECTORY "src/nvim"
+    INCLUDE_DIRECTORIES)
   list(REMOVE_DUPLICATES include_directories_list)
   foreach(include_directory ${include_directories_list})
     set(include_directories "${include_directories} -I${include_directory}")

cmake/GetGitRevisionDescription.cmake

@@ -0,0 +1,180 @@
+# https://github.com/rpavlik/cmake-modules
+#
+# - Returns a version string from Git
+#
+# These functions force a re-configure on each git commit so that you can
+# trust the values of the variables in your build system.
+#
+#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
+#
+# Returns the refspec and sha hash of the current head revision
+#
+#  git_describe(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the source tree, and adjusting
+# the output so that it tests false if an error occurs.
+#
+#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe --exact-match on the source tree,
+# and adjusting the output so that it tests false if there was no exact
+# matching tag.
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__get_git_revision_description)
+  return()
+endif()
+set(__get_git_revision_description YES)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(get_git_dir _gitdir)
+  # check FORCED_GIT_DIR first
+  if(FORCED_GIT_DIR)
+    set(${_gitdir} ${FORCED_GIT_DIR} PARENT_SCOPE)
+    return()
+  endif()
+
+  # check GIT_DIR in environment
+  set(GIT_DIR $ENV{GIT_DIR})
+  if(NOT GIT_DIR)
+    set(GIT_PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+    set(GIT_DIR ${GIT_PARENT_DIR}/.git)
+  endif()
+  # .git dir not found, search parent directories
+  while(NOT EXISTS ${GIT_DIR})
+    set(GIT_PREVIOUS_PARENT ${GIT_PARENT_DIR})
+    get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+    if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+      return()
+    endif()
+    set(GIT_DIR ${GIT_PARENT_DIR}/.git)
+  endwhile()
+  # check if this is a submodule
+  if(NOT IS_DIRECTORY ${GIT_DIR})
+    file(READ ${GIT_DIR} submodule)
+    string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
+    get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+    get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
+  endif()
+  set(${_gitdir} ${GIT_DIR} PARENT_SCOPE)
+endfunction()
+
+function(get_git_head_revision _refspecvar _hashvar)
+  get_git_dir(GIT_DIR)
+  if(NOT GIT_DIR)
+    return()
+  endif()
+
+  set(GIT_DATA ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data)
+  if(NOT EXISTS ${GIT_DATA})
+    file(MAKE_DIRECTORY ${GIT_DATA})
+  endif()
+
+  if(NOT EXISTS ${GIT_DIR}/HEAD)
+    return()
+  endif()
+  set(HEAD_FILE ${GIT_DATA}/HEAD)
+  configure_file(${GIT_DIR}/HEAD ${HEAD_FILE} COPYONLY)
+
+  configure_file(${_gitdescmoddir}/GetGitRevisionDescription.cmake.in
+    ${GIT_DATA}/grabRef.cmake
+    @ONLY)
+  include(${GIT_DATA}/grabRef.cmake)
+
+  set(${_refspecvar} ${HEAD_REF} PARENT_SCOPE)
+  set(${_hashvar} ${HEAD_HASH} PARENT_SCOPE)
+endfunction()
+
+function(git_describe _var)
+  get_git_dir(GIT_DIR)
+  if(NOT GIT_DIR)
+    return()
+  endif()
+
+  if(NOT GIT_FOUND)
+    find_package(Git QUIET)
+  endif()
+  if(NOT GIT_FOUND)
+    set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+    return()
+  endif()
+
+  get_git_head_revision(refspec hash)
+  if(NOT hash)
+    set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+    return()
+  endif()
+
+  execute_process(COMMAND
+    ${GIT_EXECUTABLE}
+    describe
+    ${hash}
+    ${ARGN}
+    WORKING_DIRECTORY
+    ${GIT_DIR}
+    RESULT_VARIABLE
+    res
+    OUTPUT_VARIABLE
+    out
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(NOT res EQUAL 0)
+    set(out "${out}-${res}-NOTFOUND")
+  endif()
+
+  set(${_var} ${out} PARENT_SCOPE)
+endfunction()
+
+function(git_timestamp _var)
+  get_git_dir(GIT_DIR)
+  if(NOT GIT_DIR)
+    return()
+  endif()
+
+  if(NOT GIT_FOUND)
+    find_package(Git QUIET)
+  endif()
+  if(NOT GIT_FOUND)
+    return()
+  endif()
+
+  get_git_head_revision(refspec hash)
+  if(NOT hash)
+    set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+    return()
+  endif()
+
+  execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format="%ci" ${hash} ${ARGN}
+    WORKING_DIRECTORY ${GIT_DIR}
+    RESULT_VARIABLE res
+    OUTPUT_VARIABLE out
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if(res EQUAL 0)
+    string(REGEX REPLACE "[-\" :]" "" out ${out})
+    string(SUBSTRING ${out} 0 12 out)
+  else()
+    set(out "${out}-${res}-NOTFOUND")
+  endif()
+
+  set(${_var} ${out} PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+  git_describe(out --exact-match ${ARGN})
+  set(${_var} ${out} PARENT_SCOPE)
+endfunction()

cmake/GetGitRevisionDescription.cmake.in

@@ -0,0 +1,38 @@
+# 
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+  # named branch
+  string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+  if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+    configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+  elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
+    configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+    set(HEAD_HASH "${HEAD_REF}")
+  endif()
+else()
+  # detached HEAD
+  configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+  file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+  string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()

cmake/InstallHelpers.cmake

@@ -154,25 +154,3 @@ function(install_helper)
       ${RENAME})
   endif()
 endfunction()
-
-# Without CONFIGURE_DEPENDS globbing reuses cached file tree on rebuild.
-# For example it will ignore new files.
-# CONFIGURE_DEPENDS was introduced in 3.12
-
-function(glob_wrapper outvar)
-  if(${CMAKE_VERSION} VERSION_LESS 3.12)
-    file(GLOB ${outvar} ${ARGN})
-  else()
-    file(GLOB ${outvar} CONFIGURE_DEPENDS ${ARGN})
-  endif()
-  set(${outvar} ${${outvar}} PARENT_SCOPE)
-endfunction()
-
-function(globrecurse_wrapper outvar root)
-  if(${CMAKE_VERSION} VERSION_LESS 3.12)
-    file(GLOB_RECURSE ${outvar} RELATIVE ${root} ${ARGN})
-  else()
-    file(GLOB_RECURSE ${outvar} CONFIGURE_DEPENDS RELATIVE ${root} ${ARGN})
-  endif()
-  set(${outvar} ${${outvar}} PARENT_SCOPE)
-endfunction()

cmake/LibFindMacros.cmake

@@ -1,101 +1,46 @@
-# Version 2.2
-# Public Domain, originally written by Lasse Kärkkäinen <tronic>
-# Maintained at https://github.com/Tronic/cmake-modules
-# Please send your improvements as pull requests on Github.
+# Version 1.0 (2013-04-12)
+# Public Domain, originally written by Lasse Kärkkäinen <tronic@zi.fi>
+# Published at http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
 
-# Find another package and make it a dependency of the current package.
-# This also automatically forwards the "REQUIRED" argument.
-# Usage: libfind_package(<prefix> <another package> [extra args to find_package])
-macro (libfind_package PREFIX PKG)
-  set(${PREFIX}_args ${PKG} ${ARGN})
+# If you improve the script, please modify the forementioned wiki page because
+# I no longer maintain my scripts (hosted as static files at zi.fi). Feel free
+# to remove this entire header if you use real version control instead.
+
+# Changelog:
+# 2013-04-12  Added version number (1.0) and this header, no other changes
+# 2009-10-08  Originally published
+
+
+# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
+# used for the current package. For this to work, the first parameter must be the
+# prefix of the current package, then the prefix of the new package etc, which are
+# passed to find_package.
+macro (libfind_package PREFIX)
+  set (LIBFIND_PACKAGE_ARGS ${ARGN})
+  if (${PREFIX}_FIND_QUIETLY)
+    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
+  endif (${PREFIX}_FIND_QUIETLY)
   if (${PREFIX}_FIND_REQUIRED)
-    set(${PREFIX}_args ${${PREFIX}_args} REQUIRED)
-  endif()
-  find_package(${${PREFIX}_args})
-  set(${PREFIX}_DEPENDENCIES ${${PREFIX}_DEPENDENCIES};${PKG})
-  unset(${PREFIX}_args)
-endmacro()
+    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
+  endif (${PREFIX}_FIND_REQUIRED)
+  find_package(${LIBFIND_PACKAGE_ARGS})
+endmacro (libfind_package)
 
-# A simple wrapper to make pkg-config searches a bit easier.
-# Works the same as CMake's internal pkg_check_modules but is always quiet.
-macro (libfind_pkg_check_modules)
-  find_package(PkgConfig QUIET)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(${ARGN} QUIET)
-  endif()
-endmacro()
-
-# Avoid useless copy&pasta by doing what most simple libraries do anyway:
-# pkg-config, find headers, find library.
-# Usage: libfind_pkg_detect(<prefix> <pkg-config args> FIND_PATH <name> [other args] FIND_LIBRARY <name> [other args])
-# E.g. libfind_pkg_detect(SDL2 sdl2 FIND_PATH SDL.h PATH_SUFFIXES SDL2 FIND_LIBRARY SDL2)
-function (libfind_pkg_detect PREFIX)
-  # Parse arguments
-  set(argname pkgargs)
-  foreach (i ${ARGN})
-    if ("${i}" STREQUAL "FIND_PATH")
-      set(argname pathargs)
-    elseif ("${i}" STREQUAL "FIND_LIBRARY")
-      set(argname libraryargs)
-    else()
-      set(${argname} ${${argname}} ${i})
-    endif()
-  endforeach()
-  if (NOT pkgargs)
-    message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.")
-  endif()
-  # Find library
-  libfind_pkg_check_modules(${PREFIX}_PKGCONF ${pkgargs})
-  if (pathargs)
-    find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS})
-  endif()
-  if (libraryargs)
-    find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
-  endif()
-  # Read pkg-config version
-  if (${PREFIX}_PKGCONF_VERSION)
-    set(${PREFIX}_VERSION ${${PREFIX}_PKGCONF_VERSION} PARENT_SCOPE)
-  endif()
-endfunction()
-
-# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
-# Usage: libfind_version_header(Foobar foobar/version.h FOOBAR_VERSION_STR)
-# Fourth argument "QUIET" may be used for silently testing different define names.
-# This function does nothing if the version variable is already defined.
-function (libfind_version_header PREFIX VERSION_H DEFINE_NAME)
-  # Skip processing if we already have a version or if the include dir was not found
-  if (${PREFIX}_VERSION OR NOT ${PREFIX}_INCLUDE_DIR)
-    return()
-  endif()
-  set(quiet ${${PREFIX}_FIND_QUIETLY})
-  # Process optional arguments
-  foreach(arg ${ARGN})
-    if (arg STREQUAL "QUIET")
-      set(quiet TRUE)
-    else()
-      message(AUTHOR_WARNING "Unknown argument ${arg} to libfind_version_header ignored.")
-    endif()
-  endforeach()
-  # Read the header and parse for version number
-  set(filename "${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
-  if (NOT EXISTS ${filename})
-    if (NOT quiet)
-      message(AUTHOR_WARNING "Unable to find ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
-    endif()
-    return()
-  endif()
-  file(READ "${filename}" header)
-  string(REGEX REPLACE ".*#[ \t]*define[ \t]*${DEFINE_NAME}[ \t]*\"([^\n]*)\".*" "\\1" match "${header}")
-  # No regex match?
-  if (match STREQUAL header)
-    if (NOT quiet)
-      message(AUTHOR_WARNING "Unable to find \#define ${DEFINE_NAME} \"<version>\" from ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
-    endif()
-    return()
-  endif()
-  # Export the version string
-  set(${PREFIX}_VERSION "${match}" PARENT_SCOPE)
-endfunction()
+# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
+# where they added pkg_check_modules. Consequently I need to support both in my scripts
+# to avoid those deprecated warnings. Here's a helper that does just that.
+# Works identically to pkg_check_modules, except that no checks are needed prior to use.
+macro (libfind_pkg_check_modules PREFIX PKGNAME)
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(${PREFIX} ${PKGNAME})
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+endmacro (libfind_pkg_check_modules)
 
 # Do the final processing once the paths have been detected.
 # If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
@@ -103,167 +48,65 @@ endfunction()
 # Ditto for ${PREFIX}_PROCESS_LIBS and library files.
 # Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
 # Also handles errors in case library detection was required, etc.
-function (libfind_process PREFIX)
-  # Skip processing if already processed during this configuration run
-  if (${PREFIX}_FOUND)
-    return()
-  endif()
+macro (libfind_process PREFIX)
+  # Skip processing if already processed during this run
+  if (NOT ${PREFIX}_FOUND)
+    # Start with the assumption that the library was found
+    set (${PREFIX}_FOUND TRUE)
 
-  set(found TRUE)  # Start with the assumption that the package was found
+    # Process all includes and set _FOUND to false if any are missing
+    foreach (i ${${PREFIX}_PROCESS_INCLUDES})
+      if (${i})
+        set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
+        mark_as_advanced(${i})
+      else (${i})
+        set (${PREFIX}_FOUND FALSE)
+      endif (${i})
+    endforeach (i)
 
-  # Did we find any files? Did we miss includes? These are for formatting better error messages.
-  set(some_files FALSE)
-  set(missing_headers FALSE)
+    # Process all libraries and set _FOUND to false if any are missing
+    foreach (i ${${PREFIX}_PROCESS_LIBS})
+      if (${i})
+        set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
+        mark_as_advanced(${i})
+      else (${i})
+        set (${PREFIX}_FOUND FALSE)
+      endif (${i})
+    endforeach (i)
 
-  # Shorthands for some variables that we need often
-  set(quiet ${${PREFIX}_FIND_QUIETLY})
-  set(required ${${PREFIX}_FIND_REQUIRED})
-  set(exactver ${${PREFIX}_FIND_VERSION_EXACT})
-  set(findver "${${PREFIX}_FIND_VERSION}")
-  set(version "${${PREFIX}_VERSION}")
+    # Print message and/or exit on fatal error
+    if (${PREFIX}_FOUND)
+      if (NOT ${PREFIX}_FIND_QUIETLY)
+        message (STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
+      endif (NOT ${PREFIX}_FIND_QUIETLY)
+    else (${PREFIX}_FOUND)
+      if (${PREFIX}_FIND_REQUIRED)
+        foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
+          message("${i}=${${i}}")
+        endforeach (i)
+        message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
+      endif (${PREFIX}_FIND_REQUIRED)
+    endif (${PREFIX}_FOUND)
+  endif (NOT ${PREFIX}_FOUND)
+endmacro (libfind_process)
 
-  # Lists of config option names (all, includes, libs)
-  unset(configopts)
-  set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
-  set(libraryopts ${${PREFIX}_PROCESS_LIBS})
+macro(libfind_library PREFIX basename)
+  set(TMP "")
+  if(MSVC80)
+    set(TMP -vc80)
+  endif(MSVC80)
+  if(MSVC90)
+    set(TMP -vc90)
+  endif(MSVC90)
+  set(${PREFIX}_LIBNAMES ${basename}${TMP})
+  if(${ARGC} GREATER 2)
+    set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
+    string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
+    set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
+  endif(${ARGC} GREATER 2)
+  find_library(${PREFIX}_LIBRARY
+    NAMES ${${PREFIX}_LIBNAMES}
+    PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
+  )
+endmacro(libfind_library)
 
-  # Process deps to add to
-  foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
-    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
-      # The package seems to export option lists that we can use, woohoo!
-      list(APPEND includeopts ${${i}_INCLUDE_OPTS})
-      list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
-    else()
-      # If plural forms don't exist or they equal singular forms
-      if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
-          (${i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
-        # Singular forms can be used
-        if (DEFINED ${i}_INCLUDE_DIR)
-          list(APPEND includeopts ${i}_INCLUDE_DIR)
-        endif()
-        if (DEFINED ${i}_LIBRARY)
-          list(APPEND libraryopts ${i}_LIBRARY)
-        endif()
-      else()
-        # Oh no, we don't know the option names
-        message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
-      endif()
-    endif()
-  endforeach()
-
-  if (includeopts)
-    list(REMOVE_DUPLICATES includeopts)
-  endif()
-
-  if (libraryopts)
-    list(REMOVE_DUPLICATES libraryopts)
-  endif()
-
-  string(REGEX REPLACE ".*[ ;]([^ ;]*(_INCLUDE_DIRS|_LIBRARIES))" "\\1" tmp "${includeopts} ${libraryopts}")
-  if (NOT tmp STREQUAL "${includeopts} ${libraryopts}")
-    message(AUTHOR_WARNING "Plural form ${tmp} found in config options of ${PREFIX}. This works as before but is now deprecated. Please only use singular forms INCLUDE_DIR and LIBRARY, and update your find scripts for LibFindMacros > 2.0 automatic dependency system (most often you can simply remove the PROCESS variables entirely).")
-  endif()
-
-  # Include/library names separated by spaces (notice: not CMake lists)
-  unset(includes)
-  unset(libs)
-
-  # Process all includes and set found false if any are missing
-  foreach (i ${includeopts})
-    list(APPEND configopts ${i})
-    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
-      list(APPEND includes "${${i}}")
-    else()
-      set(found FALSE)
-      set(missing_headers TRUE)
-    endif()
-  endforeach()
-
-  # Process all libraries and set found false if any are missing
-  foreach (i ${libraryopts})
-    list(APPEND configopts ${i})
-    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
-      list(APPEND libs "${${i}}")
-    else()
-      set (found FALSE)
-    endif()
-  endforeach()
-
-  # Version checks
-  if (found AND findver)
-    if (NOT version)
-      message(WARNING "The find module for ${PREFIX} does not provide version information, so we'll just assume that it is OK. Please fix the module or remove package version requirements to get rid of this warning.")
-    elseif (version VERSION_LESS findver OR (exactver AND NOT version VERSION_EQUAL findver))
-      set(found FALSE)
-      set(version_unsuitable TRUE)
-    endif()
-  endif()
-
-  # If all-OK, hide all config options, export variables, print status and exit
-  if (found)
-    foreach (i ${configopts})
-      mark_as_advanced(${i})
-    endforeach()
-    if (NOT quiet)
-      message(STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
-      if (LIBFIND_DEBUG)
-        message(STATUS "  ${PREFIX}_DEPENDENCIES=${${PREFIX}_DEPENDENCIES}")
-        message(STATUS "  ${PREFIX}_INCLUDE_OPTS=${includeopts}")
-        message(STATUS "  ${PREFIX}_INCLUDE_DIRS=${includes}")
-        message(STATUS "  ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
-        message(STATUS "  ${PREFIX}_LIBRARIES=${libs}")
-      endif()
-    endif()
-    set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
-    set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
-    set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
-    set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
-    set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
-    return()
-  endif()
-
-  # Format messages for debug info and the type of error
-  set(vars "Relevant CMake configuration variables:\n")
-  foreach (i ${configopts})
-    mark_as_advanced(CLEAR ${i})
-    set(val ${${i}})
-    if ("${val}" STREQUAL "${i}-NOTFOUND")
-      set (val "<not found>")
-    elseif (val AND NOT EXISTS ${val})
-      set (val "${val}  (does not exist)")
-    else()
-      set(some_files TRUE)
-    endif()
-    set(vars "${vars}  ${i}=${val}\n")
-  endforeach()
-  set(vars "${vars}You may use CMake GUI, cmake -D or ccmake to modify the values. Delete CMakeCache.txt to discard all values and force full re-detection if necessary.\n")
-  if (version_unsuitable)
-    set(msg "${PREFIX} ${${PREFIX}_VERSION} was found but")
-    if (exactver)
-      set(msg "${msg} only version ${findver} is acceptable.")
-    else()
-      set(msg "${msg} version ${findver} is the minimum requirement.")
-    endif()
-  else()
-    if (missing_headers)
-      set(msg "We could not find development headers for ${PREFIX}. Do you have the necessary dev package installed?")
-    elseif (some_files)
-      set(msg "We only found some files of ${PREFIX}, not all of them. Perhaps your installation is incomplete or maybe we just didn't look in the right place?")
-      if(findver)
-        set(msg "${msg} This could also be caused by incompatible version (if it helps, at least ${PREFIX} ${findver} should work).")
-      endif()
-    else()
-      set(msg "We were unable to find package ${PREFIX}.")
-    endif()
-  endif()
-
-  # Fatal error out if REQUIRED
-  if (required)
-    set(msg "REQUIRED PACKAGE NOT FOUND\n${msg} This package is REQUIRED and you need to install it or adjust CMake configuration in order to continue building ${CMAKE_PROJECT_NAME}.")
-    message(FATAL_ERROR "${msg}\n${vars}")
-  endif()
-  # Otherwise just print a nasty warning
-  if (NOT quiet)
-    message(WARNING "WARNING: MISSING PACKAGE\n${msg} This package is NOT REQUIRED and you may ignore this warning but by doing so you may miss some functionality of ${CMAKE_PROJECT_NAME}. \n${vars}")
-  endif()
-endfunction()

cmake/RunLuacheck.cmake

@@ -0,0 +1,22 @@
+set(LUACHECK_ARGS -q "${LUAFILES_DIR}")
+if(DEFINED IGNORE_PATTERN)
+  list(APPEND LUACHECK_ARGS --exclude-files "${LUAFILES_DIR}/${IGNORE_PATTERN}")
+endif()
+if(DEFINED CHECK_PATTERN)
+  list(APPEND LUACHECK_ARGS --include-files "${LUAFILES_DIR}/${CHECK_PATTERN}")
+endif()
+if(DEFINED READ_GLOBALS)
+  list(APPEND LUACHECK_ARGS --read-globals "${READ_GLOBALS}")
+endif()
+
+execute_process(
+  COMMAND "${LUACHECK_PRG}" ${LUACHECK_ARGS}
+  WORKING_DIRECTORY "${LUAFILES_DIR}"
+  ERROR_VARIABLE err
+  RESULT_VARIABLE res
+)
+
+if(NOT res EQUAL 0)
+  message(STATUS "Output to stderr:\n${err}")
+  message(FATAL_ERROR "Linting tests failed with error: ${res}")
+endif()

cmake/RunTests.cmake

@@ -1,19 +1,13 @@
 # Set LC_ALL to meet expectations of some locale-sensitive tests.
 set(ENV{LC_ALL} "en_US.UTF-8")
 
-if(POLICY CMP0012)
-  # Handle CI=true, without dev warnings.
-  cmake_policy(SET CMP0012 NEW)
-endif()
-
 set(ENV{VIMRUNTIME} ${WORKING_DIR}/runtime)
-set(ENV{NVIM_RPLUGIN_MANIFEST} ${BUILD_DIR}/Xtest_rplugin_manifest)
-set(ENV{XDG_CONFIG_HOME} ${BUILD_DIR}/Xtest_xdg/config)
-set(ENV{XDG_DATA_HOME} ${BUILD_DIR}/Xtest_xdg/share)
-unset(ENV{XDG_DATA_DIRS})
+set(ENV{NVIM_RPLUGIN_MANIFEST} ${WORKING_DIR}/Xtest_rplugin_manifest)
+set(ENV{XDG_CONFIG_HOME} ${WORKING_DIR}/Xtest_xdg/config)
+set(ENV{XDG_DATA_HOME} ${WORKING_DIR}/Xtest_xdg/share)
 
 if(NOT DEFINED ENV{NVIM_LOG_FILE})
-  set(ENV{NVIM_LOG_FILE} ${BUILD_DIR}/.nvimlog)
+  set(ENV{NVIM_LOG_FILE} ${WORKING_DIR}/.nvimlog)
 endif()
 
 if(NVIM_PRG)
@@ -26,74 +20,38 @@ else()
   set(TEST_PATH "${TEST_DIR}/${TEST_TYPE}")
 endif()
 
-# Force $TEST_PATH to workdir-relative path ("test/…").
-if(IS_ABSOLUTE ${TEST_PATH})
-  file(RELATIVE_PATH TEST_PATH "${WORKING_DIR}" "${TEST_PATH}")
-endif()
-
 if(BUSTED_OUTPUT_TYPE STREQUAL junit)
   set(EXTRA_ARGS OUTPUT_FILE ${BUILD_DIR}/${TEST_TYPE}test-junit.xml)
 endif()
 
-set(BUSTED_ARGS $ENV{BUSTED_ARGS})
-separate_arguments(BUSTED_ARGS)
-
 if(DEFINED ENV{TEST_TAG} AND NOT "$ENV{TEST_TAG}" STREQUAL "")
-  list(APPEND BUSTED_ARGS --tags $ENV{TEST_TAG})
+  set(TEST_TAG "--tags=$ENV{TEST_TAG}")
 endif()
 
 if(DEFINED ENV{TEST_FILTER} AND NOT "$ENV{TEST_FILTER}" STREQUAL "")
-  list(APPEND BUSTED_ARGS --filter $ENV{TEST_FILTER})
+  set(TEST_FILTER "--filter=$ENV{TEST_FILTER}")
 endif()
 
-if(DEFINED ENV{TEST_FILTER_OUT} AND NOT "$ENV{TEST_FILTER_OUT}" STREQUAL "")
-  list(APPEND BUSTED_ARGS --filter-out $ENV{TEST_FILTER_OUT})
-endif()
-
-# TMPDIR: use relative test path (for parallel test runs / isolation).
-set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${TEST_PATH}")
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR})
-
-# HISTFILE: do not write into user's ~/.bash_history
-set(ENV{HISTFILE} "/dev/null")
-
-if(NOT DEFINED ENV{TEST_TIMEOUT} OR "$ENV{TEST_TIMEOUT}" STREQUAL "")
-  set(ENV{TEST_TIMEOUT} 1200)
-endif()
-
-set(ENV{SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_NAME})  # used by test/helpers.lua.
+execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${WORKING_DIR}/Xtest-tmpdir)
+set(ENV{TMPDIR} ${WORKING_DIR}/Xtest-tmpdir)
+set(ENV{SYSTEM_NAME} ${SYSTEM_NAME})
 execute_process(
-  COMMAND ${BUSTED_PRG} -v -o test.busted.outputHandlers.${BUSTED_OUTPUT_TYPE}
-    --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
+  COMMAND ${BUSTED_PRG} ${TEST_TAG} ${TEST_FILTER} -v -o ${BUSTED_OUTPUT_TYPE}
+    --lua=${LUA_PRG} --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
     --lpath=${BUILD_DIR}/?.lua
     --lpath=${WORKING_DIR}/runtime/lua/?.lua
     --lpath=?.lua
-    ${BUSTED_ARGS}
     ${TEST_PATH}
-  TIMEOUT $ENV{TEST_TIMEOUT}
   WORKING_DIRECTORY ${WORKING_DIR}
   ERROR_VARIABLE err
   RESULT_VARIABLE res
   ${EXTRA_ARGS})
 
-file(GLOB RM_FILES ${BUILD_DIR}/Xtest_*)
-file(REMOVE_RECURSE ${RM_FILES})
+file(REMOVE ${WORKING_DIR}/Xtest_rplugin_manifest)
+file(REMOVE_RECURSE ${WORKING_DIR}/Xtest_xdg)
+file(REMOVE_RECURSE ${WORKING_DIR}/Xtest-tmpdir)
 
 if(NOT res EQUAL 0)
-  message(STATUS "Tests exited non-zero: ${res}")
-  if("${err}" STREQUAL "")
-    message(STATUS "No output to stderr.")
-  else()
-    message(STATUS "Output to stderr:\n${err}")
-  endif()
-
-  # Dump the logfile on CI (if not displayed and moved already).
-  if($ENV{CI})
-    if(EXISTS $ENV{NVIM_LOG_FILE} AND NOT EXISTS $ENV{NVIM_LOG_FILE}.displayed)
-      file(READ $ENV{NVIM_LOG_FILE} out)
-      message(STATUS "$NVIM_LOG_FILE: $ENV{NVIM_LOG_FILE}\n${out}")
-    endif()
-  endif()
-
+  message(STATUS "Output to stderr:\n${err}")
   message(FATAL_ERROR "${TEST_TYPE} tests failed with error: ${res}")
 endif()

cmake/UninstallHelper.cmake.in

@@ -1,21 +0,0 @@
-if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
-endif()
-
-file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach(file ${files})
-  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
-  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    exec_program(
-      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
-      OUTPUT_VARIABLE rm_out
-      RETURN_VALUE rm_retval
-      )
-    if(NOT "${rm_retval}" STREQUAL 0)
-      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
-    endif()
-  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
-    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
-  endif()
-endforeach()

cmake/mingw32-w64-cross-travis.toolchain.cmake

@@ -0,0 +1,53 @@
+#
+# Mingw-w64 cross compiler toolchain
+#
+# - The usual CMAKE variables will point to the cross compiler
+# - HOST_EXE_LINKER, HOST_C_COMPILER, HOST_EXE_LINKER_FLAGS,
+#   HOST_C_FLAGS point to a host compiler
+#
+
+set(MINGW_TRIPLET i686-w64-mingw32)
+# For x86_64 use
+#set(MINGW_TRIPLET x86_64-w64-mingw32)
+
+# The location of your toolchain sys-root
+set(MINGW_PREFIX_PATH /opt/mingw32/${MINGW_TRIPLET}/)
+# or sometimes like this
+#set(MINGW_PREFIX_PATH /usr/${MINGW_TRIPLET}/sys-root)
+
+# the name of the target operating system
+set(CMAKE_SYSTEM_NAME Windows)
+
+# which compilers to use for C and C++
+set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc)
+set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++)
+set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres)
+set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc)
+set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++)
+set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres)
+
+# Where is the target environment located
+set(CMAKE_FIND_ROOT_PATH "${MINGW_PREFIX_PATH}/mingw")
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+set(CROSS_TARGET ${MINGW_TRIPLET})
+
+# We need a host compiler too - assuming mildly sane Unix
+# defaults here
+set(HOST_C_COMPILER cc)
+set(HOST_EXE_LINKER ld)
+
+if (MINGW_TRIPLET MATCHES "^x86_64")
+  set(HOST_C_FLAGS)
+  set(HOST_EXE_LINKER_FLAGS)
+else()
+  # In 32 bits systems have the HOST compiler generate 32 bits binaries
+  set(HOST_C_FLAGS -m32)
+  set(HOST_EXE_LINKER_FLAGS -m32)
+endif()

codecov.yml

@@ -1,6 +1,3 @@
-# To validate:
-#   cat codecov.yml | curl --data-binary @- https://codecov.io/validate
-
 codecov:
   notify:
     require_ci_to_pass: no
@@ -15,13 +12,18 @@ coverage:
   range: "70...100"
 
   status:
-    project:
-      default:
-        threshold: 1
+    project: yes
     patch:
       default:
         threshold: 1
-        only_pulls: true
     changes: no
 
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
 comment: off

config/CMakeLists.txt

@@ -12,9 +12,15 @@ check_type_size("size_t" SIZEOF_SIZE_T)
 check_type_size("long long" SIZEOF_LONG_LONG)
 check_type_size("void *" SIZEOF_VOID_PTR)
 
+if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft")
+  # Windows Subsystem for Linux
+  set(HAVE_WSL 1)
+endif()
+
 check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)
 
 # Headers
+check_include_files(iconv.h HAVE_ICONV_H)
 check_include_files(langinfo.h HAVE_LANGINFO_H)
 check_include_files(locale.h HAVE_LOCALE_H)
 check_include_files(pwd.h HAVE_PWD_H)
@@ -26,42 +32,43 @@ if(NOT HAVE_SYS_WAIT_H AND UNIX)
 endif()
 check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
 check_include_files(termios.h HAVE_TERMIOS_H)
+check_include_files(utime.h HAVE_UTIME_H)
 check_include_files(sys/uio.h HAVE_SYS_UIO_H)
-check_include_files(sys/sdt.h HAVE_SYS_SDT_H)
 
 # Functions
 check_function_exists(fseeko HAVE_FSEEKO)
 check_function_exists(getpwent HAVE_GETPWENT)
 check_function_exists(getpwnam HAVE_GETPWNAM)
 check_function_exists(getpwuid HAVE_GETPWUID)
+check_function_exists(uv_translate_sys_error HAVE_UV_TRANSLATE_SYS_ERROR)
 check_function_exists(readv HAVE_READV)
 
 if(Iconv_FOUND)
   set(HAVE_ICONV 1)
 endif()
 
+if(JEMALLOC_FOUND)
+  set(HAVE_JEMALLOC 1)
+endif()
+
+check_function_exists(_putenv_s HAVE_PUTENV_S)
+if(WIN32 AND NOT HAVE_PUTENV_S)
+  message(SEND_ERROR "_putenv_s() function not found on your system.")
+endif()
 check_function_exists(opendir HAVE_OPENDIR)
 check_function_exists(readlink HAVE_READLINK)
+check_function_exists(setenv HAVE_SETENV)
+if(UNIX AND NOT HAVE_SETENV)
+  message(SEND_ERROR "setenv() function not found on your system.")
+endif()
+check_function_exists(unsetenv HAVE_UNSETENV)
 check_function_exists(setpgid HAVE_SETPGID)
 check_function_exists(setsid HAVE_SETSID)
 check_function_exists(sigaction HAVE_SIGACTION)
-check_function_exists(strnlen HAVE_STRNLEN)
 check_function_exists(strcasecmp HAVE_STRCASECMP)
 check_function_exists(strncasecmp HAVE_STRNCASECMP)
-check_function_exists(strptime HAVE_STRPTIME)
-
-if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
-  check_c_source_compiles("
-#include <termios.h>
-int
-main(void)
-{
-  return forkpty(0, NULL, NULL, NULL);
-}
-" HAVE_FORKPTY)
-else()
-  set(HAVE_FORKPTY 1)
-endif()
+check_function_exists(utime HAVE_UTIME)
+check_function_exists(utimes HAVE_UTIMES)
 
 # Symbols
 check_symbol_exists(FD_CLOEXEC "fcntl.h" HAVE_FD_CLOEXEC)
@@ -106,7 +113,7 @@ if (NOT "${HAVE_BE64TOH}")
     #   any case and ORDER_BIG_ENDIAN will not be examined.
     # - CMAKE_CROSSCOMPILING *and* HAVE_BE64TOH are both false. In this case
     #   be64toh function which uses cycle and arithmetic operations is used which
-    #   will work regardless of endianness. Function is sub-optimal though.
+    #   will work regardless of endianess. Function is sub-optimal though.
     check_c_source_runs("
       ${SI}
       ${MS}

config/config.h.in

@@ -13,6 +13,7 @@
 #endif
 
 #define PROJECT_NAME "@PROJECT_NAME@"
+#define LOCALE_INSTALL_DIR "@CMAKE_INSTALL_FULL_LOCALEDIR@"
 
 #cmakedefine HAVE__NSGETENVIRON
 #cmakedefine HAVE_FD_CLOEXEC
@@ -21,27 +22,34 @@
 #cmakedefine HAVE_GETPWNAM
 #cmakedefine HAVE_GETPWUID
 #cmakedefine HAVE_ICONV
+#cmakedefine HAVE_ICONV_H
 #cmakedefine HAVE_LANGINFO_H
 #cmakedefine HAVE_LOCALE_H
 #cmakedefine HAVE_NL_LANGINFO_CODESET
 #cmakedefine HAVE_NL_MSG_CAT_CNTR
+#cmakedefine HAVE_PUTENV_S
 #cmakedefine HAVE_PWD_H
 #cmakedefine HAVE_READLINK
+#cmakedefine HAVE_UV_TRANSLATE_SYS_ERROR
+// TODO: add proper cmake check
+// #define HAVE_SELINUX 1
+#cmakedefine HAVE_SETENV
+#cmakedefine HAVE_UNSETENV
 #cmakedefine HAVE_SETPGID
 #cmakedefine HAVE_SETSID
 #cmakedefine HAVE_SIGACTION
-#cmakedefine HAVE_STRNLEN
 #cmakedefine HAVE_STRCASECMP
 #cmakedefine HAVE_STRINGS_H
 #cmakedefine HAVE_STRNCASECMP
-#cmakedefine HAVE_STRPTIME
-#cmakedefine HAVE_SYS_SDT_H
 #cmakedefine HAVE_SYS_UTSNAME_H
 #cmakedefine HAVE_SYS_WAIT_H
 #cmakedefine HAVE_TERMIOS_H
+#cmakedefine HAVE_UTIME
+#cmakedefine HAVE_UTIME_H
+#cmakedefine HAVE_UTIMES
 #cmakedefine HAVE_WORKING_LIBINTL
+#cmakedefine HAVE_WSL
 #cmakedefine UNIX
-#cmakedefine CASE_INSENSITIVE_FILENAME
 #cmakedefine USE_FNAME_CASE
 #cmakedefine HAVE_SYS_UIO_H
 #ifdef HAVE_SYS_UIO_H
@@ -50,11 +58,11 @@
 #  undef HAVE_SYS_UIO_H
 # endif
 #endif
-#cmakedefine HAVE_FORKPTY
 
 #cmakedefine FEAT_TUI
 
 #ifndef UNIT_TESTING
+#cmakedefine HAVE_JEMALLOC
 #cmakedefine LOG_LIST_ACTIONS
 #endif
 
@@ -63,7 +71,5 @@
 #define ENDIAN_INCLUDE_FILE <@ENDIAN_INCLUDE_FILE@>
 
 #cmakedefine HAVE_EXECINFO_BACKTRACE
-#cmakedefine HAVE_BUILTIN_ADD_OVERFLOW
-#cmakedefine HAVE_WIMPLICIT_FALLTHROUGH_FLAG
 
 #endif  // AUTO_CONFIG_H

config/pathdef.c.in

@@ -3,6 +3,5 @@
 #include "${PROJECT_SOURCE_DIR}/src/nvim/vim.h"
 char *default_vim_dir = "${CMAKE_INSTALL_FULL_DATAROOTDIR}/nvim";
 char *default_vimruntime_dir = "";
-char *default_lib_dir = "${CMAKE_INSTALL_FULL_LIBDIR}/nvim";
 char_u *compiled_user = (char_u *)"${USERNAME}";
 char_u *compiled_sys = (char_u *)"${HOSTNAME}";

config/versiondef.h.in

@@ -5,11 +5,7 @@
 #define NVIM_VERSION_MINOR @NVIM_VERSION_MINOR@
 #define NVIM_VERSION_PATCH @NVIM_VERSION_PATCH@
 #define NVIM_VERSION_PRERELEASE "@NVIM_VERSION_PRERELEASE@"
-
 #cmakedefine NVIM_VERSION_MEDIUM "@NVIM_VERSION_MEDIUM@"
-#ifndef NVIM_VERSION_MEDIUM
-# include "auto/versiondef_git.h"
-#endif
 
 #define NVIM_API_LEVEL @NVIM_API_LEVEL@
 #define NVIM_API_LEVEL_COMPAT @NVIM_API_LEVEL_COMPAT@

contrib/flake.lock

@@ -1,43 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1646254136,
-        "narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "3e072546ea98db00c2364b81491b893673267827",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

contrib/flake.nix

@@ -1,133 +0,0 @@
-{
-  description = "Neovim flake";
-
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, flake-utils }:
-    {
-      overlay = final: prev:
-        let
-          pkgs = nixpkgs.legacyPackages.${prev.system};
-        in
-        rec {
-          neovim = pkgs.neovim-unwrapped.overrideAttrs (oa: {
-            version = "master";
-            src = ../.;
-          });
-
-          # a development binary to help debug issues
-          neovim-debug = let
-            stdenv = if pkgs.stdenv.isLinux then pkgs.llvmPackages_latest.stdenv else pkgs.stdenv;
-          in
-            ((neovim.override {
-            lua = pkgs.luajit;
-            inherit stdenv;
-          }).overrideAttrs (oa: {
-
-            dontStrip = true;
-            NIX_CFLAGS_COMPILE = " -ggdb -Og";
-
-            cmakeBuildType = "Debug";
-            cmakeFlags = oa.cmakeFlags ++ [
-              "-DMIN_LOG_LEVEL=0"
-            ];
-
-            disallowedReferences = [];
-          }));
-
-          # for neovim developers, beware of the slow binary
-          neovim-developer =
-            let
-              lib = nixpkgs.lib;
-              luacheck = pkgs.luaPackages.luacheck;
-            in
-            (neovim-debug.override ({ doCheck = pkgs.stdenv.isLinux; })).overrideAttrs (oa: {
-              cmakeFlags = oa.cmakeFlags ++ [
-                "-DLUACHECK_PRG=${luacheck}/bin/luacheck"
-                "-DMIN_LOG_LEVEL=0"
-                "-DENABLE_LTO=OFF"
-              ] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
-                # https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
-                # https://clang.llvm.org/docs/AddressSanitizer.html#symbolizing-the-reports
-                "-DCLANG_ASAN_UBSAN=ON"
-              ];
-            });
-        };
-    } //
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          overlays = [ self.overlay ];
-          inherit system;
-        };
-
-        pythonEnv = pkgs.python3.withPackages(ps: [
-          ps.msgpack
-          ps.flake8  # for 'make pylint'
-        ]);
-      in
-      rec {
-
-        packages = with pkgs; {
-          inherit neovim neovim-debug neovim-developer;
-        };
-
-        checks = {
-          pylint = pkgs.runCommandNoCC "pylint" {
-            nativeBuildInputs = [ pythonEnv ];
-            preferLocalBuild = true;
-            } "make -C ${./..} pylint > $out";
-
-          shlint = pkgs.runCommandNoCC "shlint" {
-            nativeBuildInputs = [ pkgs.shellcheck ];
-            preferLocalBuild = true;
-            } "make -C ${./..} shlint > $out";
-        };
-
-        defaultPackage = pkgs.neovim;
-
-        apps = {
-          nvim = flake-utils.lib.mkApp { drv = pkgs.neovim; name = "nvim"; };
-          nvim-debug = flake-utils.lib.mkApp { drv = pkgs.neovim-debug; name = "nvim"; };
-        };
-
-        defaultApp = apps.nvim;
-
-        devShell = let
-          in
-            pkgs.neovim-developer.overrideAttrs(oa: {
-
-              buildInputs = with pkgs; oa.buildInputs ++ [
-                cmake
-                pythonEnv
-                include-what-you-use # for scripts/check-includes.py
-                jq # jq for scripts/vim-patch.sh -r
-                shellcheck # for `make shlint`
-                doxygen    # for script/gen_vimdoc.py
-                clang-tools # for clangd to find the correct headers
-              ];
-
-              shellHook = oa.shellHook + ''
-                export NVIM_PYTHON_LOG_LEVEL=DEBUG
-                export NVIM_LOG_FILE=/tmp/nvim.log
-                export ASAN_SYMBOLIZER_PATH=${pkgs.llvm_11}/bin/llvm-symbolizer
-
-                # ASAN_OPTIONS=detect_leaks=1
-                export ASAN_OPTIONS="log_path=./test.log:abort_on_error=1"
-                export UBSAN_OPTIONS=print_stacktrace=1
-                mkdir -p build/runtime/parser
-                # nvim looks into CMAKE_INSTALL_DIR. Hack to avoid errors
-                # when running the functionaltests
-                mkdir -p outputs/out/share/nvim/syntax
-                touch outputs/out/share/nvim/syntax/syntax.vim
-
-                # for treesitter functionaltests
-                mkdir -p runtime/parser
-                cp -f ${pkgs.tree-sitter.builtGrammars.tree-sitter-c}/parser runtime/parser/c.so
-              '';
-            });
-    });
-}

contrib/gdb/nvim-gdb-pretty-printers.py

@@ -26,13 +26,13 @@ def get_color_code(bg, color_num):
             prefix += 1
         color_num %= 8
     else:
-        prefix = '48;5;' if bg else '38;5;'
+        prefix = '48;5;' if bg else '38;5;' 
     return '\x1b[{0}{1}m'.format(prefix, color_num)
 
 
 def highlight(attrs):
     fg, bg = [int(attrs['foreground']), int(attrs['background'])]
-    rv = [SGR0]  # start with sgr0
+    rv = [SGR0] # start with sgr0
     if fg != -1:
         rv.append(get_color_code(False, fg))
     if bg != -1:

contrib/local.mk.example

@@ -7,8 +7,9 @@
 # These CFLAGS can be used in addition to those specified in CMakeLists.txt:
 # CMAKE_EXTRA_FLAGS="-DCMAKE_C_FLAGS=-ftrapv -Wlogical-op"
 
-# To turn compiler warnings into errors:
-# CMAKE_EXTRA_FLAGS += "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -Werror"
+# By default, the jemalloc family of memory allocation functions are used.
+# Uncomment the following to instead use libc memory allocation functions.
+# CMAKE_EXTRA_FLAGS += -DENABLE_JEMALLOC=OFF
 
 # Sets the build type; defaults to Debug. Valid values:
 #
@@ -25,12 +26,6 @@
 #
 # CMAKE_BUILD_TYPE := Debug
 
-# With non-Debug builds interprocedural optimization (IPO) (which includes
-# link-time optimization (LTO)) is enabled by default, which causes the link
-# step to take a significant amount of time, which is relevant when building
-# often.  You can disable it explicitly:
-# CMAKE_EXTRA_FLAGS += -DENABLE_LTO=OFF
-
 # Log levels: 0 (DEBUG), 1 (INFO), 2 (WARNING), 3 (ERROR)
 # Default is 1 (INFO) unless CMAKE_BUILD_TYPE is Release or RelWithDebInfo.
 # CMAKE_EXTRA_FLAGS += -DMIN_LOG_LEVEL=1
@@ -41,6 +36,7 @@
 # them.
 #
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_BUSTED=OFF
+# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_JEMALLOC=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBTERMKEY=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBUV=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBVTERM=OFF
@@ -48,12 +44,23 @@
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUAROCKS=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_MSGPACK=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_UNIBILIUM=OFF
-# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_UTF8PROC=OFF
 #
 # Or disable all bundled dependencies at once.
 #
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED=OFF
 
+# By default, bundled libraries are statically linked to nvim.
+# This has no effect for non-bundled deps, which are always dynamically linked.
+# Uncomment these entries to instead use dynamic linking.
+#
+# CMAKE_EXTRA_FLAGS += -DLIBTERMKEY_USE_STATIC=OFF
+# CMAKE_EXTRA_FLAGS += -DLIBUNIBILIUM_USE_STATIC=OFF
+# CMAKE_EXTRA_FLAGS += -DLIBUV_USE_STATIC=OFF
+# CMAKE_EXTRA_FLAGS += -DLIBVTERM_USE_STATIC=OFF
+# CMAKE_EXTRA_FLAGS += -DLUAJIT_USE_STATIC=OFF
+# CMAKE_EXTRA_FLAGS += -DMSGPACK_USE_STATIC=OFF
+#
+#
 # .DEFAULT_GOAL := nvim
 #
 # Run doxygen over the source code.

contrib/luarc.json

@@ -1,23 +0,0 @@
-{
-    "runtime.version": "LuaJIT",
-    "diagnostics": {
-        "enable": true,
-        "globals": [
-          "vim",
-          "describe",
-          "it",
-          "before_each",
-          "after_each",
-          "setup",
-          "teardown"
-        ]
-    },
-    "workspace": {
-        "library": {
-            "runtime/lua": true
-        },
-        "maxPreload": 2000,
-        "preloadFileSize": 1000
-    },
-    "telemetry.enable": false
-}

man/nvim.1

@@ -56,7 +56,6 @@ Reads text from standard input until
 .Dv EOF ,
 then opens a buffer with that text.
 User input is read from standard error, which should be a terminal.
-.El
 .Sh OPTIONS
 .Bl -tag -width Fl
 .It Fl t Ar tag
@@ -89,18 +88,14 @@ Ex mode, reading stdin as Ex commands.
 Ex mode, reading stdin as text.
 .Ic :help Ex-mode
 .It Fl es
-Silent (non-interactive) Ex mode, reading stdin as Ex commands.
-Useful for scripting because it does NOT start a UI, unlike
-.Fl e .
+Silent/batch mode, reading stdin as Ex commands.
 .Ic :help silent-mode
 .It Fl \&Es
-Silent (non-interactive) Ex mode, reading stdin as text.
-Useful for scripting because it does NOT start a UI, unlike
-.Fl E .
+Silent/batch mode, reading stdin as text.
 .Ic :help silent-mode
 .It Fl d
 Diff mode.
-Show the difference between two to eight files, similar to
+Show the difference between two to four files, similar to
 .Xr sdiff 1 .
 .Ic ":help diff"
 .It Fl R
@@ -113,6 +108,9 @@ associated with a file.
 To overwrite a file, add an exclamation mark to the relevant Ex command, such as
 .Ic :w! .
 .Ic ":help 'readonly'"
+.It Fl Z
+Restricted mode.
+Disable commands that make use of an external shell.
 .It Fl m
 Resets the 'write' option, to disable file modifications.
 Writing to a file is disabled, but buffers can still be modified.
@@ -177,7 +175,8 @@ If
 .Ar vimrc
 is
 .Cm NORC ,
-do not load any initialization files (except plugins).
+do not load any initialization files (except plugins),
+and do not attempt to parse environment variables.
 If
 .Ar vimrc
 is
@@ -199,8 +198,6 @@ do not read or write a ShaDa file.
 Skip loading plugins.
 Implied by
 .Cm -u NONE .
-.It Fl -clean
-Mimic a fresh install of Nvim. Skip loading non-builtin plugins and shada (viminfo) file.
 .It Fl o Ns Op Ar N
 Open
 .Ar N
@@ -326,7 +323,7 @@ Print version information and exit.
 .Sh ENVIRONMENT
 .Bl -tag -width Fl
 .It Ev NVIM_LOG_FILE
-Low-level log file, usually found at ~/.cache/nvim/log.
+Low-level log file, usually found at ~/.local/share/nvim/log.
 :help $NVIM_LOG_FILE
 .It Ev VIM
 Used to locate user files, such as init.vim.
@@ -374,7 +371,7 @@ See also
 System-global
 .Nm
 configuration file.
-.It Pa $VIM
+.It Pa /usr/local/share/nvim
 System-global
 .Nm
 runtime directory.

packaging/CMakeLists.txt

@@ -1,64 +0,0 @@
-set(CPACK_PACKAGE_NAME "Neovim")
-set(CPACK_PACKAGE_VENDOR "neovim.io")
-set(CPACK_PACKAGE_FILE_NAME "nvim")
-
-# From the GitHub About section
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Vim-fork focused on extensibility and usability.")
-
-set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
-
-# Pull the versions defined with the top level CMakeLists.txt
-set(CPACK_PACKAGE_VERSION_MAJOR ${NVIM_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${NVIM_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${NVIM_VERSION_PATCH})
-
-# CPACK_VERBATIM_VARIABLES ensures that the variables prefixed with *CPACK_*
-# are correctly passed to the cpack program.
-# This should always be set to true.
-set(CPACK_VERBATIM_VARIABLES TRUE)
-
-set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
-set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
-
-
-if(WIN32)
-  set(CPACK_PACKAGE_FILE_NAME "nvim-win64")
-  set(CPACK_GENERATOR ZIP WIX)
-
-  # WIX
-  # CPACK_WIX_UPGRADE_GUID should be set, but should never change.
-  # CPACK_WIX_PRODUCT_GUID should not be set (leave as default to auto-generate).
-
-  # The following guid is just a randomly generated guid that's been pasted here.
-  # It has no special meaning other than to supply it to WIX.
-  set(CPACK_WIX_UPGRADE_GUID "207A1A70-7B0C-418A-A153-CA6883E38F4D")
-  set(CPACK_WIX_PRODUCT_ICON ${CMAKE_CURRENT_LIST_DIR}/neovim.ico)
-
-  # We use a wix patch to add further options to the installer. At present, it's just to add neovim to the path
-  # on installation, however, it can be extended.
-  # See: https://cmake.org/cmake/help/v3.7/module/CPackWIX.html#variable:CPACK_WIX_PATCH_FILE
-  list(APPEND CPACK_WIX_EXTENSIONS WixUtilExtension)
-  list(APPEND CPACK_WIX_PATCH_FILE ${CMAKE_CURRENT_LIST_DIR}/WixPatch.xml)
-elseif(APPLE)
-  set(CPACK_PACKAGE_FILE_NAME "nvim-macos")
-  set(CPACK_GENERATOR TGZ)
-  set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_LIST_DIR}/neovim.icns)
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(CPACK_PACKAGE_FILE_NAME "nvim-linux64")
-  set(CPACK_GENERATOR TGZ DEB)
-  set(CPACK_DEBIAN_PACKAGE_NAME "Neovim") # required
-  set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Neovim.io") # required
-
-  # Automatically compute required shared lib dependencies.
-  # Unfortunately, you "just need to know" that this has a hidden
-  # dependency on dpkg-shlibdeps whilst using a debian based host.
-  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS TRUE)
-else()
-  set(CPACK_GENERATOR TGZ)
-endif()
-
-# CPack variables are loaded in on the call to include(CPack). If you set
-# variables *after* the inclusion, they don't get updated within the CPack
-# config. Note that some CPack commands should still be run after it, such
-# as cpack_add_component().
-include(CPack)

packaging/WixPatch.xml

@@ -1,16 +0,0 @@
-<CPackWiXPatch>
-    <!--  Fragment ID is from: <your build dir>/_CPack_Packages/win64/WIX/files.wxs -->
-    <CPackWiXFragment Id="CM_CP_bin.nvim.exe">
-      <!-- Note: if we were to specify Value='[INSTALL_ROOT]\bin' - with a backslash, the installer will still
-      use a forward slash in the path. -->
-      <Environment
-        Id='UpdatePath'
-        Name='PATH'
-        Action='set'
-        Permanent='no'
-        System='yes'
-        Part='last'
-        Value='[INSTALL_ROOT]/bin'
-      />
-    </CPackWiXFragment>
-</CPackWiXPatch>