NVIM 0.8.1

This is mainly a bugfix release, but there a few feature additions.

Features
- extmarks: Allow preventing spellchecking with spell = false
- spell: Support nospell in treesitter queries
- man: Add health check
- docs-html: Try to use tags for ToC headings

Bug Fixes
- ui: Setting 'cmdheight' with global statusline
- ui: Fix highlights not being updated with 'winhl'
- Make_filter_cmd for :! powershell
- :! pwsh redirection for `command not found`
- Find multibyte file name in line
- Avoid unsigned overflow in home_replace()
- docs-html: Update parser
- folds: Fix fold marker multibyte comparison
- health: Correct tmux rgb verification
- man.lua: Set modifiable before writing page
- mouse: Ensure no scrolling with "ver:0" in 'mousescroll'
- paste: Feed keys as typed in cmdline mode
- qflist: Avoid read of uninitialized memory
- spell: Fix wrong cast
- stdpath: Default to /tmp if stdpath('run') cannot be created
- tui: Resume main thread if suspending isn't implemented

Documentation
- lsp: Vim.lsp.range_code_action() is not deprecated

.builds/freebsd.yml

@@ -1,44 +0,0 @@
-image: freebsd/12.x
-
-packages:
-- cmake
-- gmake
-- ninja
-- libtool
-- sha
-- automake
-- pkgconf
-- unzip
-- wget
-- gettext
-- python
-- libffi
-
-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
-
-# Unfortunately, oldtest is tanking hard on sourcehut's FreeBSD instance
-# and not producing any logs as a result. So don't do this task for now.
-# Ref: https://github.com/neovim/neovim/pull/11477#discussion_r352095005.
-# - test-oldtest: |
-#     cd neovim
-#     gmake oldtest

.builds/openbsd.yml

@@ -1,43 +0,0 @@
-# sourcehut CI: https://builds.sr.ht/~jmk/neovim
-
-image: openbsd/6.9
-
-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
-
-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

.cirrus.yml

@@ -0,0 +1,29 @@
+env:
+  CIRRUS_CLONE_DEPTH: '2'
+  LANG: en_US.UTF-8
+  CMAKE_EXTRA_FLAGS: -DCI_BUILD=ON -DMIN_LOG_LEVEL=3
+
+freebsd_task:
+  name: FreeBSD
+  only_if: $BRANCH != "master"
+  freebsd_instance:
+    image_family: freebsd-13-1
+  timeout_in: 30m
+  install_script:
+    - pkg update -f
+    - pkg install -y cmake gmake ninja libtool automake pkgconf unzip wget gettext python libffi git
+  build_deps_script:
+    - gmake deps
+  build_script:
+    - gmake CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" nvim
+  workaround_script:
+    # Run tests as user "cirrus" instead of root. This is required for the
+    # permission-related tests to work correctly.
+    - pw useradd cirrus -m
+    - chown -R cirrus:cirrus .
+  functionaltest_script:
+    - sudo -u cirrus gmake functionaltest
+  unittest_script:
+    - sudo -u cirrus gmake unittest
+  oldtest_script:
+    - sudo -u cirrus gmake oldtest

.clang-format

@@ -2,10 +2,10 @@ BasedOnStyle:  Google
 Language: Cpp
 ColumnLimit: 100
 IndentWidth: 2
-TabWidth: 2
+TabWidth: 8
 UseTab: Never
-IndentCaseLabels: true
-BreakBeforeBraces: Linux
+IndentCaseLabels: false
+BreakBeforeBraces: Custom
 AlignEscapedNewlinesLeft: false
 AllowShortFunctionsOnASingleLine: false
 AlignTrailingComments: true
@@ -17,4 +17,51 @@ AllowShortLoopsOnASingleLine: false
 BinPackParameters: false
 BreakBeforeBinaryOperators: true
 BreakBeforeTernaryOperators: true
-ContinuationIndentWidth: 4
+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: true
+Cpp11BracedListStyle: false
+IncludeCategories:
+  - Regex:           '<[/[:alnum:].]+>'
+    Priority:        0
+  - Regex:           '^"(nvim|vim)/'
+    Priority:        1
+    SortPriority:    1
+    CaseSensitive:   false
+AlignConsecutiveMacros: AcrossEmptyLines
+IndentPPDirectives: AfterHash
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+PPIndentWidth: 1
+ForEachMacros:
+  - FOR_ALL_AUEVENTS
+  - FOR_ALL_AUPATS_IN_EVENT
+  - FOR_ALL_BUFFERS
+  - FOR_ALL_BUFFERS_BACKWARDS
+  - FOR_ALL_FRAMES
+  - FOR_ALL_QFL_ITEMS
+  - FOR_ALL_SIGNS_IN_BUF
+  - FOR_ALL_TABS
+  - FOR_ALL_TAB_WINDOWS
+  - FOR_ALL_WINDOWS_IN_TAB
+  - RBUFFER_EACH
+  - RBUFFER_EACH_REVERSE
+  - RBUFFER_UNTIL_EMPTY
+  - RBUFFER_UNTIL_FULL
+  - kl_iter

.editorconfig

@@ -6,7 +6,9 @@ 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

.flake8

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

.git-blame-ignore-revs

@@ -36,3 +36,27 @@ d90fb1c0bfc1e64c783c385a79e7de87013dadba
 9c268263b1792d00b3ffdfd7495af2575862656e
 8c74c895b300bcee5fa937a2329d1d4756567b42
 40be47e0faef7aa015eb4ba44ceb1ee1a03e97cf
+4472c56d54f447040f6e8610b261b7efa0d04eb6
+a68faed02dc8e37b8f10da14dc02e33e6ed93947
+725cbe7d414f609e769081276f2a034e32a4337b
+7e3bdc75e44b9139d8afaea4381b53ae78b15746
+4ba12b3dda34472c193c9fa8ffd7d3bd5b6c04d6
+849f104c2789c884428fd45501912c6591a78e12
+38dd53c525054daf83dba27d7d46e90e8b41fa50
+6059784770c4c88fb6fe528b9f7634192fa1164e
+ee031eb5256bb83e0d6add2bae6fd943a4186ffe
+69e11b58b4db0952f11a5ff85aa7150b5f5b8db8
+271bb32855853b011fceaf0ad2f829bce66b2a19
+aefdc6783cb77f09786542c90901a9e7120bea42
+aa4f9c5341f5280f16cce0630ea54b84eef717b3
+0adc66171a355a12494d87ebb767d509540c7ef9
+93f24403f8cc760ff47979c596976b53a8b16358
+1ffd527c837fb2465c9659273bbe5447a1352db2
+2498e9feb025361576603a0101c86393d211e31e
+
+# typos
+d238b8f6003d34cae7f65ff7585b48a2cd9449fb
+4547137aaff32b20172870a549d3a28a3c7adf1c
+
+# generated docs
+ea333badd24f691c753d8048f911d1db349bc2cd

.gitattributes

@@ -1,6 +1,16 @@
-*.h linguist-language=C
+*.h.in          linguist-language=C
+*.c.in          linguist-language=C
+*CMakeLists.txt linguist-language=CMake
+
+runtime/doc/*   linguist-documentation
+
+src/xdiff/**    linguist-vendored
+src/cjson/**    linguist-vendored
+src/unicode/**  linguist-vendored
+
 src/nvim/testdir/test42.in diff
-.github/ export-ignore
+
+.github/    export-ignore
 .travis.yml export-ignore
 codecov.yml export-ignore
-.builds/ export-ignore
+.builds/    export-ignore

.github/ISSUE_TEMPLATE/lsp_bug_report.yml

@@ -27,13 +27,6 @@ body:
     validations:
       required: true
 
-  - type: textarea
-    attributes:
-      label: ':checkhealth'
-      description: |
-        Paste the results from `nvim -c ":checkhealth nvim lspconfig"`
-      render: markdown
-
   - type: textarea
     attributes:
       label: 'Steps to reproduce using "nvim -u minimal_init.lua"'

.github/labeler.yml

@@ -13,12 +13,13 @@
   - src/nvim/lua/treesitter.*
   - runtime/lua/vim/treesitter.lua
   - runtime/lua/vim/treesitter/*
+  - runtime/queries/**/*
 
 "diagnostic":
   - runtime/lua/vim/diagnostic.lua
 
 "dependencies":
-  - third-party/**/*
+  - cmake.deps/**/*
 
 "spell":
   - src/nvim/spell*
@@ -27,8 +28,6 @@
   - src/nvim/terminal.*
 
 "column":
-  - src/nvim/mark.h
-  - src/nvim/mark.c
   - src/nvim/sign*
 
 "folds":
@@ -39,6 +38,7 @@
 
 "documentation":
   - all: ["runtime/doc/*"]
+  - all: ["**/*.md"]
 
 "clipboard":
   - runtime/autoload/provider/clipboard.vim
@@ -49,9 +49,10 @@
 "build":
   - CMakeLists.txt
   - "**/CMakeLists.txt"
+  - "**/Makefile"
   - "**/*.cmake"
 
-"tests":
+"test":
   - all: ["test/**/*"]
 
 "ci":
@@ -59,3 +60,6 @@
   - .github/workflows/**/*
   - .builds/*
   - ci/**/*
+
+"filetype":
+  - runtime/lua/vim/filetype.lua

.github/scripts/remove-reviewers.js

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,92 @@
+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("muniter")
+  }
+
+  if (labels.includes('build')) {
+    reviewers.add("jamessan")
+    reviewers.add("justinmk")
+  }
+
+  if (labels.includes('ci')) {
+    reviewers.add("dundargoc")
+    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('lsp')) {
+    reviewers.add("mfussenegger")
+    reviewers.add("glepnir")
+  }
+
+  if (labels.includes('treesitter')) {
+    reviewers.add("bfredl")
+    reviewers.add("clason")
+    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

@@ -0,0 +1,18 @@
+name: Missing API docs
+on:
+  pull_request:
+    branches-ignore:
+      - 'marvim/api-doc-update**'
+    paths:
+      - 'src/nvim/api/*.[ch]'
+      - 'runtime/lua/**.lua'
+      - 'runtime/doc/**'
+
+jobs:
+  call-regen-api-docs:
+    permissions:
+      contents: write
+      pull-requests: write
+    uses: ./.github/workflows/api-docs.yml
+    with:
+      check_only: true

.github/workflows/api-docs.yml

@@ -1,26 +1,38 @@
+# 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]'
-      - 'src/nvim/**.lua'
       - '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
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
       pull-requests: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
+          # Fetch depth 0 is required if called through workflow_call. In order
+          # to create a PR we need to access other branches, which requires a
+          # full clone.
           fetch-depth: 0
 
       - name: Install dependencies
@@ -42,10 +54,17 @@ jobs:
           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 diff --color --exit-code
+
       - name: Automatic PR
-        if: ${{ steps.docs.outputs.UPDATED_DOCS != 0 }}
+        if: ${{ steps.docs.outputs.UPDATED_DOCS != 0 && !inputs.check_only }}
         run: |
           git add -u
-          git commit -m 'docs: regenerate'
+          git commit -m 'docs: regenerate [skip ci]'
           git push --force https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY} ${DOC_BRANCH}
-          gh pr create --fill --base ${GITHUB_REF#refs/heads/} --head ${DOC_BRANCH} || true
+          gh pr create --draft --fill --base ${GITHUB_REF#refs/heads/} --head ${DOC_BRANCH} || true

.github/workflows/backport.yml

@@ -2,8 +2,6 @@ name: Backport
 on:
   pull_request_target:
     types: [closed, labeled]
-  issue_comment:
-    types: [created]
 jobs:
   backport:
     permissions:
@@ -12,22 +10,18 @@ jobs:
     name: Backport Pull Request
     if: >
       github.repository_owner == 'neovim' && (
-        github.event_name == 'pull_request' &&
+        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
+      - uses: actions/checkout@v3
         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
+        uses: zeebe-io/backport-action@v0.0.8
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           github_workspace: ${{ github.workspace }}

.github/workflows/ci.yml

@@ -5,44 +5,247 @@ on:
       - '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:
-  unixish:
+  lint:
+    if: (github.event_name == 'pull_request' && github.base_ref == 'master') || (github.event_name == 'push' && github.ref == 'refs/heads/master')
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    env:
+      CC: gcc
+    steps:
+      - uses: actions/checkout@v3
+
+      - 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 \
+            cmake \
+            flake8 \
+            gettext \
+            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 uncrustify
+        id: cache-uncrustify
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.CACHE_UNCRUSTIFY }}
+          key: ${{ env.UNCRUSTIFY_VERSION }}
+
+      - name: Clone uncrustify
+        if: steps.cache-uncrustify.outputs.cache-hit != 'true'
+        uses: actions/checkout@v3
+        with:
+          repository: uncrustify/uncrustify
+          ref: ${{ env.UNCRUSTIFY_VERSION }}
+          path: uncrustify
+
+      - name: Install uncrustify
+        if: steps.cache-uncrustify.outputs.cache-hit != 'true'
+        run: |
+          source_dir=uncrustify
+          build_dir=uncrustify/build
+          cmake -S $source_dir -B $build_dir -G Ninja -DCMAKE_BUILD_TYPE=Release
+          cmake --build $build_dir
+          mkdir -p $HOME/.cache
+          cp $build_dir/uncrustify ${{ env.CACHE_UNCRUSTIFY }}
+
+      - name: Cache artifacts
+        uses: actions/cache@v3
+        with:
+          path: |
+            ${{ env.CACHE_NVIM_DEPS_DIR }}
+          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!cmake.deps/**CMakeLists.txt') }}-${{ github.base_ref }}
+
+      - name: Build third-party deps
+        run: ./ci/before_script.sh
+
+      - if: "!cancelled()"
+        name: lintstylua
+        uses: JohnnyMorganz/stylua-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --check runtime/
+
+      - if: "!cancelled()"
+        name: lintlua
+        run: make lintlua
+
+      - if: "!cancelled()"
+        name: lintpy
+        run: make lintpy
+
+      - if: "!cancelled()"
+        name: lintsh
+        run: make lintsh
+
+      - if: "!cancelled()"
+        name: uncrustify
+        run: |
+          ${{ env.CACHE_UNCRUSTIFY }} -c ./src/uncrustify.cfg -q --replace --no-backup $(find ./src/nvim -name "*.[ch]")
+
+      - if: "!cancelled()"
+        name: suggester / uncrustify
+        uses: reviewdog/action-suggester@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tool_name: uncrustify
+          cleanup: false
+
+      - if: "!cancelled()"
+        name: check uncrustify
+        run: |
+          git diff --color --exit-code
+
+      - name: Cache dependencies
+        run: ./ci/before_cache.sh
+
+  lintc:
+    # 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_name == 'push' && github.ref == 'refs/heads/master')
+    runs-on: ubuntu-20.04
+    timeout-minutes: 10
+    env:
+      CC: gcc
+    steps:
+      - uses: actions/checkout@v3
+
+      - 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 \
+            cmake \
+            gettext \
+            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@v3
+        with:
+          path: |
+            ${{ env.CACHE_NVIM_DEPS_DIR }}
+          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!cmake.deps/**CMakeLists.txt') }}-${{ github.base_ref }}
+
+      - name: Build third-party deps
+        run: ./ci/before_script.sh
+
+      - name: Build nvim
+        run: ./ci/run_tests.sh build_nvim
+
+      - if: "!cancelled()"
+        name: lintc
+        run: make lintc
+
+      - if: "!cancelled()"
+        name: check-single-includes
+        run: make 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-12
-            runner: ubuntu-20.04
-            os: linux
-          - flavor: lint
-            cc: gcc
+            cc: clang-13
             runner: ubuntu-20.04
             os: linux
           - flavor: tsan
-            cc: clang-12
+            cc: clang-13
+            runner: ubuntu-20.04
+            os: linux
+          - flavor: uchar
+            cc: gcc
             runner: ubuntu-20.04
             os: linux
           - cc: clang
-            runner: macos-10.15
-            os: osx
-          - cc: clang
-            runner: macos-11.0
+            runner: macos-11
             os: osx
+
+            # functionaltest-lua is our dumping ground for non-mainline configurations.
+            # 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.
+            # 3. No treesitter parsers installed.
+          - 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
+      - uses: actions/checkout@v3
 
       - name: Setup common environment variables
         run: ./.github/workflows/env.sh ${{ matrix.flavor }}
@@ -51,100 +254,10 @@ jobs:
         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 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 12
-          rm llvm.sh
-
-      - name: Install brew packages
-        if: matrix.os == 'osx'
-        run: |
-          # Workaround brew issues
-          rm -f /usr/local/bin/2to3
-          brew update >/dev/null
-          brew upgrade
-          brew install automake ccache perl cpanminus ninja
-
-      - name: Setup interpreter packages
-        run: |
-          ./ci/before_install.sh
-          ./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 and test
-        run: ./ci/script.sh
-
-      - name: Cache dependencies
-        if: ${{ success() }}
-        run: ./ci/before_cache.sh
-
-  windows:
-    runs-on: windows-2016
-    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 }}
-
-  functionaltest:
-    name: ${{ matrix.runner }} ${{ matrix.flavor }} (cc=${{ matrix.cc }})
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - flavor: functionaltest-lua
-            cc: gcc
-            runner: ubuntu-20.04
-            os: linux
-    runs-on: ${{ matrix.runner }}
-    timeout-minutes: 45
-    env:
-      CC: ${{ matrix.cc }}
-      CI_OS_NAME: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup commom environment variables
-        run: ./.github/workflows/env.sh ${{ matrix.flavor }}
-
-      - name: Install apt packages
-        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
+          sudo apt-get install -y autoconf automake build-essential cmake cpanminus cscope gcc-multilib gdb gettext 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'
@@ -161,25 +274,85 @@ jobs:
             exit 1
           }
 
-      - name: Setup interpreter packages
+      - name: Install new clang
+        if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
         run: |
-          ./ci/before_install.sh
-          ./ci/install.sh
+          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 cpanminus ninja
+
+      - name: Setup interpreter packages
+        run: ./ci/install.sh
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ env.CACHE_NVIM_DEPS_DIR }}
-            ~/.ccache
-          key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'third-party/**', '**/CMakeLists.txt') }}-${{ github.base_ref }}
+          key: ${{ matrix.runner }}-${{ matrix.flavor }}-${{ matrix.cc }}-${{ hashFiles('cmake/*', 'cmake.deps/**', '**/CMakeLists.txt') }}-${{ github.base_ref }}
 
-      - name: Build third-party
+      - name: Build third-party deps
         run: ./ci/before_script.sh
 
-      - name: Build and test
-        run: ./ci/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
-        if: ${{ success() }}
         run: ./ci/before_cache.sh
+
+  windows:
+    runs-on: windows-2019
+    timeout-minutes: 45
+    env:
+      DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
+      DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
+      CMAKE_BUILD_TYPE: "RelWithDebInfo"
+    name: windows (MSVC_64)
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        with:
+          path: ${{ env.DEPS_BUILD_DIR }}
+          key: ${{ hashFiles('cmake.deps\**') }}
+
+      - name: Build deps
+        run: .\ci\build.ps1 -BuildDeps
+
+      - name: Build nvim
+        run: .\ci\build.ps1 -Build
+
+      - name: Install test deps
+        continue-on-error: false
+        run: .\ci\build.ps1 -EnsureTestDeps
+
+      - if: "!cancelled()"
+        name: Run tests
+        run: .\ci\build.ps1 -Test
+
+      - if: "!cancelled()"
+        name: Run old tests
+        run: .\ci\build.ps1 -TestOld

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,42 @@
+name: "CodeQL"
+
+on:
+  schedule:
+    - cron: '42 0 * * 0'
+  workflow_dispatch:
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp', 'python' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Setup common environment variables
+      run: ./.github/workflows/env.sh
+
+    - name: Install apt packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y autoconf automake build-essential cmake cpanminus cscope gcc-multilib gdb gettext language-pack-tr libtool-bin locales ninja-build pkg-config python3 python3-pip python3-setuptools unzip valgrind xclip
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    - if: matrix.language == 'cpp'
+      run: make
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/commitlint.yml

@@ -1,19 +1,23 @@
 name: "Commit Linter"
 on:
-  pull_request:
+  # 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
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2.3.1
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
+          path: pr_nvim
       - uses: rhysd/action-setup-vim@v1
         with:
           neovim: true
-      - run: nvim --clean -es +"lua require('scripts.lintcommit').main({trace=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,19 +1,19 @@
 name: Coverity
 on:
   schedule:
-    - cron: '0 10 * * 1'  # Run every Monday at 00:10
+    - cron: '10 0 * * *'  # Run every day at 00:10
   workflow_dispatch:
 
 jobs:
   scan:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - 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
+          sudo apt-get install -y autoconf automake build-essential cmake gettext libtool-bin locales ninja-build pkg-config unzip
 
       - name: Download Coverity
         run: |

.github/workflows/env.sh

@@ -8,8 +8,6 @@ $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
@@ -19,13 +17,11 @@ 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
+CACHE_UNCRUSTIFY=$HOME/.cache/uncrustify
+UNCRUSTIFY_VERSION=uncrustify-0.75.0
 EOF
 
-DEPS_CMAKE_FLAGS=-DUSE_BUNDLED_GPERF=OFF
+DEPS_CMAKE_FLAGS=
 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"
 
@@ -34,19 +30,28 @@ case "$FLAVOR" in
     BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON"
     cat <<EOF >> "$GITHUB_ENV"
 CLANG_SANITIZER=ASAN_UBSAN
-SYMBOLIZER=asan_symbolize-12
-ASAN_OPTIONS=detect_leaks=1:check_initialization_order=1:log_path=$GITHUB_WORKSPACE/build/log/asan
+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
+    ;;
+  uchar)
+    cat <<EOF >> "$GITHUB_ENV"
+BUILD_UCHAR=1
 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"
-CI_TARGET=lint
+USE_BUNDLED=OFF
 EOF
     ;;
   functionaltest-lua)

.github/workflows/labeler.yml

@@ -1,17 +1,20 @@
 name: "Pull Request Labeler"
 on:
   pull_request_target:
-    types: opened
+    types: [opened]
 jobs:
+
   triage:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        sync-labels: ""
+
   type-scope:
     runs-on: ubuntu-latest
     permissions:
@@ -23,8 +26,24 @@ jobs:
       PR_NUMBER: ${{ github.event.pull_request.number }}
       PR_TITLE: ${{ github.event.pull_request.title }}
     steps:
-      # Extract type and try to add it as a label
-    - run: gh pr edit "$PR_NUMBER" --add-label "$(echo "$PR_TITLE" | sed -E 's|([[:alpha:]]+)(\(.*\))?!?:.*|\1|')" || true
+    - 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
 
-      # Extract scope and try to add it as a label
-    - run: gh pr edit "$PR_NUMBER" --add-label "$(echo "$PR_TITLE" | sed -E 's|[[:alpha:]]+\((.+)\)!?:.*|\1|')" || 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@v3
+      - 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

@@ -6,17 +6,40 @@ ${NVIM_VERSION}
 
 ### Windows
 
-1. Extract **nvim-win64.zip**
-2. Run `nvim-qt.exe`
+#### 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-osx64/bin/nvim`
+2. Run `xattr -c ./nvim-macos.tar.gz` (to avoid "unknown developer" warning)
+3. Extract: `tar xzvf nvim-macos.tar.gz`
+4. 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):
@@ -32,9 +55,11 @@ ${NVIM_VERSION}
 ## SHA256 Checksums
 
 ```
-${SHA_LINUX_64}
+${SHA_LINUX_64_TAR}
+${SHA_LINUX_64_DEB}
 ${SHA_APP_IMAGE}
 ${SHA_APP_IMAGE_ZSYNC}
 ${SHA_MACOS}
-${SHA_WIN_64}
+${SHA_WIN_64_ZIP}
+${SHA_WIN_64_MSI}
 ```

.github/workflows/release.yml

@@ -13,21 +13,21 @@ on:
       - 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)
+# Build with gcc-10 to prevent triggering #14150 (default is still gcc-9 on 20.04)
 jobs:
   linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     outputs:
       version: ${{ steps.build.outputs.version }}
       release: ${{ steps.build.outputs.release }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         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
+          sudo apt-get install -y autoconf automake build-essential cmake gettext 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')
@@ -35,91 +35,116 @@ jobs:
       - name: Build release
         id: build
         run: |
-          CC=gcc-11 make CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH="
+          CC=gcc-10 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/release"
-          tar cfz nvim-linux64.tar.gz nvim-linux64
-      - uses: actions/upload-artifact@v2
+          cd "$GITHUB_WORKSPACE/build/"
+          cpack -C $NVIM_BUILD_TYPE
+      - uses: actions/upload-artifact@v3
         with:
           name: nvim-linux64
-          path: build/release/nvim-linux64.tar.gz
+          path: |
+            build/nvim-linux64.tar.gz
+            build/nvim-linux64.deb
           retention-days: 1
 
   appimage:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
+    container:
+      image: ubuntu:18.04
+      options: --privileged # Privileged mode is needed to load fuse module.
     steps:
-      - uses: actions/checkout@v2
+      - name: Prepare container
+        run: |
+          apt-get update
+          apt-get install -y software-properties-common
+          add-apt-repository -y ppa:ubuntu-toolchain-r/test # For gcc-10.
+          add-apt-repository -y ppa:git-core/ppa # For git>=2.18.
+          apt-get update
+          apt-get install -y git gcc-10
+          apt-get install -y fuse libfuse2 # For linuxdeploy.
+          # Workaround for https://github.com/actions/checkout/issues/766.
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+      - uses: actions/checkout@v3
         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
+          apt-get update
+          apt-get install -y autoconf automake build-essential cmake gettext 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
+        run: CC=gcc-10 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
+        run: CC=gcc-10 make appimage-nightly
+      - uses: actions/upload-artifact@v3
         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
+          path: |
+            build/bin/nvim.appimage
+            build/bin/nvim.appimage.zsync
           retention-days: 1
 
   macOS:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Install brew packages
         run: |
-          rm -f /usr/local/bin/2to3
-          brew update >/dev/null
-          brew upgrade
+          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/
+          ln -sf "$(brew --prefix)/opt/$(readlink "${GETTEXT_PREFIX}")/include"/* /usr/local/include/
+          rm -f "$GETTEXT_PREFIX"
       - name: Build release
         run: |
-          make CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11"
-          make DESTDIR="$GITHUB_WORKSPACE/build/release/nvim-osx64" install
-      - name: Create package
-        run: |
-          cd "$GITHUB_WORKSPACE/build/release"
-          mkdir -p nvim-osx64/libs
-          libs=($(otool -L nvim-osx64/bin/nvim | sed 1d | sed -E -e 's|^[[:space:]]*||' -e 's| .*||'))
-          echo "libs:"
-          for lib in "${libs[@]}"; do
-            if echo "$lib" | grep -q -E 'libSystem|CoreFoundation' 2>/dev/null; then
-              echo "  [skipped] $lib"
-            else
-              echo "  $lib"
-              relname="libs/${lib##*/}"
-              cp -L "$lib" "nvim-osx64/$relname"
-              install_name_tool -change "$lib" "@executable_path/../$relname" nvim-osx64/bin/nvim
-            fi
+          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
+          cd "$GITHUB_WORKSPACE/build/"
+          # Make sure we build everything for M1 as well
+          for macho in bin/* lib/nvim/parser/*.so
+          do
+          lipo -info "$macho" | grep -q arm64 || exit 1
           done
-          tar cfz nvim-macos.tar.gz nvim-osx64
-      - uses: actions/upload-artifact@v2
+          cpack -C "$NVIM_BUILD_TYPE"
+      - uses: actions/upload-artifact@v3
         with:
           name: nvim-macos
-          path: build/release/nvim-macos.tar.gz
+          path: build/nvim-macos.tar.gz
           retention-days: 1
 
   windows:
-    runs-on: windows-2016
+    runs-on: windows-2019
     env:
       DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
       DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
+      CMAKE_BUILD_TYPE: "RelWithDebInfo"
     strategy:
       matrix:
         include:
@@ -127,37 +152,38 @@ jobs:
             archive: nvim-win64
     name: windows (${{ matrix.config }})
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - run: powershell ci\build.ps1 -NoTests
-        env:
-          CONFIGURATION: ${{ matrix.config }}
-      - run: move build\Neovim.zip build\${{ matrix.archive }}.zip
-      - uses: actions/upload-artifact@v2
+      - name: Build deps
+        run: .\ci\build.ps1 -BuildDeps
+      - name: build package
+        run: .\ci\build.ps1 -Package
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.archive }}
-          path: build/${{ matrix.archive }}.zip
+          path: |
+            build/${{ matrix.archive }}.msi
+            build/${{ matrix.archive }}.zip
           retention-days: 1
 
   publish:
     needs: [linux, appimage, macOS, windows]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       GH_REPO: ${{ github.repository }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     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/checkout@v3
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
 
       - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gettext-base
+        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
@@ -168,16 +194,12 @@ jobs:
           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
@@ -189,7 +211,9 @@ jobs:
         run: |
           cd ./nvim-linux64
           sha256sum nvim-linux64.tar.gz > nvim-linux64.tar.gz.sha256sum
-          echo "SHA_LINUX_64=$(cat nvim-linux64.tar.gz.sha256sum)" >> $GITHUB_ENV
+          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
@@ -209,14 +233,43 @@ jobs:
         run: |
           cd ./nvim-win64
           sha256sum nvim-win64.zip > nvim-win64.zip.sha256sum
-          echo "SHA_WIN_64=$(cat nvim-win64.zip.sha256sum)" >> $GITHUB_ENV
+          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
+  publish-winget:
+    needs: publish
+    runs-on: windows-latest
+    steps:
+      - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name != 'nightly')
+        name: Publish stable
+        uses: vedantmgoyal2009/winget-releaser@latest
+        with:
+          identifier: Neovim.Neovim
+          release-tag: ${{ github.event.inputs.tag_name || github.ref }}
+          token: ${{ secrets.WINGET_TOKEN }}
+      - if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
+        name: Get nightly version
+        id: get-version
+        run: |
+          Invoke-WebRequest https://github.com/neovim/neovim/releases/download/nightly/nvim-win64.msi -OutFile setup.msi
+          Install-Module -Name 'Carbon.Windows.Installer' -Force
+          $VERSION = (Get-CMsi (Resolve-Path .\setup.msi).Path).ProductVersion
+          echo "::set-output name=version::$VERSION"
+      - if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
+        name: Publish nightly
+        uses: vedantmgoyal2009/winget-releaser@latest
+        with:
+          identifier: Neovim.Neovim.Nightly
+          version: ${{ steps.get-version.outputs.version }}
+          release-tag: nightly
+          token: ${{ secrets.WINGET_TOKEN }}

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

@@ -0,0 +1,17 @@
+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@v3
+      - 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

@@ -0,0 +1,18 @@
+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@v3
+      - name: 'Request reviewers'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const script = require('./.github/scripts/reviews.js')
+            await script({github, context})

.github/workflows/squash-typos.yml

@@ -1,33 +0,0 @@
-name: Squash Typo Pull Requests
-
-on:
-  pull_request_target:
-    types: labeled
-concurrency:
-  group: ${{ github.workflow }} 
-jobs:
-  build:
-    if: github.event.label.name == 'typo'
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      pull-requests: write
-
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: actions/setup-python@v2
-
-    - name: Setup git config
-      run: |
-        git config --global user.name 'marvim'
-        git config --global user.email 'marvim@users.noreply.github.com'
-
-    - run: python scripts/squash_typos.py
-      env:
-        PR_NUMBER: ${{ github.event.number }}

.github/workflows/vim-patches.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   update-vim-patches:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
@@ -14,11 +14,11 @@ jobs:
       VERSION_BRANCH: marvim/ci-version-update
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           repository: vim/vim
           path: ${{ env.VIM_SOURCE_DIR }}
@@ -49,4 +49,4 @@ jobs:
           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 --fill --label vim-patch --base ${GITHUB_REF#refs/heads/} --head ${VERSION_BRANCH} || true
+          gh pr create --draft --fill --label vim-patch --base ${GITHUB_REF#refs/heads/} --head ${VERSION_BRANCH} || true

.gitignore

@@ -1,6 +1,7 @@
 # Tools
 /venv/
 compile_commands.json
+/.luarc.json
 
 # IDEs
 /.vs/
@@ -14,6 +15,7 @@ compile_commands.json
 /.clangd/
 /.cache/clangd/
 /.ccls-cache/
+/.clang-tidy
 
 .DS_Store
 *.mo
@@ -71,3 +73,5 @@ tags
 
 # vim patches
 /vim-*.patch
+
+/CMakeUserPresets.json

.luacheckrc

@@ -26,6 +26,17 @@ read_globals = {
   "vim",
 }
 
+globals = {
+  "vim.g",
+  "vim.b",
+  "vim.w",
+  "vim.o",
+  "vim.bo",
+  "vim.wo",
+  "vim.go",
+  "vim.env"
+}
+
 exclude_files = {
   'test/functional/fixtures/lua/syntax_error.lua',
 }

.mailmap

@@ -0,0 +1,137 @@
+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>
+bfredl <bjorn.linse@gmail.com>
+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>
+dundargoc <gocdundar@gmail.com> <33953936+dundargoc@users.noreply.github.com>
+dundargoc <gocdundar@gmail.com> Dundar Goc
+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
+Lewis Russell <lewis6991@gmail.com> <me@lewisr.dev>
+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 <thomas.vigouroux@protonmail.com> <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

.stylua.toml

@@ -0,0 +1,6 @@
+column_width = 100
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferSingle"
+call_parentheses = "Always"

.styluaignore

@@ -0,0 +1,3 @@
+/scripts
+/src
+/test

.travis.yml

@@ -1,220 +0,0 @@
-dist: bionic
-
-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"
-    # Install directory for Neovim.
-    - INSTALL_PREFIX="$HOME/nvim-install"
-    # Log directory for Clang sanitizers and Valgrind.
-    - LOG_DIR="$BUILD_DIR/log"
-    # Nvim log file.
-    - NVIM_LOG_FILE="$BUILD_DIR/.nvimlog"
-    # Default CMake flags.
-    - CMAKE_FLAGS="-DCI_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"
-    # 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"
-    # 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"
-    # default target name for functional tests
-    - FUNCTIONALTEST=functionaltest
-    - CI_TARGET=tests
-    # Environment variables for ccache
-    - 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
-
-addons:
-  apt:
-    packages: &common-apt-packages
-      - apport
-      - autoconf
-      - automake
-      - build-essential
-      - clang
-      - cmake
-      - cpanminus
-      - cscope
-      - gcc-multilib
-      - gdb
-      - gperf
-      - language-pack-tr
-      - libtool-bin
-      - locales
-      - ninja-build
-      - pkg-config
-      - unzip
-      - valgrind
-      - 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:
-    - master
-    - /^release-\d+\.\d+$/
-
-cache:
-  apt: true
-  ccache: true
-  directories:
-    - "$CACHE_NVIM_DEPS_DIR"
-
-git:
-  quiet: true
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/b5c38c99f9677aa3d031

CMakeLists.txt

@@ -1,16 +1,14 @@
 # CMAKE REFERENCE
 #   intro: https://codingnest.com/basic-cmake/
 #   best practices (3.0+): https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1
+#   pitfalls: https://izzys.casa/2019/02/everything-you-never-wanted-to-know-about-cmake/
 
 # Version should match the tested CMAKE_URL in .github/workflows/ci.yml.
 cmake_minimum_required(VERSION 3.10)
 project(nvim C)
 
-if(POLICY CMP0065)
-  cmake_policy(SET CMP0065 NEW)
-endif()
-if(POLICY CMP0060)
-  cmake_policy(SET CMP0060 NEW)
+if(POLICY CMP0075)
+  cmake_policy(SET CMP0075 NEW)
 endif()
 
 # Point CMake at any custom modules we may ship
@@ -18,6 +16,9 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # We don't support building in-tree.
 include(PreventInTreeBuilds)
+include(Util)
+
+set(TOUCHES_DIR ${PROJECT_BINARY_DIR}/touches)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -27,7 +28,7 @@ if(DEFINED ENV{DEPS_BUILD_DIR})
     # 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
+    # This check is also performed in the cmake.deps/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")
@@ -59,7 +60,7 @@ else()
         -DCMAKE_C_FLAGS_RELWITHDEBINFO=${CMAKE_C_FLAGS_RELWITHDEBINFO}
         -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}
         -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-        ${PROJECT_SOURCE_DIR}/third-party
+        ${PROJECT_SOURCE_DIR}/cmake.deps
       WORKING_DIRECTORY ${DEPS_BUILD_DIR})
     execute_process(
       COMMAND ${CMAKE_COMMAND} --build ${DEPS_BUILD_DIR}
@@ -68,13 +69,8 @@ else()
   endif()
 endif()
 
-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()
+list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX})
+set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
 
 # used for check_c_compiler_flag
 include(CheckCCompilerFlag)
@@ -88,10 +84,20 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   # them be included as one of the first places to look for dependencies.
   list(APPEND CMAKE_PREFIX_PATH /sw /opt/local)
 
+  # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET),
+  # fall back to local system version. Needs to be done both here and in cmake.deps.
+  if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+    execute_process(COMMAND sw_vers -productVersion
+                    OUTPUT_VARIABLE MACOS_VERSION
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}")
+  endif()
+  message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+
   # Work around some old, broken detection by CMake for knowing when to use the
   # isystem flag.  Apple's compilers have supported this for quite some time
   # now.
-  if(CMAKE_COMPILER_IS_GNUCC)
+  if(CMAKE_C_COMPILER_ID MATCHES "GNU")
     set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
   endif()
 endif()
@@ -116,32 +122,22 @@ endif()
 
 message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
 
-# Build type.
-if(NOT CMAKE_BUILD_TYPE)
-  message(STATUS "CMAKE_BUILD_TYPE not specified, default is 'Debug'")
-  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE)
-else()
-  message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
-endif()
+set_default_buildtype()
 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=...
-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 6)
-set(NVIM_VERSION_PATCH 0)
+set(NVIM_VERSION_MINOR 8)
+set(NVIM_VERSION_PATCH 1)
 set(NVIM_VERSION_PRERELEASE "") # for package maintainers
 
 # API level
-set(NVIM_API_LEVEL 8)         # Bump this after any API change.
+set(NVIM_API_LEVEL 10)         # Bump this after any API change.
 set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
 set(NVIM_API_PRERELEASE false)
 
@@ -175,7 +171,7 @@ if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
   string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCC)
+if(CMAKE_C_COMPILER_ID MATCHES "GNU")
   check_c_compiler_flag(-Og HAS_OG_FLAG)
 else()
   set(HAS_OG_FLAG 0)
@@ -273,14 +269,18 @@ int main(void)
 }
 " HAVE_BUILTIN_ADD_OVERFLOW)
 
+option(ENABLE_COMPILER_SUGGESTIONS "Enable -Wsuggest compiler warnings" OFF)
 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(-DWIN32)
+  add_definitions(-DMSWIN)
 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)
 
   check_c_compiler_flag(-Wimplicit-fallthrough HAVE_WIMPLICIT_FALLTHROUGH_FLAG)
@@ -288,6 +288,29 @@ else()
     add_compile_options(-Wimplicit-fallthrough)
   endif()
 
+  if(ENABLE_COMPILER_SUGGESTIONS)
+    # 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)
+    endif()
+  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")
@@ -298,6 +321,7 @@ endif()
 if(MINGW)
   # Use POSIX compatible stdio in Mingw
   add_definitions(-D__USE_MINGW_ANSI_STDIO)
+  add_definitions(-DMSWIN)
 endif()
 if(WIN32)
   # Windows Vista is the minimum supported version
@@ -343,7 +367,7 @@ option(CI_BUILD "CI, extra flags will be set" OFF)
 if(CI_BUILD)
   message(STATUS "CI build enabled")
   add_compile_options(-Werror)
-  if(DEFINED ENV{BUILD_32BIT})
+  if(DEFINED ENV{BUILD_UCHAR})
     # Get some test coverage for unsigned char
     add_compile_options(-funsigned-char)
   endif()
@@ -378,7 +402,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT P
     "${CMAKE_MODULE_LINKER_FLAGS} -image_base 100000000")
 endif()
 
-include_directories("${PROJECT_BINARY_DIR}/config")
+include_directories("${PROJECT_BINARY_DIR}/cmake.config")
 include_directories("${PROJECT_SOURCE_DIR}/src")
 
 find_package(LibUV 1.28.0 REQUIRED)
@@ -387,7 +411,7 @@ include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS})
 find_package(Msgpack 1.0.0 REQUIRED)
 include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS})
 
-find_package(LibLUV 1.30.0 REQUIRED)
+find_package(LibLUV 1.43.0 REQUIRED)
 include_directories(SYSTEM ${LIBLUV_INCLUDE_DIRS})
 
 find_package(TreeSitter REQUIRED)
@@ -408,12 +432,25 @@ main(void)
 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.
+# The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
 option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
 
 if(PREFER_LUA)
-  find_package(Lua 5.1 REQUIRED)
+  find_package(Lua 5.1 EXACT REQUIRED)
   set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
   set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES})
   # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped.
@@ -462,18 +499,13 @@ if(FEAT_TUI)
     add_definitions(-DNVIM_UNIBI_HAS_VAR_FROM)
   endif()
 
-  find_package(LibTermkey 0.18 REQUIRED)
+  find_package(LibTermkey 0.22 REQUIRED)
   include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS})
 endif()
 
-find_package(LIBVTERM 0.1 REQUIRED)
+find_package(LIBVTERM 0.3 REQUIRED)
 include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS})
 
-if(WIN32)
-  find_package(Winpty 0.4.3 REQUIRED)
-  include_directories(SYSTEM ${WINPTY_INCLUDE_DIRS})
-endif()
-
 option(CLANG_ASAN_UBSAN "Enable Clang address & undefined behavior sanitizer for nvim binary." OFF)
 option(CLANG_MSAN "Enable Clang memory sanitizer for nvim binary." OFF)
 option(CLANG_TSAN "Enable Clang thread sanitizer for nvim binary." OFF)
@@ -543,6 +575,29 @@ endif()
 
 message(STATUS "Using Lua interpreter: ${LUA_PRG}")
 
+option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" ON)
+
+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)
@@ -550,17 +605,78 @@ if(NOT BUSTED_OUTPUT_TYPE)
   set(BUSTED_OUTPUT_TYPE "nvim")
 endif()
 
+#
+# Lint
+#
 find_program(LUACHECK_PRG luacheck)
+find_program(STYLUA_PRG stylua)
 find_program(FLAKE8_PRG flake8)
-find_program(GPERF_PRG gperf)
+find_program(UNCRUSTIFY_PRG uncrustify)
+find_program(SHELLCHECK_PRG shellcheck)
+
+add_glob_targets(
+  REQUIRED
+  TARGET lintlua-luacheck
+  COMMAND ${LUACHECK_PRG}
+  FLAGS -q
+  GLOB_DIRS runtime/ scripts/ src/ test/
+  GLOB_PAT *.lua
+  TOUCH_STRATEGY SINGLE
+  )
+
+add_glob_targets(
+  TARGET lintlua-stylua
+  COMMAND ${STYLUA_PRG}
+  FLAGS --color=always --check
+  GLOB_DIRS runtime/
+  GLOB_PAT *.lua
+  TOUCH_STRATEGY SINGLE
+  )
+
+add_custom_target(lintlua)
+add_dependencies(lintlua lintlua-luacheck lintlua-stylua)
 
 include(InstallHelpers)
+add_glob_targets(
+  TARGET lintpy
+  COMMAND ${FLAKE8_PRG}
+  FLAGS --max-line-length 100
+  GLOB_DIRS contrib scripts src test
+  GLOB_PAT *.py
+  TOUCH_STRATEGY SINGLE
+  )
+
+add_glob_targets(
+  TARGET lintsh
+  COMMAND ${SHELLCHECK_PRG}
+  FILES scripts/vim-patch.sh
+  TOUCH_STRATEGY SINGLE
+  )
+
+add_custom_target(lintcommit
+  COMMAND ${PROJECT_BINARY_DIR}/bin/nvim -u NONE -es -c [[lua require('scripts.lintcommit').main({trace=false})]]
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+  VERBATIM)
+add_dependencies(lintcommit nvim)
+
+add_custom_target(lint)
+add_dependencies(lint check-single-includes lintc lintlua lintpy lintsh lintcommit lintuncrustify)
+
+#
+# Format
+#
+add_custom_target(formatlua
+  COMMAND ${CMAKE_COMMAND}
+    -D FORMAT_PRG=${STYLUA_PRG}
+    -D LANG=lua
+    -P ${PROJECT_SOURCE_DIR}/cmake/Format.cmake
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+
+add_custom_target(format)
+add_dependencies(format formatc formatlua)
 
-file(GLOB MANPAGES
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  man/nvim.1)
 install_helper(
-  FILES ${MANPAGES}
+  FILES ${CMAKE_SOURCE_DIR}/src/man/nvim.1
   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
 #
@@ -570,7 +686,7 @@ install_helper(
 add_subdirectory(src/nvim)
 get_directory_property(NVIM_VERSION_CFLAGS DIRECTORY src/nvim DEFINITION NVIM_VERSION_CFLAGS)
 add_subdirectory(test/includes)
-add_subdirectory(config)
+add_subdirectory(cmake.config)
 add_subdirectory(test/functional/fixtures)  # compile test programs
 add_subdirectory(runtime)
 get_directory_property(GENERATED_HELP_TAGS DIRECTORY runtime DEFINITION GENERATED_HELP_TAGS)
@@ -593,20 +709,9 @@ if(BUSTED_PRG)
   list(APPEND TEST_TARGET_ARGS "USES_TERMINAL")
 
   set(UNITTEST_PREREQS nvim-test unittest-headers)
-  set(FUNCTIONALTEST_PREREQS nvim printenv-test printargs-test shell-test streams-test tty-test ${GENERATED_HELP_TAGS})
+  set(FUNCTIONALTEST_PREREQS nvim printenv-test printargs-test shell-test pwsh-test streams-test tty-test ${GENERATED_HELP_TAGS})
   set(BENCHMARK_PREREQS nvim tty-test)
 
-  # Useful for automated build systems, if they want to manually run the tests.
-  add_custom_target(unittest-prereqs
-    DEPENDS ${UNITTEST_PREREQS})
-  set_target_properties(unittest-prereqs PROPERTIES FOLDER test)
-
-  add_custom_target(functionaltest-prereqs
-    DEPENDS ${FUNCTIONALTEST_PREREQS})
-
-  add_custom_target(benchmark-prereqs
-    DEPENDS ${BENCHMARK_PREREQS})
-
   check_lua_module(${LUA_PRG} "ffi" LUA_HAS_FFI)
   if(LUA_HAS_FFI)
     add_custom_target(unittest
@@ -632,11 +737,11 @@ if(BUSTED_PRG)
     set(TEST_LIBNVIM_PATH "")
   endif()
   configure_file(
-    ${CMAKE_SOURCE_DIR}/test/config/paths.lua.in
-    ${CMAKE_BINARY_DIR}/test/config/paths.lua.gen)
+    ${CMAKE_SOURCE_DIR}/test/cmakeconfig/paths.lua.in
+    ${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua.gen)
   file(GENERATE
-    OUTPUT ${CMAKE_BINARY_DIR}/test/config/paths.lua
-    INPUT ${CMAKE_BINARY_DIR}/test/config/paths.lua.gen)
+    OUTPUT ${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua
+    INPUT ${CMAKE_BINARY_DIR}/test/cmakeconfig/paths.lua.gen)
 
   add_custom_target(functionaltest
     COMMAND ${CMAKE_COMMAND}
@@ -651,8 +756,7 @@ if(BUSTED_PRG)
       -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
     DEPENDS ${FUNCTIONALTEST_PREREQS}
     ${TEST_TARGET_ARGS})
-  set_target_properties(functionaltest functionaltest-prereqs
-    PROPERTIES FOLDER test)
+  set_target_properties(functionaltest PROPERTIES FOLDER test)
 
   add_custom_target(benchmark
     COMMAND ${CMAKE_COMMAND}
@@ -667,7 +771,7 @@ if(BUSTED_PRG)
       -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
     DEPENDS ${BENCHMARK_PREREQS}
     ${TEST_TARGET_ARGS})
-  set_target_properties(benchmark benchmark-prereqs PROPERTIES FOLDER test)
+  set_target_properties(benchmark PROPERTIES FOLDER test)
 endif()
 
 if(BUSTED_LUA_PRG)
@@ -687,34 +791,9 @@ if(BUSTED_LUA_PRG)
     set_target_properties(functionaltest-lua PROPERTIES FOLDER test)
 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")
-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)
-
-#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)
+add_custom_target(uninstall
+  COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/UninstallHelper.cmake)
+
+if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+  add_subdirectory(cmake.packaging)
 endif()

CMakePresets.json

@@ -0,0 +1,95 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "base",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build",
+      "hidden": true
+    },
+    {
+      "name": "default",
+      "displayName": "RelWithDebInfo",
+      "description": "Enables optimizations (-Og or -O2) with debug information",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+      },
+      "inherits": [
+        "base"
+      ]
+    },
+    {
+      "name": "debug",
+      "displayName": "Debug",
+      "description": "Disables optimizations (-O0), enables debug information",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      },
+      "inherits": [
+        "base"
+      ]
+    },
+    {
+      "name": "release",
+      "displayName": "Release",
+      "description": "Same as RelWithDebInfo, but disables debug information",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      },
+      "inherits": [
+        "base"
+      ]
+    },
+    {
+      "name": "windows-default",
+      "displayName": "Windows x64 RelWithDebInfo",
+      "description": "Sets Ninja generator, enables optimizations with debug information for x64",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+      },
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
+      "vendor": {
+        "microsoft.com/VisualStudioSettings/CMake/1.0": {
+          "hostOS": [
+            "Windows"
+          ]
+        }
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      },
+      "inherits": [
+        "base"
+      ]
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "default",
+      "configurePreset": "default"
+    },
+    {
+      "name": "debug",
+      "configurePreset": "debug"
+    },
+    {
+      "name": "release",
+      "configurePreset": "release"
+    },
+    {
+      "name": "windows-default",
+      "configurePreset": "windows-default",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    }
+  ]
+}

CONTRIBUTING.md

@@ -7,11 +7,14 @@ 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 [good first issue](../../labels/good-first-issue) or [complexity:low] issue.
+- Try a [complexity:low] issue.
 - Fix bugs found by [Clang](#clang-scan-build), [PVS](#pvs-studio) or
   [Coverity](#coverity).
-- [Improve documentation][wiki-contribute-help]
+- [Improve documentation](#documenting)
+- [Merge a Vim patch] (requires strong familiarity with Vim)
+  - NOTE: read the above link before sending improvements to "runtime files" (anything in `runtime/`).
+    - Vimscript and documentation files are (mostly) maintained by [Vim](https://github.com/vim/vim), not Nvim.
+    - Lua files are maintained by Nvim.
 
 Reporting problems
 ------------------
@@ -30,9 +33,9 @@ Reporting problems
 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.
+- Read [:help dev](https://neovim.io/doc/user/develop.html#dev) if you are working on Nvim core.
+- Read [:help dev-ui](https://neovim.io/doc/user/develop.html#dev-ui) if you are developing a UI.
+- Read [:help dev-api-client](https://neovim.io/doc/user/develop.html#dev-api-client) if you are developing an API client.
 - Install `ninja` for faster builds of Nvim.
   ```
   sudo apt-get install ninja-build
@@ -47,21 +50,19 @@ Pull requests (PRs)
 - Your PR must include [test coverage][run-tests].
 - 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.
-  - After addressing review comments, it's fine to rebase and force-push.
-- Use a **merge workflow** for big, high-risk PRs.
+- Use a _rebase workflow_ for small PRs.
+  - After addressing review comments, it's fine to force-push.
+- Use a _merge workflow_ (as opposed to "rebase") for big, high-risk PRs.
   - Merge `master` into your PR when there are conflicts or when master
     introduces breaking changes.
-  - Use the `ri` git alias:
-    ```
-    [alias]
-    ri = "!sh -c 't=\"${1:-master}\"; s=\"${2:-HEAD}\"; mb=\"$(git merge-base \"$t\" \"$s\")\"; if test \"x$mb\" = x ; then o=\"$t\"; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\"; if test \"x$lm\" = x ; then o=\"$mb\"; else o=\"$lm\"; fi; fi; test $# -gt 0 && shift; test $# -gt 0 && shift; git rebase --interactive \"$o\" \"$@\"'"
-    ```
-    This avoids unnecessary rebases yet still allows you to combine related
-    commits, separate monolithic commits, etc.
   - Do not edit commits that come before the merge commit.
-- During a squash/fixup, use `exec make -C build unittest` between each
-  pick/edit/reword.
+
+### Merging to master
+
+For maintainers: when a PR is ready to merge to master,
+
+- prefer _Squash Merge_ for "single-commit PRs" (when the PR has only one meaningful commit).
+- prefer _Merge_ for "multi-commit PRs" (when the PR has multiple meaningful commits).
 
 ### Stages: Draft and Ready for review
 
@@ -92,7 +93,7 @@ the VCS/git logs more valuable. The general structure of a commit message is:
 ```
 
 - 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`
+    - `build`, `ci`, `docs`, `feat`, `fix`, `perf`, `refactor`, `revert`, `test`, `vim-patch`, `dist`
     - 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.
@@ -111,7 +112,7 @@ the VCS/git logs more valuable. The general structure of a commit message is:
 
 ### 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 [Cirrus CI] and [GitHub Actions].
 
 - CI builds are compiled with [`-Werror`][gcc-warnings], so compiler warnings
   will fail the build.
@@ -125,20 +126,7 @@ Each pull request must pass the automated builds on [sourcehut] and [GitHub Acti
 - 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
-
-      # 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
-      ```
+- CI for FreeBSD runs on [Cirrus CI].
 
 ### Clang scan-build
 
@@ -218,6 +206,11 @@ You can lint a single file (but this will _not_ exclude legacy errors):
 
 ### Style
 
+- You can format files by using:
+  ```
+    make format
+  ```
+  This will format changed Lua and C files with all appropriate flags set.
 - Style rules are (mostly) defined by `src/uncrustify.cfg` which tries to match
   the [style-guide]. To use the Nvim `gq` command with `uncrustify`:
   ```
@@ -240,11 +233,61 @@ You can lint a single file (but this will _not_ exclude legacy errors):
   ```
   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).
 
+- Recommendation is to use **[clangd]**.
+  Can use the maintained config in [nvim-lspconfig/clangd].
+- 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
+
+### Includes
+
+For managing includes in C files, use [include-what-you-use].
+
+- [Install include-what-you-use][include-what-you-use-install]
+- Run with:
+  ```
+  make CMAKE_EXTRA_FLAGS=-DCMAKE_C_INCLUDE_WHAT_YOU_USE=include-what-you-use | tee iwyu.txt
+  ```
+
+See [#549][549] for more details.
+
+Documenting
+-----------
+
+Many parts of the `:help` documentation are autogenerated from C or Lua docstrings using the `./scripts/gen_vimdoc.py` script.
+You can filter the regeneration based on the target (api, lua, or lsp), or the file you changed, that need a doc refresh using `./scripts/gen_vimdoc.py -t <target>`.
+
+## Lua docstrings
+
+Lua documentation uses a subset of [EmmyLua] annotations. A rough outline of a function documentation is
+
+```lua
+--- {Brief}
+---
+--- {Long explanation}
+---
+---@param arg1 type {description}
+---@param arg2 type {description}
+{...}
+---
+---@return type {description}
+```
+
+If possible, always add type information (`table`, `string`, `number`, ...). Multiple valid types are separated by a bar (`string|table`). Indicate optional parameters via `type|nil`.
+
+If a function in your Lua module should not be documented (e.g. internal function or local function), you should set the doc comment to:
+
+```
+---@private
+```
+
+Mark functions that are deprecated as 
+```
+---@deprecated
+```
 
 Reviewing
 ---------
@@ -252,39 +295,46 @@ 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 [`hub`][hub], you can create a new branch with the contents of a pull
+Using [GitHub CLI][gh], you can create a new branch with the contents of a pull
 request, e.g. [#1820][1820]:
 
-    hub checkout https://github.com/neovim/neovim/pull/1820
+    gh pr 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`
 shows each commit's diff. To show the whole surrounding function of a change
 as context, use the `-W` argument as well.
 
+[549]: https://github.com/neovim/neovim/issues/549
+[1820]: https://github.com/neovim/neovim/pull/1820
+[3174]: https://github.com/neovim/neovim/issues/3174
+[ASan]: http://clang.llvm.org/docs/AddressSanitizer.html
+[Cirrus CI]: https://cirrus-ci.com/github/neovim/neovim
+[Clang report]: https://neovim.io/doc/reports/clang/
+[GitHub Actions]: https://github.com/neovim/neovim/actions
+[clangd]: https://clangd.llvm.org
+[Merge a Vim patch]: https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-Vim
+[complexity:low]: https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow
+[conventional_commits]: https://www.conventionalcommits.org
+[EmmyLua]: https://github.com/sumneko/lua-language-server/wiki/Annotations
 [gcc-warnings]: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
+[gh]: https://cli.github.com/
 [git-bisect]: http://git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git
 [git-feature-branch]: https://www.atlassian.com/git/tutorials/comparing-workflows
 [git-history-filtering]: https://www.atlassian.com/git/tutorials/git-log/filtering-the-commit-history
 [git-history-rewriting]: http://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
 [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
-[hub]: https://hub.github.com/
-[conventional_commits]: https://www.conventionalcommits.org
-[style-guide]: https://neovim.io/doc/user/dev_style.html#dev-style
-[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
-[Merge a Vim patch]: https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-Vim
-[Clang report]: https://neovim.io/doc/reports/clang/
-[complexity:low]: https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow
+[include-what-you-use-install]: https://github.com/include-what-you-use/include-what-you-use#how-to-install
+[include-what-you-use]: https://github.com/include-what-you-use/include-what-you-use#using-with-cmake
+[lua-language-server]: https://github.com/sumneko/lua-language-server/
 [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/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request
+[nvim-lspconfig/clangd]: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#clangd
+[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]: https://formulae.brew.sh/formula/uncrustify
+[review-checklist]: https://github.com/neovim/neovim/wiki/Code-review-checklist
+[run-tests]: https://github.com/neovim/neovim/blob/master/test/README.md#running-tests
+[style-guide]: https://neovim.io/doc/user/dev_style.html#dev-style
+[uncrustify]: http://uncrustify.sourceforge.net/
+[wiki-contribute-help]: https://github.com/neovim/neovim/wiki/contribute-%3Ahelp
+[wiki-faq]: https://github.com/neovim/neovim/wiki/FAQ

LICENSE.txt

@@ -8,7 +8,7 @@ Neovim's license follows:
 ====
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -196,10 +196,11 @@ The externally maintained libraries used by Neovim are:
   - libtermkey: MIT license
   - libuv. Copyright Joyent, Inc. and other Node contributors. Node.js license.
   - libvterm: MIT license
+  - lua-cjson: MIT license
   - lua-compat: MIT license
   - tree-sitter: MIT license
-  - xdiff: LGPL license
-  - lua-cjson: MIT license
+  - unibilium: LGPL v3
+  - xdiff: LGPL v2
 
 ====
 

MAINTAIN.md

@@ -12,23 +12,23 @@ General guidelines
 * Use automation to solve problems
 * Never break the API... but sometimes break the UI
 
-Ticket triage
--------------
+Issue 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:
 
-- Next bugfix-release (1.0.x)
-- Next feature-release (1.x.0)
+* Next bugfix-release (1.0.x)
+* Next feature-release (1.x.0)
 
 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
+* 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.
-- Comment activity or new information.
+* Comment activity or new information.
 
 Anything that isn't in the next milestone, and doesn't have a finished PR—is
 just not something you care very much about, by construction. Post-release you
@@ -50,43 +50,56 @@ has a major bug:
 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/bot-ci/blob/master/ci/nightly.sh)
-      will update the release assets based on the `stable` tag.
+    * Run `./scripts/release.sh`
+    * Update (force-push) the remote `stable` tag.
+    * The [CI job](https://github.com/neovim/neovim/blob/3d45706478cd030c3ee05b4f336164bb96138095/.github/workflows/release.yml#L11-L13)
+      will update the release assets and force-push to the `stable` tag.
 
-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.
+### Release automation
+
+Neovim automation includes a [backport bot](https://github.com/zeebe-io/backport-action).
+Trigger the action by labeling a PR with `backport release-X.Y`. See `.github/workflows/backport.yml`.
 
 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)
+These "bundled" dependencies can be updated by bumping their versions in `cmake.deps/CMakeLists.txt`.
+Some can be auto-bumped by `scripts/bump-deps.sh`.
 
-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)
+* [LuaJIT](https://github.com/LuaJIT/LuaJIT)
+* [Lua](https://www.lua.org/download.html)
+* [Luv](https://github.com/luvit/luv)
+* [gettext](https://ftp.gnu.org/pub/gnu/gettext/)
+* [libiconv](https://ftp.gnu.org/pub/gnu/libiconv)
+* [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)
+* [msys2](https://github.com/msys2/MINGW-packages) (for mingw Windows build)
+    * Changes to mingw can [break our mingw build](https://github.com/msys2/MINGW-packages/issues/9946).
+* [tree-sitter](https://github.com/tree-sitter/tree-sitter)
+* [unibilium](https://github.com/neovim/unibilium)
 
-We also maintain some forks, particularly for Windows, if we are waiting on upstream changes:
-https://github.com/neovim/neovim/wiki/Deps
+### Vendored dependencies
+
+These dependencies are "vendored" (inlined), we must update the sources manually:
+
+* `src/mpack/`: [libmpack](https://github.com/libmpack/libmpack)
+    * send improvements upstream!
+* `src/xdiff/`: [xdiff](https://github.com/git/git/tree/master/xdiff)
+* `src/cjson/`: [lua-cjson](https://github.com/openresty/lua-cjson)
+* `src/nvim/lib/`: [Klib](https://github.com/attractivechaos/klib)
+* `runtime/lua/vim/inspect.lua`: [inspect.lua](https://github.com/kikito/inspect.lua)
+* `src/nvim/tui/terminfo_defs.h`: terminfo definitions
+    * Run `scripts/update_terminfo.sh` to update these definitions.
+* [treesitter parsers](https://github.com/neovim/neovim/blob/fcc24e43e0b5f9d801a01ff2b8f78ce8c16dd551/cmake.deps/CMakeLists.txt#L197-L210)
+
+### Forks
+
+We may maintain forks, 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
+* https://github.com/neovim/neovim/issues/862
+* https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt

Makefile

@@ -47,13 +47,7 @@ endif
 
 ifeq (,$(BUILD_TOOL))
   ifeq (Ninja,$(CMAKE_GENERATOR))
-    ifneq ($(shell $(CMAKE_PRG) --help 2>/dev/null | grep Ninja),)
-      BUILD_TOOL = ninja
-    else
-      # User's version of CMake doesn't support Ninja
-      BUILD_TOOL = $(MAKE)
-      CMAKE_GENERATOR := Unix Makefiles
-    endif
+    BUILD_TOOL = ninja
   else
     BUILD_TOOL = $(MAKE)
   endif
@@ -102,7 +96,7 @@ build/.ran-cmake: | deps
 	cd build && $(CMAKE_PRG) -G '$(CMAKE_GENERATOR)' $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) $(MAKEFILE_DIR)
 	touch $@
 
-deps: | build/.ran-third-party-cmake
+deps: | build/.ran-deps-cmake
 ifeq ($(call filter-true,$(USE_BUNDLED)),)
 	+$(BUILD_TOOL) -C $(DEPS_BUILD_DIR)
 endif
@@ -110,12 +104,12 @@ endif
 ifeq ($(call filter-true,$(USE_BUNDLED)),)
 $(DEPS_BUILD_DIR):
 	mkdir -p "$@"
-build/.ran-third-party-cmake:: $(DEPS_BUILD_DIR)
+build/.ran-deps-cmake:: $(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
+		$(DEPS_CMAKE_FLAGS) $(MAKEFILE_DIR)/cmake.deps
 endif
-build/.ran-third-party-cmake::
+build/.ran-deps-cmake::
 	mkdir -p build
 	touch $@
 
@@ -133,50 +127,11 @@ endif
 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
+functionaltest functionaltest-lua unittest benchmark: | nvim
+	$(BUILD_TOOL) -C build $@
 
-# Builds help HTML _and_ checks for invalid help tags.
-helphtml: | nvim build/runtime/doc/tags
-	+$(BUILD_TOOL) -C build doc_html
-
-functionaltest: | nvim
-	+$(BUILD_TOOL) -C build functionaltest
-
-functionaltest-lua: | nvim
-	+$(BUILD_TOOL) -C build functionaltest-lua
-
-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) --clean -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)"
-
-unittest: | nvim
-	+$(BUILD_TOOL) -C build unittest
-
-benchmark: | nvim
-	+$(BUILD_TOOL) -C build benchmark
+lintlua lintsh lintpy lintuncrustify lintc lintcfull check-single-includes generated-sources lintcommit lint formatc formatlua format: | build/.ran-cmake
+	$(CMAKE_PRG) --build build --target $@
 
 test: functionaltest unittest
 
@@ -193,18 +148,6 @@ distclean:
 install: checkprefix nvim
 	+$(BUILD_TOOL) -C build install
 
-clint: build/.ran-cmake
-	+$(BUILD_TOOL) -C build clint
-
-clint-full: build/.ran-cmake
-	+$(BUILD_TOOL) -C build clint-full
-
-check-single-includes: build/.ran-cmake
-	+$(BUILD_TOOL) -C build check-single-includes
-
-generated-sources: build/.ran-cmake
-	+$(BUILD_TOOL) -C build generated-sources
-
 appimage:
 	bash scripts/genappimage.sh
 
@@ -214,8 +157,6 @@ appimage:
 appimage-%:
 	bash scripts/genappimage.sh $*
 
-lint: check-single-includes clint lualint _opt_pylint _opt_shlint _opt_commitlint
-
 # Generic pattern rules, allowing for `make build/bin/nvim` etc.
 # Does not work with "Unix Makefiles".
 ifeq ($(CMAKE_GENERATOR),Ninja)
@@ -226,4 +167,4 @@ $(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 lintlua lintpy lintsh functionaltest unittest lint lintc clean distclean nvim libnvim cmake deps install appimage checkprefix lintcommit formatc formatlua format

README.md

@@ -1,11 +1,12 @@
-[![Neovim](https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo-300x87.png)](https://neovim.io)
+<h1 align="center">
+  <img src="https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo-300x87.png" alt="Neovim">
+</h1>
 
 [Documentation](https://neovim.io/doc/general/) |
 [Chat](https://app.element.io/#/room/#neovim:matrix.org) |
 [Twitter](https://twitter.com/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)
-[![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)
 [![PVS-Studio analysis](https://neovim.io/doc/reports/pvs/badge.svg)](https://neovim.io/doc/reports/pvs/PVS-studio.html.d)
@@ -61,7 +62,7 @@ After installing the dependencies, run the following command.
 
 To install to a non-default location:
 
-    make CMAKE_INSTALL_PREFIX=/full/path/
+    make CMAKE_BUILD_TYPE=RelWithDebInfo CMAKE_INSTALL_PREFIX=/full/path/
     make install
 
 CMake hints for inspecting the build:
@@ -79,8 +80,10 @@ Project layout
 --------------
 
     ├─ ci/              build automation
-    ├─ cmake/           build scripts
-    ├─ runtime/         user plugins/docs
+    ├─ cmake/           CMake utils
+    ├─ cmake.config/    CMake defines
+    ├─ cmake.deps/      subproject to fetch and build dependencies (optional)
+    ├─ runtime/         plugins and docs
     ├─ src/nvim/        application source code (see src/nvim/README.md)
     │  ├─ api/          API subsystem
     │  ├─ eval/         VimL subsystem
@@ -91,7 +94,6 @@ Project layout
     │  ├─ msgpack_rpc/  RPC subsystem
     │  ├─ os/           low-level platform code
     │  └─ tui/          built-in UI
-    ├─ third-party/     CMake subproject to build dependencies
     └─ test/            tests (see test/README.md)
 
 License
@@ -119,7 +121,7 @@ Apache 2.0 license, except for contributions copied from Vim (identified by the
 [Managed packages]: https://github.com/neovim/neovim/wiki/Installing-Neovim#install-from-package
 [Debian]: https://packages.debian.org/testing/neovim
 [Ubuntu]: http://packages.ubuntu.com/search?keywords=neovim
-[Fedora]: https://apps.fedoraproject.org/packages/neovim
+[Fedora]: https://packages.fedoraproject.org/pkgs/neovim/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

ci/before_cache.sh

@@ -7,16 +7,13 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/suite.sh"
 
+mkdir -p "${HOME}/.cache"
+
 echo "before_cache.sh: cache size"
 du -chd 1 "${HOME}/.cache" | sort -rh | head -20
 
-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; then
+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}"

ci/before_install.sh

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-echo 'Python info:'
-(
-  set -x
-  python3 --version
-  python2 --version
-  python --version
-  pip3 --version
-  pip2 --version
-  pip --version
-
-  pyenv --version
-  pyenv versions
-) 2>&1 | sed 's/^/  /' || true
-
-# Use pyenv, but not for OSX on Travis, where it only has the "system" version.
-if [[ "${TRAVIS_OS_NAME}" != osx ]] && command -v pyenv; then
-  echo 'Setting Python versions via pyenv'
-
-  # Prefer Python 2 over 3 (more conservative).
-  pyenv global 2.7:3.8
-
-  echo 'Updated Python info:'
-  (
-    set -x
-    python3 --version
-    python2 --version
-    python --version
-
-    python3 -m pip --version
-    python2 -m pip --version
-  ) 2>&1 | sed 's/^/  /'
-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 10

ci/before_script.sh

@@ -6,12 +6,6 @@ set -o pipefail
 CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 
-# Enable ipv6 on Travis. ref: a39c8b7ce30d
-if test -n "${TRAVIS_OS_NAME}" && ! test "${TRAVIS_OS_NAME}" = osx ; then
-  echo "before_script.sh: enable ipv6"
-  sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
-fi
-
 # Test some of the configuration variables.
 if [[ -n "${GCOV}" ]] && [[ ! $(type -P "${GCOV}") ]]; then
   echo "\$GCOV: '${GCOV}' is not executable."
@@ -22,18 +16,6 @@ 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
-
-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
 

ci/build.ps1

@@ -1,24 +1,32 @@
-param([switch]$NoTests)
+[CmdletBinding(DefaultParameterSetName = "Build")]
+param(
+  [Parameter(ParameterSetName="Build")][switch]$Build,
+  [Parameter(ParameterSetName="BuildDeps")][switch]$BuildDeps,
+  [Parameter(ParameterSetName="EnsureTestDeps")][switch]$EnsureTestDeps,
+  [Parameter(ParameterSetName="Package")][switch]$Package,
+  [Parameter(ParameterSetName="Test")][switch]$Test,
+  [Parameter(ParameterSetName="TestOld")][switch]$TestOld
+)
+
 Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
 
-$env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$'
-$compiler = $Matches.compiler
-$compileOption = if ($Matches -contains 'option') {$Matches.option} else {''}
-$bits = $Matches.bits
-$cmakeBuildType = $(if ($env:CMAKE_BUILD_TYPE -ne $null) {$env:CMAKE_BUILD_TYPE} else {'RelWithDebInfo'});
-$buildDir = [System.IO.Path]::GetFullPath("$(pwd)")
+$projectDir = [System.IO.Path]::GetFullPath("$(Get-Location)")
+$buildDir = Join-Path -Path $projectDir -ChildPath "build"
+
+# $env:CMAKE_BUILD_TYPE is ignored by cmake when not using ninja
+$cmakeBuildType = $(if ($null -ne $env:CMAKE_BUILD_TYPE) {$env:CMAKE_BUILD_TYPE} else {'RelWithDebInfo'});
 $depsCmakeVars = @{
-  CMAKE_BUILD_TYPE = $cmakeBuildType;
+  CMAKE_BUILD_TYPE=$cmakeBuildType;
 }
 $nvimCmakeVars = @{
-  CMAKE_BUILD_TYPE = $cmakeBuildType;
+  CMAKE_BUILD_TYPE=$cmakeBuildType;
   BUSTED_OUTPUT_TYPE = 'nvim';
-  DEPS_PREFIX=$(if ($env:DEPS_PREFIX -ne $null) {$env:DEPS_PREFIX} else {".deps/usr"});
+  DEPS_PREFIX=$(if ($null -ne $env:DEPS_PREFIX) {$env:DEPS_PREFIX} else {".deps/usr"});
 }
-if ($env:DEPS_BUILD_DIR -eq $null) {
-  $env:DEPS_BUILD_DIR = ".deps";
+if ($null -eq $env:DEPS_BUILD_DIR) {
+  $env:DEPS_BUILD_DIR = Join-Path -Path $projectDir -ChildPath ".deps"
 }
 $uploadToCodeCov = $false
 
@@ -28,141 +36,97 @@ function exitIfFailed() {
   }
 }
 
-if (-not $NoTests) {
-  node --version
-  npm.cmd --version
+function convertToCmakeArgs($vars) {
+  return $vars.GetEnumerator() | ForEach-Object { "-D$($_.Key)=$($_.Value)" }
 }
 
-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'
-  }
-  elseif ($bits -eq 64) {
-    $arch = 'x86_64'
-  }
-  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({
-    "mingw-w64-$arch-$_"
-  })
-
-  # Add MinGW to the PATH
-  $env:PATH = "C:\msys64\mingw$bits\bin;$env:PATH"
-
-  # Avoid pacman "warning" which causes non-zero return code. https://github.com/open62541/open62541/issues/2068
-  & 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
-  C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S $mingwPackages" ; exitIfFailed
-}
-elseif ($compiler -eq 'MSVC') {
-  $cmakeGeneratorArgs = '/verbosity:normal'
-  if ($bits -eq 32) {
-    $cmakeGenerator = 'Visual Studio 15 2017'
-  }
-  elseif ($bits -eq 64) {
-    $cmakeGenerator = 'Visual Studio 15 2017 Win64'
+$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=x64 -no_logo && set" | ForEach-Object {
+    $name, $value = $_ -split '=', 2
+    Set-Content env:\"$name" $value
   }
 }
 
-if (-not $NoTests) {
-  # Setup python (use AppVeyor system python)
+function BuildDeps {
 
-  # Disambiguate python3, if needed
-  if (-not (Test-Path -Path C:\hostedtoolcache\windows\Python\3.5.4\x64\python3.exe) ) {
-    move C:\hostedtoolcache\windows\Python\3.5.4\x64\python.exe C:\hostedtoolcache\windows\Python\3.5.4\x64\python3.exe
+  if (Test-Path -PathType container $env:DEPS_BUILD_DIR) {
+    $cachedBuildTypeStr = $(Get-Content $env:DEPS_BUILD_DIR\CMakeCache.txt | Select-String -Pattern "CMAKE_BUILD_TYPE.*=($cmakeBuildType)")
+    if (-not $cachedBuildTypeStr) {
+      Write-Warning " unable to validate build type from cache dir ${env:DEPS_BUILD_DIR}"
+    }
   }
-  $env:PATH = "C:\hostedtoolcache\windows\Python\2.7.18\x64;C:\hostedtoolcache\windows\Python\3.5.4\x64;$env:PATH"
 
-  python -m pip install pynvim ; exitIfFailed
-  python3 -m pip install pynvim ; exitIfFailed
+  # we currently can't use ninja for cmake.deps, see #19405
+  $depsCmakeGenerator = "Visual Studio 16 2019"
+  $depsCmakeGeneratorPlf = "x64"
+  cmake -S "$projectDir\cmake.deps" -B $env:DEPS_BUILD_DIR -G $depsCmakeGenerator -A $depsCmakeGeneratorPlf $(convertToCmakeArgs($depsCmakeVars)); exitIfFailed
+
+  $depsCmakeNativeToolOptions= @('/verbosity:normal', '/m')
+  cmake --build $env:DEPS_BUILD_DIR --config $cmakeBuildType -- $depsCmakeNativeToolOptions; exitIfFailed
+}
+
+function Build {
+  cmake -S $projectDir -B $buildDir $(convertToCmakeArgs($nvimCmakeVars)) -G Ninja; exitIfFailed
+  cmake --build $buildDir --config $cmakeBuildType; exitIfFailed
+}
+
+function EnsureTestDeps {
+  & $buildDir\bin\nvim.exe "--version"; exitIfFailed
+
+  # Ensure that the "win32" feature is set.
+  & $buildDir\bin\nvim -u NONE --headless -c 'exe !has(\"win32\").\"cq\"' ; exitIfFailed
+
+  python -m pip install pynvim
   # Sanity check
-  python  -c "import pynvim; print(str(pynvim))" ; exitIfFailed
-  python3 -c "import pynvim; print(str(pynvim))" ; exitIfFailed
+  python -c "import pynvim; print(str(pynvim))"; exitIfFailed
 
   gem.cmd install --pre neovim
-  Get-Command -CommandType Application neovim-ruby-host.bat
+  Get-Command -CommandType Application neovim-ruby-host.bat; exitIfFailed
 
-  npm.cmd install -g neovim
-  Get-Command -CommandType Application neovim-node-host.cmd
+  node --version
+  npm.cmd --version
+
+  npm.cmd install -g neovim; exitIfFailed
+  Get-Command -CommandType Application neovim-node-host.cmd; exitIfFailed
   npm.cmd link neovim
+
+  if ($env:USE_LUACOV -eq 1) {
+    & $env:DEPS_PREFIX\luarocks\luarocks.bat install cluacov
+  }
 }
 
-if ($compiler -eq 'MSVC') {
-  # Required for LuaRocks (https://github.com/luarocks/luarocks/issues/1039#issuecomment-507296940).
-  $env:VCINSTALLDIR = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/"
-}
-
-function convertToCmakeArgs($vars) {
-  return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
-}
-
-cd $env:DEPS_BUILD_DIR
-cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
-cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-cd $buildDir
-
-# Build Neovim
-mkdir build
-cd build
-cmake -G $cmakeGenerator $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
-cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-.\bin\nvim --version ; exitIfFailed
-
-# Ensure that the "win32" feature is set.
-.\bin\nvim -u NONE --headless -c 'exe !has(\"win32\").\"cq\"' ; exitIfFailed
-
-if ($env:USE_LUACOV -eq 1) {
-  & $env:DEPS_PREFIX\luarocks\luarocks.bat install cluacov
-}
-
-if (-not $NoTests) {
+function Test {
   # Functional tests
   # The $LastExitCode from MSBuild can't be trusted
   $failed = $false
 
   # 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
+  cmake --build $buildDir --target functionaltest 2>&1 |
+    ForEach-Object { $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
   }
 
+  if (-not $uploadToCodecov) {
+    return
+  }
+  if ($env:USE_LUACOV -eq 1) {
+    & $env:DEPS_PREFIX\bin\luacov.bat
+  }
+  bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
+}
+
+function TestOld {
   # 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
+  & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path $projectDir\src\nvim\testdir) VERBOSE=1; exitIfFailed
   $env:PATH = $OldPath
 
   if ($uploadToCodecov) {
@@ -170,13 +134,13 @@ if (-not $NoTests) {
   }
 }
 
-# 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
+
+function Package {
+  cmake -S $projectDir -B $buildDir $(convertToCmakeArgs($nvimCmakeVars)) -G Ninja; exitIfFailed
+  cmake --build $buildDir --target package; exitIfFailed
 }
 
-# Build artifacts
-cpack -G ZIP -C RelWithDebInfo
-if ($env:APPVEYOR_REPO_TAG_NAME -ne $null) {
-  cpack -G NSIS -C RelWithDebInfo
+if ($PSCmdlet.ParameterSetName) {
+  & (Get-ChildItem "Function:$($PSCmdlet.ParameterSetName)")
+  exit
 }

ci/common/build.sh

@@ -8,8 +8,6 @@ _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 "$@"
 }
 
@@ -26,9 +24,7 @@ build_deps() {
   mkdir -p "${DEPS_BUILD_DIR}"
 
   # Use cached dependencies if $CACHE_MARKER exists.
-  if test "${CACHE_ENABLE}" = "false" ; then
-    export CCACHE_RECACHE=1
-  elif test -f "${CACHE_MARKER}" ; then
+  if 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}"
   fi
@@ -37,7 +33,7 @@ build_deps() {
   # 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} "${CI_BUILD_DIR}/cmake.deps/"
 
   if ! top_make; then
     exit 1
@@ -46,7 +42,9 @@ build_deps() {
   cd "${CI_BUILD_DIR}"
 }
 
-prepare_build() {
+build_nvim() {
+  check_core_dumps --delete quiet
+
   if test -n "${CLANG_SANITIZER}" ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
   fi
@@ -55,9 +53,8 @@ prepare_build() {
   cd "${BUILD_DIR}"
   echo "Configuring with '${CMAKE_FLAGS} $@'."
   cmake -G Ninja ${CMAKE_FLAGS} "$@" "${CI_BUILD_DIR}"
-}
 
-build_nvim() {
+
   echo "Building nvim."
   if ! top_make nvim ; then
     exit 1

ci/common/submit_coverage.sh

@@ -4,7 +4,7 @@
 # Args:
 # $1: Flag(s) for codecov, separated by comma.
 
-set -ex
+set -e
 
 # Change to grandparent dir (POSIXly).
 CDPATH='' cd -P -- "$(dirname -- "$0")/../.." || exit
@@ -18,12 +18,12 @@ if ! [ -f "$codecov_sh" ]; then
   curl --retry 5 --silent --fail -o "$codecov_sh" https://codecov.io/bash
   chmod +x "$codecov_sh"
 
-  python3 -m pip install --quiet --user gcovr
+  python -m pip install --quiet --user gcovr
 fi
 
 (
   cd build
-  python3 -m gcovr --branches --exclude-unreachable-branches --print-summary -j 2 --exclude '.*/auto/.*' --root .. --delete -o ../coverage.xml --xml
+  python -m gcovr --branches --exclude-unreachable-branches --print-summary -j 2 --exclude '.*/auto/.*' --root .. --delete -o ../coverage.xml --xml
 )
 
 # Upload to codecov.

ci/common/suite.sh

@@ -1,9 +1,3 @@
-# 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 
@@ -11,190 +5,27 @@ FAIL_SUMMARY=""
 END_MARKER="$BUILD_DIR/.tests_finished"
 FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors"
 
-ANSI_CLEAR="\033[0K"
-
-if test "$TRAVIS" = "true"; then
-  ci_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}"
-  }
-elif test "$GITHUB_ACTIONS" = "true"; then
-  ci_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/-$//')"
-    case "$action" in
-      start)
-        echo "::group::${name}"
-        ;;
-      end)
-        echo "::endgroup::"
-        ;;
-      *)
-        :;;
-    esac
-  }
-else
-  ci_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"
-  ci_fold start "${NVIM_TEST_CURRENT_SUITE}"
-  set -x
-}
-
-exit_suite() {
-  set +x
-  if test $FAILED -ne 0 ; then
-    echo "Suite ${NVIM_TEST_CURRENT_SUITE} failed, summary:"
-    echo "${FAIL_SUMMARY}"
-  else
-    ci_fold end "${NVIM_TEST_CURRENT_SUITE}"
-  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 fail_char="$2"
-  local message="$3"
+  local message="$2"
 
-  : ${fail_char:=F}
   : ${message:=Test $test_name failed}
 
-  local full_msg="$fail_char $NVIM_TEST_CURRENT_SUITE|$test_name :: $message"
-  FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
+  local full_msg="$test_name :: $message"
   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

@@ -51,7 +51,7 @@ check_core_dumps() {
     fi
   done
   if test "$app" != quiet ; then
-    fail 'cores' E 'Core dumps found'
+    fail 'cores' 'Core dumps found'
   fi
 }
 
@@ -72,7 +72,7 @@ check_logs() {
     rm "${log}"
   done
   if test -n "${err}" ; then
-    fail 'logs' E 'Runtime errors detected.'
+    fail 'logs' 'Runtime errors detected.'
   fi
 }
 
@@ -86,46 +86,39 @@ check_sanitizer() {
   fi
 }
 
-run_unittests() {(
-  enter_suite unittests
+unittests() {(
   ulimit -c unlimited || true
   if ! build_make unittest ; then
-    fail 'unittests' F 'Unit tests failed'
+    fail 'unittests' 'Unit tests failed'
   fi
   submit_coverage unittest
   check_core_dumps "$(command -v luajit)"
-  exit_suite
 )}
 
-run_functionaltests() {(
-  enter_suite functionaltests
+functionaltests() {(
   ulimit -c unlimited || true
   if ! build_make ${FUNCTIONALTEST}; then
-    fail 'functionaltests' F 'Functional tests failed'
+    fail 'functionaltests' 'Functional tests failed'
   fi
   submit_coverage functionaltest
   check_sanitizer "${LOG_DIR}"
   valgrind_check "${LOG_DIR}"
   check_core_dumps
-  exit_suite
 )}
 
-run_oldtests() {(
-  enter_suite oldtests
+oldtests() {(
   ulimit -c unlimited || true
   if ! make oldtest; then
     reset
-    fail 'oldtests' F 'Legacy tests failed'
+    fail 'oldtests' 'Legacy tests failed'
   fi
   submit_coverage oldtest
   check_sanitizer "${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
@@ -136,27 +129,25 @@ 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" E \
-        "It appears that $file is only a part of the file name"
+      fail "$test_name" "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" F "$(printf "$message" "$file")"
+      fail "$test_name" "$(printf "$message" "$file")"
     fi
   done
 )}
 
 install_nvim() {(
-  enter_suite 'install_nvim'
   if ! build_make install ; then
-    fail 'install' E 'make install failed'
-    exit_suite
+    fail 'install' 'make install failed'
+    exit 1
   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' F 'Failed running :help'
+    fail 'help' 'Failed running :help'
   fi
 
   # Check that all runtime files were installed
@@ -177,13 +168,6 @@ 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' F "It appears that $genvimsynf does not contain $gpat."
+    fail 'funcnames' "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,31 +3,18 @@
 set -e
 set -o pipefail
 
-if [[ "${CI_TARGET}" == lint ]]; then
-  python3 -m pip -q install --user --upgrade flake8
-  exit
-fi
-
-if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  export PATH="/usr/local/opt/ccache/libexec:$PATH"
-fi
-
 # Use default CC to avoid compilation problems when installing Python modules.
-echo "Install neovim module for Python 3."
+echo "Install neovim module for Python."
 CC=cc python3 -m pip -q install --user --upgrade pynvim
-if python2 -m pip -c True 2>&1; then
-  echo "Install neovim module for Python 2."
-  CC=cc python2 -m pip -q install --user --upgrade pynvim
-fi
 
 echo "Install neovim RubyGem."
 gem install --no-document --bindir "$HOME/.local/bin" --user-install --pre neovim
 
 echo "Install neovim npm package"
-source ~/.nvm/nvm.sh
-nvm use 10
 npm install -g neovim
 npm link neovim
 
-sudo cpanm -n Neovim::Ext || cat "$HOME/.cpanm/build.log"
-perl -W -e 'use Neovim::Ext; print $Neovim::Ext::VERSION'
+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

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-source "${CI_DIR}/common/build.sh"
-source "${CI_DIR}/common/suite.sh"
-
-enter_suite 'clint'
-run_test 'make clint-full' clint
-exit_suite --continue
-
-enter_suite 'lualint'
-run_test 'make lualint' lualint
-exit_suite --continue
-
-enter_suite 'pylint'
-run_test 'make pylint' pylint
-exit_suite --continue
-
-enter_suite 'shlint'
-run_test 'make shlint' shlint
-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,33 +8,34 @@ source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
 source "${CI_DIR}/common/suite.sh"
 
-enter_suite build
+rm -f "$END_MARKER"
 
-check_core_dumps --delete quiet
+# Run all tests (with some caveats) if no input argument is given
+if (($# == 0)); then
+  tests=('build_nvim')
 
-prepare_build
-build_nvim
-
-exit_suite --continue
-
-source ~/.nvm/nvm.sh
-nvm use 10
-
-
-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
+  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')
   fi
-  run_test run_functionaltests
+
+  tests+=('oldtests' 'install_nvim')
+else
+  tests=("$@")
 fi
-run_test run_oldtests
 
-run_test install_nvim
-
-exit_suite --continue
+for i in "${tests[@]}"; do
+  eval "$i" || fail "$i"
+done
 
 end_tests
+
+if [[ -s "${GCOV_ERROR_FILE}" ]]; then
+  echo '=== Unexpected gcov errors: ==='
+  cat "${GCOV_ERROR_FILE}"
+  exit 1
+fi

ci/script.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-# 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
-
-if [[ -s "${GCOV_ERROR_FILE}" ]]; then
-  echo '=== Unexpected gcov errors: ==='
-  cat "${GCOV_ERROR_FILE}"
-  exit 1
-fi

ci/snap/deploy.sh

@@ -8,7 +8,7 @@ WEBHOOK_PAYLOAD="$(cat "${SNAP_DIR}/.snapcraft_payload")"
 PAYLOAD_SIG="${SECRET_SNAP_SIG}"
 
 
-snap_realease_needed() {
+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
@@ -33,7 +33,7 @@ trigger_snapcraft_webhook() {
 }
 
 
-if $(snap_realease_needed); then
+if $(snap_release_needed); then
   echo "New snap release required"
   trigger_snapcraft_webhook
 fi

cmake.config/CMakeLists.txt

@@ -5,12 +5,13 @@ include(CheckIncludeFiles)
 include(CheckCSourceRuns)
 include(CheckCSourceCompiles)
 
-check_type_size("int" SIZEOF_INT)
-check_type_size("long" SIZEOF_LONG)
-check_type_size("intmax_t" SIZEOF_INTMAX_T)
-check_type_size("size_t" SIZEOF_SIZE_T)
-check_type_size("long long" SIZEOF_LONG_LONG)
-check_type_size("void *" SIZEOF_VOID_PTR)
+check_type_size("int" SIZEOF_INT LANGUAGE C)
+check_type_size("long" SIZEOF_LONG LANGUAGE C)
+check_type_size("intmax_t" SIZEOF_INTMAX_T LANGUAGE C)
+check_type_size("int32_t" SIZEOF_INT32_T LANGUAGE C)
+check_type_size("size_t" SIZEOF_SIZE_T LANGUAGE C)
+check_type_size("long long" SIZEOF_LONG_LONG LANGUAGE C)
+check_type_size("void *" SIZEOF_VOID_PTR LANGUAGE C)
 
 check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)
 
@@ -45,10 +46,24 @@ check_function_exists(readlink HAVE_READLINK)
 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()
+
 # Symbols
 check_symbol_exists(FD_CLOEXEC "fcntl.h" HAVE_FD_CLOEXEC)
 if(HAVE_LANGINFO_H)
@@ -113,14 +128,14 @@ endif()
 
 # generate configuration header and update include directories
 configure_file (
-  "${PROJECT_SOURCE_DIR}/config/config.h.in"
-  "${PROJECT_BINARY_DIR}/config/auto/config.h"
+  "${PROJECT_SOURCE_DIR}/cmake.config/config.h.in"
+  "${PROJECT_BINARY_DIR}/cmake.config/auto/config.h"
   )
 
 # generate version definitions
 configure_file (
-  "${PROJECT_SOURCE_DIR}/config/versiondef.h.in"
-  "${PROJECT_BINARY_DIR}/config/auto/versiondef.h"
+  "${PROJECT_SOURCE_DIR}/cmake.config/versiondef.h.in"
+  "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef.h"
   )
 
 # generate pathdef.c
@@ -143,6 +158,6 @@ elseif (EXISTS ${HOSTNAME_PROG})
 endif()
 
 configure_file (
-  "${PROJECT_SOURCE_DIR}/config/pathdef.c.in"
-  "${PROJECT_BINARY_DIR}/config/auto/pathdef.c"
+  "${PROJECT_SOURCE_DIR}/cmake.config/pathdef.c.in"
+  "${PROJECT_BINARY_DIR}/cmake.config/auto/pathdef.c"
   ESCAPE_QUOTES)

cmake.config/config.h.in

@@ -3,8 +3,12 @@
 
 #cmakedefine DEBUG
 
-#define SIZEOF_INT @SIZEOF_INT@
-#define SIZEOF_LONG @SIZEOF_LONG@
+#cmakedefine SIZEOF_INT @SIZEOF_INT@
+#cmakedefine SIZEOF_INTMAX_T @SIZEOF_INTMAX_T@
+#cmakedefine SIZEOF_INT32_T @SIZEOF_INT32_T@
+#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
+#cmakedefine SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
+#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
 
 #if @SIZEOF_VOID_PTR@ == 8
 #define ARCH_64
@@ -12,7 +16,7 @@
 #define ARCH_32
 #endif
 
-#define PROJECT_NAME "@PROJECT_NAME@"
+#cmakedefine PROJECT_NAME "@PROJECT_NAME@"
 
 #cmakedefine HAVE__NSGETENVIRON
 #cmakedefine HAVE_FD_CLOEXEC
@@ -30,6 +34,7 @@
 #cmakedefine HAVE_SETPGID
 #cmakedefine HAVE_SETSID
 #cmakedefine HAVE_SIGACTION
+#cmakedefine HAVE_STRNLEN
 #cmakedefine HAVE_STRCASECMP
 #cmakedefine HAVE_STRINGS_H
 #cmakedefine HAVE_STRNCASECMP
@@ -49,6 +54,7 @@
 #  undef HAVE_SYS_UIO_H
 # endif
 #endif
+#cmakedefine HAVE_FORKPTY
 
 #cmakedefine FEAT_TUI
 

cmake.deps/CMakeLists.txt

@@ -1,19 +1,20 @@
 # This is not meant to be included by the top-level.
-cmake_minimum_required (VERSION 2.8.12)
+cmake_minimum_required (VERSION 3.10)
 project(NVIM_DEPS C)
 
-# Needed for: check_c_compiler_flag()
-include(CheckCCompilerFlag)
-
 # Point CMake at any custom modules we may ship
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${PROJECT_SOURCE_DIR}/../cmake")
 
-# In Windows/MSVC CMAKE_BUILD_TYPE changes the paths/linking of the build
-# recipes (libuv, msgpack), make sure it is set
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release)
+include(CheckCCompilerFlag)
+include(Util)
+
+get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(NOT isMultiConfig)
+  set(BUILD_TYPE_STRING -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
 endif()
 
+set_default_buildtype()
+
 set(DEFAULT_MAKE_CFLAGS CFLAGS+=-g)
 
 check_c_compiler_flag(-Og HAS_OG_FLAG)
@@ -39,7 +40,6 @@ set(DEPS_DOWNLOAD_DIR "${DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependencies dow
 
 option(USE_BUNDLED "Use bundled dependencies." ON)
 
-option(USE_BUNDLED_GPERF "Use the bundled version of gperf." ${USE_BUNDLED})
 option(USE_BUNDLED_UNIBILIUM "Use the bundled unibilium." ${USE_BUNDLED})
 option(USE_BUNDLED_LIBTERMKEY "Use the bundled libtermkey." ${USE_BUNDLED})
 option(USE_BUNDLED_LIBVTERM "Use the bundled libvterm." ${USE_BUNDLED})
@@ -64,11 +64,9 @@ endif()
 
 option(USE_EXISTING_SRC_DIR "Skip download of deps sources in case of existing source directory." OFF)
 
-if(WIN32)
-  find_package(Git)
-  if(NOT Git_FOUND)
-    message(FATAL_ERROR "Git is required to apply patches for Windows.")
-  endif()
+find_package(Git)
+if(NOT Git_FOUND)
+  message(FATAL_ERROR "Git is required to apply patches.")
 endif()
 
 if(UNIX)
@@ -109,10 +107,6 @@ else()
   set(DEPS_C_COMPILER "${CMAKE_C_COMPILER}")
 endif()
 
-if(USE_BUNDLED_GPERF)
-  enable_language(CXX)
-endif()
-
 if(CMAKE_CXX_COMPILER)
   set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
 endif()
@@ -124,35 +118,48 @@ if(CMAKE_OSX_SYSROOT)
   endif()
 endif()
 
-# Cross compiling: use these for dependencies built for the
-# HOST system, when not crosscompiling these should be the
-# same as DEPS_*. Except when targeting Unix in which case
-# want all the dependencies to use the same compiler.
-if(CMAKE_CROSSCOMPILING AND NOT UNIX)
-  set(HOSTDEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/host")
-  set(HOSTDEPS_BIN_DIR "${HOSTDEPS_INSTALL_DIR}/bin")
-  set(HOSTDEPS_LIB_DIR "${HOSTDEPS_INSTALL_DIR}/lib")
-  set(HOSTDEPS_C_COMPILER "${HOST_C_COMPILER}")
-  set(HOSTDEPS_CXX_COMPILER "${HOST_CXX_COMPILER}")
-else()
-  set(HOSTDEPS_INSTALL_DIR "${DEPS_INSTALL_DIR}")
-  set(HOSTDEPS_BIN_DIR "${DEPS_BIN_DIR}")
-  set(HOSTDEPS_LIB_DIR "${DEPS_LIB_DIR}")
-  set(HOSTDEPS_C_COMPILER "${DEPS_C_COMPILER}")
-  set(HOSTDEPS_CXX_COMPILER "${DEPS_CXX_COMPILER}")
+if(CMAKE_OSX_ARCHITECTURES)
+  string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}")
+  # The LuaJIT build does not like being passed multiple `-arch` flags
+  # so we handle a universal build the old-fashioned way.
+  set(LUAJIT_C_COMPILER "${DEPS_C_COMPILER}")
+  foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES)
+    set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -arch ${ARCH}")
+    if(DEPS_CXX_COMPILER)
+      set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -arch ${ARCH}")
+    endif()
+  endforeach()
 endif()
 
+# If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET),
+# fall back to local system version. Needs to be done here and in top-level CMakeLists.txt.
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+    execute_process(COMMAND sw_vers -productVersion
+                    OUTPUT_VARIABLE MACOS_VERSION
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}")
+  endif()
+  message("-- Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif()
+
+set(HOSTDEPS_INSTALL_DIR "${DEPS_INSTALL_DIR}")
+set(HOSTDEPS_BIN_DIR "${DEPS_BIN_DIR}")
+set(HOSTDEPS_LIB_DIR "${DEPS_LIB_DIR}")
+set(HOSTDEPS_C_COMPILER "${DEPS_C_COMPILER}")
+set(HOSTDEPS_CXX_COMPILER "${DEPS_CXX_COMPILER}")
+
 include(ExternalProject)
 
-set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.42.0.tar.gz)
-set(LIBUV_SHA256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764)
+set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.44.2.tar.gz)
+set(LIBUV_SHA256 e6e2ba8b4c349a4182a33370bb9be5e23c51b32efb9b9e209d0e8556b73a48da)
 
-set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-3.0.0/msgpack-3.0.0.tar.gz)
-set(MSGPACK_SHA256 bfbb71b7c02f806393bc3cbc491b40523b89e64f83860c58e3e54af47de176e4)
+set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/c-4.0.0/msgpack-c-4.0.0.tar.gz)
+set(MSGPACK_SHA256 420fe35e7572f2a168d17e660ef981a589c9cbe77faa25eb34a520e1fcc032c8)
 
 # https://github.com/LuaJIT/LuaJIT/tree/v2.1
-set(LUAJIT_URL https://github.com/LuaJIT/LuaJIT/archive/b4b2dce9fc3ffaaaede39b36d06415311e2aa516.tar.gz)
-set(LUAJIT_SHA256 6c9e46877db2df16ca0fa76db4043ed30a1ae60c89d9ba2c3e4d35eb2360cd4d)
+set(LUAJIT_URL https://github.com/LuaJIT/LuaJIT/archive/633f265f67f322cbe2c5fd11d3e46d968ac220f7.tar.gz)
+set(LUAJIT_SHA256 2681f0a6f624a64a8dfb70a5a377d494daf38960442c547d9c468674c1afa3c2)
 
 set(LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz)
 set(LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333)
@@ -163,48 +170,51 @@ set(LUAROCKS_SHA256 ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de
 set(UNIBILIUM_URL https://github.com/neovim/unibilium/archive/92d929f.tar.gz)
 set(UNIBILIUM_SHA256 29815283c654277ef77a3adcc8840db79ddbb20a0f0b0c8f648bd8cd49a02e4b)
 
-set(LIBTERMKEY_URL http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz)
+set(LIBTERMKEY_URL https://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz)
 set(LIBTERMKEY_SHA256 6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600)
 
-set(LIBVTERM_URL http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.4.tar.gz)
-set(LIBVTERM_SHA256 bc70349e95559c667672fc8c55b9527d9db9ada0fb80a3beda533418d782d3dd)
+set(LIBVTERM_URL https://www.leonerd.org.uk/code/libvterm/libvterm-0.3.tar.gz)
+set(LIBVTERM_SHA256 61eb0d6628c52bdf02900dfd4468aa86a1a7125228bab8a67328981887483358)
 
-set(LUV_VERSION 1.42.0-1)
-set(LUV_URL https://github.com/luvit/luv/archive/${LUV_VERSION}.tar.gz)
-set(LUV_SHA256 a55563e6da9294ea26f77a2111598aa49188c5806b8bd1e1f4bdf402f340713e)
+set(LUV_VERSION 1.44.2-1)
+set(LUV_URL https://github.com/luvit/luv/archive/1.44.2-1.tar.gz)
+set(LUV_SHA256 f8c69908e17ec8ab370253d1508e23deaecfc0c4752d2efb77e427e579501104)
 
 set(LUA_COMPAT53_URL https://github.com/keplerproject/lua-compat-5.3/archive/v0.9.tar.gz)
 set(LUA_COMPAT53_SHA256 ad05540d2d96a48725bb79a1def35cf6652a4e2ec26376e2617c8ce2baa6f416)
 
-set(GPERF_URL https://github.com/neovim/deps/raw/ff5b4b18a87397a8564016071ae64f64bcd8c635/opt/gperf-3.1.tar.gz)
-set(GPERF_SHA256 588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2)
-
 # cat.exe curl.exe curl-ca-bundle.crt diff.exe tee.exe xxd.exe
-set(WINTOOLS_URL https://github.com/neovim/deps/raw/d66e306abf5b846484b4f2adffd896bce7e065d2/opt/win32tools.zip)
-set(WINTOOLS_SHA256 2fb2f8d69070b3f16e029913fb95008e6be33893d77fc358012396c275a0fdb7)
+set(WINTOOLS_URL https://github.com/neovim/deps/raw/c1e7dd8de9e1b18d11dcfa0a192cd029262e5303/opt/win32tools.zip)
+set(WINTOOLS_SHA256 3c4c490a3d392ceeb1347cb77cc821a31900b688a2189276d3a1131a3f21daf1)
 
-set(WINGUI_URL https://github.com/equalsraf/neovim-qt/releases/download/v0.2.16.1/neovim-qt.zip)
-set(WINGUI_SHA256 ddb4492db03da407703fb0ab271c4eb060250d1a7d71200e2b3b981cb0de59de)
+set(WINGUI_URL https://github.com/equalsraf/neovim-qt/releases/download/v0.2.17/neovim-qt.zip)
+set(WINGUI_SHA256 502e386eef677c2c2e0c11d8cbb27f3e12b4d96818369417e8da4129c4580c25)
 
 set(WIN32YANK_X86_URL https://github.com/equalsraf/win32yank/releases/download/v0.0.4/win32yank-x86.zip)
 set(WIN32YANK_X86_SHA256 62f34e5a46c5d4a7b3f3b512e1ff7b77fedd432f42581cbe825233a996eed62c)
 set(WIN32YANK_X86_64_URL https://github.com/equalsraf/win32yank/releases/download/v0.0.4/win32yank-x64.zip)
 set(WIN32YANK_X86_64_SHA256 33a747a92da60fb65e668edbf7661d3d902411a2d545fe9dc08623cecd142a20)
 
-set(WINPTY_URL https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip)
-set(WINPTY_SHA256 35a48ece2ff4acdcbc8299d4920de53eb86b1fb41e64d2fe5ae7898931bcee89)
-
 set(GETTEXT_URL https://ftp.gnu.org/pub/gnu/gettext/gettext-0.20.1.tar.gz)
 set(GETTEXT_SHA256 66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c)
 
 set(LIBICONV_URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz)
 set(LIBICONV_SHA256 ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178)
 
-set(TREESITTER_C_URL https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.1.tar.gz)
-set(TREESITTER_C_SHA256 ffcc2ef0eded59ad1acec9aec4f9b0c7dd209fc1a85d85f8b0e81298e3dddcc2)
+set(TREESITTER_C_URL https://github.com/tree-sitter/tree-sitter-c/archive/v0.20.2.tar.gz)
+set(TREESITTER_C_SHA256 af66fde03feb0df4faf03750102a0d265b007e5d957057b6b293c13116a70af2 )
 
-set(TREESITTER_URL https://github.com/tree-sitter/tree-sitter/archive/v0.20.1.tar.gz)
-set(TREESITTER_SHA256 12a3f7206af3028dbe8a0de50d8ebd6d7010bf762db918acae76fc7585f1258d)
+set(TREESITTER_LUA_URL https://github.com/MunifTanjim/tree-sitter-lua/archive/v0.0.13.tar.gz)
+set(TREESITTER_LUA_SHA256 564594fe0ffd2f2fb3578a15019b723e1bc94ac82cb6a0103a6b3b9ddcc6f315)
+
+set(TREESITTER_VIM_URL https://github.com/vigoux/tree-sitter-viml/archive/v0.2.0.tar.gz)
+set(TREESITTER_VIM_SHA256 608dcc31a7948cb66ae7f45494620e2e9face1af75598205541f80d782ec4501)
+
+set(TREESITTER_HELP_URL https://github.com/neovim/tree-sitter-vimdoc/archive/v1.2.2.tar.gz)
+set(TREESITTER_HELP_SHA256 d33b9447dae04f19e1ac50c94b78e305574c07f942791f70aea96fe266447c18)
+
+set(TREESITTER_URL https://github.com/tree-sitter/tree-sitter/archive/v0.20.7.tar.gz)
+set(TREESITTER_SHA256 b355e968ec2d0241bbd96748e00a9038f83968f85d822ecb9940cbe4c42e182e)
 
 if(USE_BUNDLED_UNIBILIUM)
   include(BuildUnibilium)
@@ -233,7 +243,7 @@ if(USE_BUNDLED_LUAJIT)
   include(BuildLuajit)
 endif()
 
-if(USE_BUNDLED_LUA AND NOT CMAKE_CROSSCOMPILING)
+if(USE_BUNDLED_LUA)
   include(BuildLua)
 endif()
 
@@ -245,10 +255,6 @@ if(USE_BUNDLED_LUV)
   include(BuildLuv)
 endif()
 
-if(USE_BUNDLED_GPERF)
-  include(BuildGperf)
-endif()
-
 if(USE_BUNDLED_GETTEXT)
   include(BuildGettext)
 endif()
@@ -284,18 +290,6 @@ if(WIN32)
   elseif(TARGET_ARCH STREQUAL "X86")
     set(TARGET_ARCH ia32)
   endif()
-
-  GetBinaryDep(TARGET winpty
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin
-      COMMAND ${CMAKE_COMMAND} -DFROM_GLOB=${DEPS_BUILD_DIR}/src/winpty/${TARGET_ARCH}/bin/*
-        -DTO=${DEPS_INSTALL_DIR}/bin/
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyFilesGlob.cmake
-      COMMAND ${CMAKE_COMMAND} -DFROM_GLOB=${DEPS_BUILD_DIR}/src/winpty/include/*
-        -DTO=${DEPS_INSTALL_DIR}/include/
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyFilesGlob.cmake
-      COMMAND ${CMAKE_COMMAND} -DFROM_GLOB=${DEPS_BUILD_DIR}/src/winpty/${TARGET_ARCH}/lib/*
-        -DTO=${DEPS_INSTALL_DIR}/lib/
-        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyFilesGlob.cmake)
 endif()
 
 # clean-shared-libraries removes ${DEPS_INSTALL_DIR}/lib/nvim/parser/c.dll,
@@ -312,6 +306,7 @@ else()
   set(ALL_DEPS clean-shared-libraries)
 endif()
 
+# TODO(justinmk): does anyone use this target?
 add_custom_target(third-party ALL
   COMMAND ${CMAKE_COMMAND} -E touch .third-party
   DEPENDS ${ALL_DEPS}

cmake.deps/cmake/BuildGettext.cmake

@@ -1,5 +1,4 @@
 if(MSVC)
-
   ExternalProject_Add(gettext
     PREFIX ${DEPS_BUILD_DIR}
     URL ${GETTEXT_URL}
@@ -19,13 +18,13 @@ if(MSVC)
         -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
         # Pass toolchain
         -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        ${BUILD_TYPE_STRING}
         -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+        -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
         -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
         -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
-
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
 else()
   message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()

cmake.deps/cmake/BuildLibiconv.cmake

@@ -1,5 +1,4 @@
 if(MSVC)
-
   ExternalProject_Add(libiconv
     PREFIX ${DEPS_BUILD_DIR}
     URL ${LIBICONV_URL}
@@ -19,11 +18,11 @@ if(MSVC)
         -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
         # Pass toolchain
         -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        ${BUILD_TYPE_STRING}
         -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
-
+        -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
 else()
   message(FATAL_ERROR "Trying to build libiconv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()

cmake.deps/cmake/BuildLibtermkey.cmake

@@ -0,0 +1,43 @@
+if(WIN32)
+  set(LIBTERMKEY_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libtermkeyCMakeLists.txt
+      ${DEPS_BUILD_DIR}/src/libtermkey/CMakeLists.txt
+    COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libtermkey
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      # Pass toolchain
+      -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
+      ${BUILD_TYPE_STRING}
+      # Hack to avoid -rdynamic in Mingw
+      -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=""
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+      -DUNIBILIUM_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+      -DUNIBILIUM_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX})
+  set(LIBTERMKEY_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
+  set(LIBTERMKEY_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+else()
+  find_package(PkgConfig REQUIRED)
+
+  set(LIBTERMKEY_BUILD_COMMAND "" BUILD_IN_SOURCE 1)
+  set(LIBTERMKEY_INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
+    PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
+    CFLAGS=-fPIC LDFLAGS+=-static ${DEFAULT_MAKE_CFLAGS} install)
+endif()
+
+ExternalProject_Add(libtermkey
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LIBTERMKEY_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libtermkey
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libtermkey
+    -DURL=${LIBTERMKEY_URL}
+    -DEXPECTED_SHA256=${LIBTERMKEY_SHA256}
+    -DTARGET=libtermkey
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND "${LIBTERMKEY_CONFIGURE_COMMAND}"
+  BUILD_COMMAND "${LIBTERMKEY_BUILD_COMMAND}"
+  INSTALL_COMMAND "${LIBTERMKEY_INSTALL_COMMAND}")
+
+list(APPEND THIRD_PARTY_DEPS libtermkey)

cmake.deps/cmake/BuildLibuv.cmake

@@ -0,0 +1,26 @@
+ExternalProject_Add(libuv
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LIBUV_URL}
+  CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+    -DCMAKE_INSTALL_LIBDIR=lib
+    -DBUILD_TESTING=OFF
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+    -DLIBUV_BUILD_SHARED=OFF
+  CMAKE_CACHE_ARGS
+    -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libuv
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libuv
+    -DURL=${LIBUV_URL}
+    -DEXPECTED_SHA256=${LIBUV_SHA256}
+    -DTARGET=libuv
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  PATCH_COMMAND
+    ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/libuv init
+      COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/libuv apply --ignore-whitespace
+        ${CMAKE_CURRENT_SOURCE_DIR}/patches/libuv-disable-shared.patch)
+
+list(APPEND THIRD_PARTY_DEPS libuv)

cmake.deps/cmake/BuildLibvterm.cmake

@@ -0,0 +1,46 @@
+if(WIN32)
+  set(LIBVTERM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibvtermCMakeLists.txt
+      ${DEPS_BUILD_DIR}/src/libvterm/CMakeLists.txt
+    COMMAND ${CMAKE_COMMAND} -E copy
+      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Libvterm-tbl2inc_c.cmake
+      ${DEPS_BUILD_DIR}/src/libvterm/tbl2inc_c.cmake
+    COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libvterm
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+  if(MSVC)
+    list(APPEND LIBVTERM_CONFIGURE_COMMAND "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1}")
+  else()
+    list(APPEND LIBVTERM_CONFIGURE_COMMAND "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC")
+  endif()
+  set(LIBVTERM_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
+  set(LIBVTERM_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+else()
+  set(LIBVTERM_INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
+                                           PREFIX=${DEPS_INSTALL_DIR}
+                                           CFLAGS=-fPIC
+                                           LDFLAGS+=-static
+                                           ${DEFAULT_MAKE_CFLAGS}
+                                           install)
+endif()
+
+ExternalProject_Add(libvterm
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LIBVTERM_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libvterm
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libvterm
+    -DURL=${LIBVTERM_URL}
+    -DEXPECTED_SHA256=${LIBVTERM_SHA256}
+    -DTARGET=libvterm
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND "${LIBVTERM_CONFIGURE_COMMAND}"
+  BUILD_COMMAND "${LIBVTERM_BUILD_COMMAND}"
+  INSTALL_COMMAND "${LIBVTERM_INSTALL_COMMAND}")
+
+list(APPEND THIRD_PARTY_DEPS libvterm)

cmake.deps/cmake/BuildLua.cmake

@@ -1,36 +1,3 @@
-# BuildLua(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
-# Reusable function to build lua, wraps ExternalProject_Add.
-# Failing to pass a command argument will result in no command being run
-function(BuildLua)
-  cmake_parse_arguments(_lua
-    ""
-    ""
-    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
-    ${ARGN})
-
-  if(NOT _lua_CONFIGURE_COMMAND AND NOT _lua_BUILD_COMMAND
-       AND NOT _lua_INSTALL_COMMAND)
-    message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND, BUILD_COMMAND, INSTALL_COMMAND")
-  endif()
-
-  ExternalProject_Add(lua
-    PREFIX ${DEPS_BUILD_DIR}
-    URL ${LUA_URL}
-    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua
-    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-      -DPREFIX=${DEPS_BUILD_DIR}
-      -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/lua
-      -DURL=${LUA_URL}
-      -DEXPECTED_SHA256=${LUA_SHA256}
-      -DTARGET=lua
-      -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
-      -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
-    CONFIGURE_COMMAND "${_lua_CONFIGURE_COMMAND}"
-    BUILD_IN_SOURCE 1
-    BUILD_COMMAND "${_lua_BUILD_COMMAND}"
-    INSTALL_COMMAND "${_lua_INSTALL_COMMAND}")
-endfunction()
-
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   set(LUA_TARGET linux)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
@@ -72,16 +39,26 @@ set(LUA_CONFIGURE_COMMAND
       -e "s@\\(#define LUA_ROOT[ 	]*\"\\)/usr/local@\\1${DEPS_INSTALL_DIR}@"
       -i ${DEPS_BUILD_DIR}/src/lua/src/luaconf.h)
 set(LUA_INSTALL_TOP_ARG "INSTALL_TOP=${DEPS_INSTALL_DIR}")
-set(LUA_BUILD_COMMAND
-    ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} ${LUA_TARGET})
-set(LUA_INSTALL_COMMAND
-    ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} install)
 
 message(STATUS "Lua target is ${LUA_TARGET}")
 
-BuildLua(CONFIGURE_COMMAND ${LUA_CONFIGURE_COMMAND}
-  BUILD_COMMAND ${LUA_BUILD_COMMAND}
-  INSTALL_COMMAND ${LUA_INSTALL_COMMAND})
+ExternalProject_Add(lua
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LUA_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/lua
+    -DURL=${LUA_URL}
+    -DEXPECTED_SHA256=${LUA_SHA256}
+    -DTARGET=lua
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND "${LUA_CONFIGURE_COMMAND}"
+  BUILD_IN_SOURCE 1
+  BUILD_COMMAND ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} ${LUA_TARGET}
+  INSTALL_COMMAND ${MAKE_PRG} ${LUA_INSTALL_TOP_ARG} install)
+
 list(APPEND THIRD_PARTY_DEPS lua)
 
 set(BUSTED ${DEPS_INSTALL_DIR}/bin/busted)

cmake.deps/cmake/BuildLuajit.cmake

@@ -5,7 +5,7 @@ function(BuildLuajit)
   cmake_parse_arguments(_luajit
     ""
     "TARGET"
-    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
+    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND;DEPENDS"
     ${ARGN})
   if(NOT _luajit_CONFIGURE_COMMAND AND NOT _luajit_BUILD_COMMAND
         AND NOT _luajit_INSTALL_COMMAND)
@@ -30,13 +30,14 @@ function(BuildLuajit)
     CONFIGURE_COMMAND "${_luajit_CONFIGURE_COMMAND}"
     BUILD_IN_SOURCE 1
     BUILD_COMMAND "${_luajit_BUILD_COMMAND}"
-    INSTALL_COMMAND "${_luajit_INSTALL_COMMAND}")
+    INSTALL_COMMAND "${_luajit_INSTALL_COMMAND}"
+    DEPENDS "${_luajit_DEPENDS}")
 
   # Create symlink for development version manually.
   if(UNIX)
     add_custom_command(
       TARGET ${_luajit_TARGET}
-      COMMAND ${CMAKE_COMMAND} -E create_symlink luajit-2.1.0-beta3 ${DEPS_BIN_DIR}/luajit)
+      COMMAND ${CMAKE_COMMAND} -E create_symlink luajit-2.1.0-beta3 ${DEPS_BIN_DIR}/${_luajit_TARGET})
   endif()
 endfunction()
 
@@ -51,53 +52,57 @@ if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
 else()
   set(AMD64_ABI "")
 endif()
-set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC
-                                CFLAGS+=-DLUA_USE_APICHECK
-                                CFLAGS+=-funwind-tables
-                                ${NO_STACK_CHECK}
-                                ${AMD64_ABI}
-                                CCDEBUG+=-g
-                                Q=
-                                install)
+set(BUILDCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC
+                              CFLAGS+=-DLUA_USE_APICHECK
+                              CFLAGS+=-funwind-tables
+                              ${NO_STACK_CHECK}
+                              ${AMD64_ABI}
+                              CCDEBUG+=-g
+                              Q=)
 
-if(UNIX)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    if(CMAKE_OSX_DEPLOYMENT_TARGET)
-      set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
-    else()
-      # Use the same target as our nightly builds
-      set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=10.11")
-    endif()
-  else()
-    set(DEPLOYMENT_TARGET "")
-  endif()
+# Setting MACOSX_DEPLOYMENT_TARGET is mandatory for LuaJIT; use version set by
+# cmake.deps/CMakeLists.txt (either environment variable or current system version).
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif()
 
-  BuildLuaJit(INSTALL_COMMAND ${INSTALLCMD_UNIX}
+if((UNIX AND NOT APPLE) OR (APPLE AND NOT CMAKE_OSX_ARCHITECTURES))
+  BuildLuaJit(INSTALL_COMMAND ${BUILDCMD_UNIX}
     CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR}
-    ${DEPLOYMENT_TARGET})
+    ${DEPLOYMENT_TARGET} install)
 
-elseif(MINGW AND CMAKE_CROSSCOMPILING)
+elseif(CMAKE_OSX_ARCHITECTURES AND APPLE)
 
-  # Build luajit for the host
-  BuildLuaJit(TARGET luajit_host
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ${INSTALLCMD_UNIX}
-      CC=${HOST_C_COMPILER} PREFIX=${HOSTDEPS_INSTALL_DIR})
+  # Passing multiple `-arch` flags to the LuaJIT build will cause it to fail.
+  # To get a working universal build, we build each requested architecture slice
+  # individually then `lipo` them all up.
+  set(LUAJIT_SRC_DIR "${DEPS_BUILD_DIR}/src/luajit")
+  foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES)
+    set(STATIC_CC "${LUAJIT_C_COMPILER} -arch ${ARCH}")
+    set(DYNAMIC_CC "${LUAJIT_C_COMPILER} -arch ${ARCH} -fPIC")
+    set(TARGET_LD "${LUAJIT_C_COMPILER} -arch ${ARCH}")
+    list(APPEND LUAJIT_THIN_EXECUTABLES "${LUAJIT_SRC_DIR}-${ARCH}/src/luajit")
+    list(APPEND LUAJIT_THIN_STATIC_LIBS "${LUAJIT_SRC_DIR}-${ARCH}/src/libluajit.a")
+    list(APPEND LUAJIT_THIN_DYLIBS "${LUAJIT_SRC_DIR}-${ARCH}/src/libluajit.so")
+    list(APPEND LUAJIT_THIN_TARGETS "luajit-${ARCH}")
 
-  # Build luajit for the target
+    # See https://luajit.org/install.html#cross.
+    BuildLuaJit(TARGET "luajit-${ARCH}"
+        BUILD_COMMAND ${BUILDCMD_UNIX}
+        CC=${LUAJIT_C_COMPILER} STATIC_CC=${STATIC_CC}
+        DYNAMIC_CC=${DYNAMIC_CC} TARGET_LD=${TARGET_LD}
+        PREFIX=${DEPS_INSTALL_DIR}
+        ${DEPLOYMENT_TARGET})
+  endforeach()
   BuildLuaJit(
-    # Similar to Unix + cross - fPIC
-    INSTALL_COMMAND
-      ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR}
-        BUILDMODE=static install
-        TARGET_SYS=${CMAKE_SYSTEM_NAME}
-        CROSS=${CROSS_TARGET}-
-        HOST_CC=${HOST_C_COMPILER} HOST_CFLAGS=${HOST_C_FLAGS}
-        HOST_LDFLAGS=${HOST_EXE_LINKER_FLAGS}
-        FILE_T=luajit.exe
-        Q=
-        INSTALL_TSYMNAME=luajit.exe)
+    CONFIGURE_COMMAND ${BUILDCMD_UNIX} CC=${LUAJIT_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} ${DEPLOYMENT_TARGET}
+    COMMAND ${CMAKE_COMMAND} -E rm -f ${LUAJIT_SRC_DIR}/src/luajit ${LUAJIT_SRC_DIR}/src/libluajit.so ${LUAJIT_SRC_DIR}/src/libluajit.a
+    BUILD_COMMAND lipo ${LUAJIT_THIN_EXECUTABLES} -create -output ${LUAJIT_SRC_DIR}/src/luajit
+    COMMAND lipo ${LUAJIT_THIN_STATIC_LIBS} -create -output ${LUAJIT_SRC_DIR}/src/libluajit.a
+    COMMAND lipo ${LUAJIT_THIN_DYLIBS} -create -output ${LUAJIT_SRC_DIR}/src/libluajit.so
+    INSTALL_COMMAND ${BUILDCMD_UNIX} CC=${LUAJIT_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} ${DEPLOYMENT_TARGET} install
+    DEPENDS ${LUAJIT_THIN_TARGETS}
+    )
 
 elseif(MINGW)
 
@@ -124,7 +129,9 @@ elseif(MINGW)
 	    COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/libluajit.a ${DEPS_INSTALL_DIR}/lib
 	    COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/include/luajit-2.1
 	    COMMAND ${CMAKE_COMMAND} -DFROM_GLOB=${DEPS_BUILD_DIR}/src/luajit/src/*.h -DTO=${DEPS_INSTALL_DIR}/include/luajit-2.1 -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyFilesGlob.cmake
-          )
+	    COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin/lua/jit
+	    COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPS_BUILD_DIR}/src/luajit/src/jit ${DEPS_INSTALL_DIR}/bin/lua/jit
+	    )
 elseif(MSVC)
 
   BuildLuaJit(
@@ -138,8 +145,10 @@ elseif(MSVC)
       # Luv searches for luajit.lib
       COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/lua51.lib ${DEPS_INSTALL_DIR}/lib/luajit.lib
       COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/include/luajit-2.1
-      COMMAND ${CMAKE_COMMAND} -DFROM_GLOB=${DEPS_BUILD_DIR}/src/luajit/src/*.h -DTO=${DEPS_INSTALL_DIR}/include/luajit-2.1 -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyFilesGlob.cmake)
-
+      COMMAND ${CMAKE_COMMAND} -DFROM_GLOB=${DEPS_BUILD_DIR}/src/luajit/src/*.h -DTO=${DEPS_INSTALL_DIR}/include/luajit-2.1 -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyFilesGlob.cmake
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin/lua/jit
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPS_BUILD_DIR}/src/luajit/src/jit ${DEPS_INSTALL_DIR}/bin/lua/jit
+      )
 else()
   message(FATAL_ERROR "Trying to build luajit in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()

cmake.deps/cmake/BuildLuarocks.cmake

@@ -9,39 +9,6 @@
 
 option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON)
 
-# BuildLuarocks(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
-# Reusable function to build luarocks, wraps ExternalProject_Add.
-# Failing to pass a command argument will result in no command being run
-function(BuildLuarocks)
-  cmake_parse_arguments(_luarocks
-    ""
-    ""
-    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
-    ${ARGN})
-
-  if(NOT _luarocks_CONFIGURE_COMMAND AND NOT _luarocks_BUILD_COMMAND
-        AND NOT _luarocks_INSTALL_COMMAND)
-    message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND, BUILD_COMMAND, INSTALL_COMMAND")
-  endif()
-
-  ExternalProject_Add(luarocks
-    PREFIX ${DEPS_BUILD_DIR}
-    URL ${LUAROCKS_URL}
-    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luarocks
-    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-      -DPREFIX=${DEPS_BUILD_DIR}
-      -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/luarocks
-      -DURL=${LUAROCKS_URL}
-      -DEXPECTED_SHA256=${LUAROCKS_SHA256}
-      -DTARGET=luarocks
-      -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
-      -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
-    BUILD_IN_SOURCE 1
-    CONFIGURE_COMMAND "${_luarocks_CONFIGURE_COMMAND}"
-    BUILD_COMMAND "${_luarocks_BUILD_COMMAND}"
-    INSTALL_COMMAND "${_luarocks_INSTALL_COMMAND}")
-endfunction()
-
 # The luarocks binary location
 set(LUAROCKS_BINARY ${HOSTDEPS_BIN_DIR}/luarocks)
 
@@ -56,7 +23,7 @@ endif()
 # Defaults to 5.1 for bundled LuaJIT/Lua.
 set(LUA_VERSION "5.1")
 
-if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
+if(UNIX)
 
   if(USE_BUNDLED_LUAJIT)
     list(APPEND LUAROCKS_OPTS
@@ -90,10 +57,9 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
     endif()
   endif()
 
-  BuildLuarocks(
-    CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
-      --prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS}
-    INSTALL_COMMAND ${MAKE_PRG} -j1 bootstrap)
+  set(LUAROCKS_CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
+      --prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS})
+  set(LUAROCKS_INSTALL_COMMAND ${MAKE_PRG} -j1 bootstrap)
 elseif(MSVC OR MINGW)
 
   if(MINGW)
@@ -103,7 +69,7 @@ elseif(MSVC OR MINGW)
   endif()
 
   # Ignore USE_BUNDLED_LUAJIT - always ON for native Win32
-  BuildLuarocks(INSTALL_COMMAND install.bat /FORCECONFIG /NOREG /NOADMIN /Q /F
+  set(LUAROCKS_INSTALL_COMMAND install.bat /FORCECONFIG /NOREG /NOADMIN /Q /F
     /LUA ${DEPS_INSTALL_DIR}
     /LIB ${DEPS_LIB_DIR}
     /BIN ${DEPS_BIN_DIR}
@@ -119,13 +85,27 @@ else()
   message(FATAL_ERROR "Trying to build luarocks in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
 
+ExternalProject_Add(luarocks
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LUAROCKS_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luarocks
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/luarocks
+    -DURL=${LUAROCKS_URL}
+    -DEXPECTED_SHA256=${LUAROCKS_SHA256}
+    -DTARGET=luarocks
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND "${LUAROCKS_CONFIGURE_COMMAND}"
+  BUILD_COMMAND ""
+  INSTALL_COMMAND "${LUAROCKS_INSTALL_COMMAND}")
+
 list(APPEND THIRD_PARTY_DEPS luarocks)
 
 if(USE_BUNDLED_LUAJIT)
   add_dependencies(luarocks luajit)
-  if(MINGW AND CMAKE_CROSSCOMPILING)
-    add_dependencies(luarocks luajit_host)
-  endif()
 elseif(USE_BUNDLED_LUA)
   add_dependencies(luarocks lua)
 endif()
@@ -133,16 +113,14 @@ set(ROCKS_DIR ${HOSTDEPS_LIB_DIR}/luarocks/rocks-${LUA_VERSION})
 
 # mpack
 add_custom_command(OUTPUT ${ROCKS_DIR}/mpack
-  COMMAND ${LUAROCKS_BINARY}
-  ARGS build mpack 1.0.8-0 ${LUAROCKS_BUILDARGS}
+  COMMAND ${LUAROCKS_BINARY} build mpack 1.0.8-0 ${LUAROCKS_BUILDARGS}
   DEPENDS luarocks)
 add_custom_target(mpack DEPENDS ${ROCKS_DIR}/mpack)
 list(APPEND THIRD_PARTY_DEPS mpack)
 
 # lpeg
 add_custom_command(OUTPUT ${ROCKS_DIR}/lpeg
-  COMMAND ${LUAROCKS_BINARY}
-  ARGS build lpeg 1.0.2-1 ${LUAROCKS_BUILDARGS}
+  COMMAND ${LUAROCKS_BINARY} build lpeg 1.0.2-1 ${LUAROCKS_BUILDARGS}
   DEPENDS mpack)
 add_custom_target(lpeg DEPENDS ${ROCKS_DIR}/lpeg)
 list(APPEND THIRD_PARTY_DEPS lpeg)
@@ -150,8 +128,7 @@ list(APPEND THIRD_PARTY_DEPS lpeg)
 if((NOT USE_BUNDLED_LUAJIT) AND USE_BUNDLED_LUA)
   # luabitop
   add_custom_command(OUTPUT ${ROCKS_DIR}/luabitop
-    COMMAND ${LUAROCKS_BINARY}
-    ARGS build luabitop 1.0.2-3 ${LUAROCKS_BUILDARGS}
+    COMMAND ${LUAROCKS_BINARY} build luabitop 1.0.2-3 ${LUAROCKS_BUILDARGS}
     DEPENDS lpeg)
   add_custom_target(luabitop DEPENDS ${ROCKS_DIR}/luabitop)
   list(APPEND THIRD_PARTY_DEPS luabitop)
@@ -166,8 +143,7 @@ if(USE_BUNDLED_BUSTED)
 
   # penlight
   add_custom_command(OUTPUT ${ROCKS_DIR}/penlight
-    COMMAND ${LUAROCKS_BINARY}
-    ARGS build penlight 1.5.4-1 ${LUAROCKS_BUILDARGS}
+    COMMAND ${LUAROCKS_BINARY} build penlight 1.5.4-1 ${LUAROCKS_BUILDARGS}
     DEPENDS ${PENLIGHT_DEPENDS})
   add_custom_target(penlight DEPENDS ${ROCKS_DIR}/penlight)
 
@@ -180,53 +156,32 @@ if(USE_BUNDLED_BUSTED)
     set(LUACHECK_EXE "${HOSTDEPS_BIN_DIR}/luacheck")
   endif()
   add_custom_command(OUTPUT ${BUSTED_EXE}
-    COMMAND ${LUAROCKS_BINARY}
-    ARGS build busted 2.0.0 ${LUAROCKS_BUILDARGS}
+    COMMAND ${LUAROCKS_BINARY} build busted 2.0.0 ${LUAROCKS_BUILDARGS}
     DEPENDS penlight)
   add_custom_target(busted DEPENDS ${BUSTED_EXE})
 
   # luacheck
   add_custom_command(OUTPUT ${LUACHECK_EXE}
-    COMMAND ${LUAROCKS_BINARY}
-    ARGS build luacheck 0.23.0-1 ${LUAROCKS_BUILDARGS}
+    COMMAND ${LUAROCKS_BINARY} build luacheck 0.23.0-1 ${LUAROCKS_BUILDARGS}
     DEPENDS busted)
   add_custom_target(luacheck DEPENDS ${LUACHECK_EXE})
 
   # luv
   set(LUV_DEPS luacheck)
   if(USE_BUNDLED_LUV)
-    list(APPEND LUV_DEPS luv-static lua-compat-5.3)
-    if(MINGW AND CMAKE_CROSSCOMPILING)
-      list(APPEND LUV_DEPS libuv_host)
-    endif()
-    set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC")
-    if(USE_BUNDLED_LIBUV)
-      list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR})
-      # workaround for bug introduced in
-      # https://github.com/luarocks/luarocks/commit/83126ba324846b754ffc5e0345341f01262b3f86
-      if(MSVC)
-        list(APPEND LUV_ARGS LIBUV_LIBDIR=${HOSTDEPS_INSTALL_DIR}/lib)
-      endif()
-    endif()
-    SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3/c-api)
-    add_custom_command(OUTPUT ${ROCKS_DIR}/luv
-      COMMAND ${LUAROCKS_BINARY}
-      ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS} ${LUV_PRIVATE_ARGS}
-      WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv
-      DEPENDS ${LUV_DEPS})
+    set(NVIM_CLIENT_DEPS luacheck luv-static lua-compat-5.3)
   else()
     add_custom_command(OUTPUT ${ROCKS_DIR}/luv
-      COMMAND ${LUAROCKS_BINARY}
-      ARGS build luv ${LUV_VERSION} ${LUAROCKS_BUILDARGS}
-      DEPENDS ${LUV_DEPS})
+      COMMAND ${LUAROCKS_BINARY} build luv ${LUV_VERSION} ${LUAROCKS_BUILDARGS}
+      DEPENDS luacheck)
+    add_custom_target(luv DEPENDS ${ROCKS_DIR}/luv)
+    set(NVIM_CLIENT_DEPS luv)
   endif()
-  add_custom_target(luv DEPENDS ${ROCKS_DIR}/luv)
 
   # nvim-client: https://github.com/neovim/lua-client
   add_custom_command(OUTPUT ${ROCKS_DIR}/nvim-client
-    COMMAND ${LUAROCKS_BINARY}
-    ARGS build nvim-client 0.2.2-1 ${LUAROCKS_BUILDARGS}
-    DEPENDS luv)
+    COMMAND ${LUAROCKS_BINARY} build nvim-client 0.2.4-1 ${LUAROCKS_BUILDARGS}
+    DEPENDS ${NVIM_CLIENT_DEPS})
   add_custom_target(nvim-client DEPENDS ${ROCKS_DIR}/nvim-client)
 
   list(APPEND THIRD_PARTY_DEPS busted luacheck nvim-client)

cmake.deps/cmake/BuildLuv.cmake

@@ -0,0 +1,103 @@
+set(LUV_SRC_DIR ${DEPS_BUILD_DIR}/src/luv)
+set(LUV_INCLUDE_FLAGS
+  "-I${DEPS_INSTALL_DIR}/include -I${DEPS_INSTALL_DIR}/include/luajit-2.1")
+
+set(LUV_CONFIGURE_COMMAND_COMMON
+  ${CMAKE_COMMAND} ${LUV_SRC_DIR}
+  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+  ${BUILD_TYPE_STRING}
+  -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+  -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_ALT_SEP}
+  -DLUA_BUILD_TYPE=System
+  -DLUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3
+  -DWITH_SHARED_LIBUV=ON
+  -DBUILD_SHARED_LIBS=OFF
+  -DBUILD_STATIC_LIBS=ON
+  -DBUILD_MODULE=OFF)
+
+if(USE_BUNDLED_LUAJIT)
+  list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=LuaJit)
+elseif(USE_BUNDLED_LUA)
+  list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=Lua)
+else()
+  find_package(LuaJit)
+  if(LUAJIT_FOUND)
+    list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=LuaJit)
+  else()
+    list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=Lua)
+  endif()
+endif()
+
+if(USE_BUNDLED_LIBUV)
+  set(LUV_CONFIGURE_COMMAND_COMMON
+    ${LUV_CONFIGURE_COMMAND_COMMON}
+    -DCMAKE_PREFIX_PATH=${DEPS_INSTALL_DIR}
+    -DLIBUV_LIBRARIES=uv_a)
+endif()
+
+if(MSVC)
+  set(LUV_CONFIGURE_COMMAND
+    ${LUV_CONFIGURE_COMMAND_COMMON}
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+    # Same as Unix without fPIC
+    "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} ${LUV_INCLUDE_FLAGS}"
+    # Make sure we use the same generator, otherwise we may
+    # accidentally end up using different MSVC runtimes
+    -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+else()
+  set(LUV_CONFIGURE_COMMAND
+    ${LUV_CONFIGURE_COMMAND_COMMON}
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} ${LUV_INCLUDE_FLAGS} -fPIC")
+  if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND
+      (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly"))
+      set(LUV_CONFIGURE_COMMAND ${LUV_CONFIGURE_COMMAND} -DCMAKE_MAKE_PROGRAM=gmake)
+  endif()
+endif()
+
+ExternalProject_Add(lua-compat-5.3
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LUA_COMPAT53_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/lua-compat-5.3
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/lua-compat-5.3
+    -DURL=${LUA_COMPAT53_URL}
+    -DEXPECTED_SHA256=${LUA_COMPAT53_SHA256}
+    -DTARGET=lua-compat-5.3
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND "")
+
+ExternalProject_Add(luv-static
+  PREFIX ${DEPS_BUILD_DIR}
+  DEPENDS lua-compat-5.3
+  URL ${LUV_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luv
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/luv
+    -DURL=${LUV_URL}
+    -DEXPECTED_SHA256=${LUV_SHA256}
+    -DTARGET=luv-static
+    # The source is shared with BuildLuarocks (with USE_BUNDLED_LUV).
+    -DSRC_DIR=${DEPS_BUILD_DIR}/src/luv
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND "${LUV_CONFIGURE_COMMAND}"
+  BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>
+  LIST_SEPARATOR |)
+
+list(APPEND THIRD_PARTY_DEPS luv-static)
+if(USE_BUNDLED_LUAJIT)
+  add_dependencies(luv-static luajit)
+elseif(USE_BUNDLED_LUA)
+  add_dependencies(luv-static lua)
+endif()
+if(USE_BUNDLED_LIBUV)
+  add_dependencies(luv-static libuv)
+endif()

cmake.deps/cmake/BuildMsgpack.cmake

@@ -0,0 +1,42 @@
+set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
+  -DMSGPACK_BUILD_TESTS=OFF
+  -DMSGPACK_BUILD_EXAMPLES=OFF
+  -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+  -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_ALT_SEP}
+  "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC"
+  -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+
+if(MSVC)
+  # Same as Unix without fPIC
+  set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
+    -DMSGPACK_BUILD_TESTS=OFF
+    -DMSGPACK_BUILD_EXAMPLES=OFF
+    -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+    -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+    ${BUILD_TYPE_STRING}
+    "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1}"
+    # Make sure we use the same generator, otherwise we may
+    # accidentally end up using different MSVC runtimes
+    -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+endif()
+
+ExternalProject_Add(msgpack
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${MSGPACK_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/msgpack
+    -DURL=${MSGPACK_URL}
+    -DEXPECTED_SHA256=${MSGPACK_SHA256}
+    -DTARGET=msgpack
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND "${MSGPACK_CONFIGURE_COMMAND}"
+  BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
+  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>
+  LIST_SEPARATOR |)
+
+list(APPEND THIRD_PARTY_DEPS msgpack)

cmake.deps/cmake/BuildTreesitter.cmake

@@ -0,0 +1,38 @@
+if(MSVC)
+  set(TREESITTER_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TreesitterCMakeLists.txt
+    ${DEPS_BUILD_DIR}/src/tree-sitter/CMakeLists.txt
+    COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/tree-sitter/CMakeLists.txt
+      -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+      ${BUILD_TYPE_STRING}
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR})
+  set(TREESITTER_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
+  set(TREESITTER_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+else()
+  set(TS_CFLAGS "-O3 -Wall -Wextra")
+  set(TREESITTER_BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} CFLAGS=${TS_CFLAGS})
+  set(TREESITTER_INSTALL_COMMAND
+    ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} install)
+endif()
+
+ExternalProject_Add(tree-sitter
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${TREESITTER_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/tree-sitter
+  INSTALL_DIR ${DEPS_INSTALL_DIR}
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/tree-sitter
+    -DURL=${TREESITTER_URL}
+    -DEXPECTED_SHA256=${TREESITTER_SHA256}
+    -DTARGET=tree-sitter
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  BUILD_IN_SOURCE 1
+  CONFIGURE_COMMAND "${TREESITTER_CONFIGURE_COMMAND}"
+  BUILD_COMMAND "${TREESITTER_BUILD_COMMAND}"
+  INSTALL_COMMAND "${TREESITTER_INSTALL_COMMAND}")
+
+list(APPEND THIRD_PARTY_DEPS tree-sitter)

cmake.deps/cmake/BuildTreesitterParsers.cmake

@@ -0,0 +1,28 @@
+function(BuildTSParser LANG TS_URL TS_SHA256 TS_CMAKE_FILE)
+  set(NAME treesitter-${LANG})
+  ExternalProject_Add(${NAME}
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${TREESITTER_C_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/${NAME}
+  CMAKE_CACHE_ARGS
+    -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/${NAME}
+    -DURL=${TS_URL}
+    -DEXPECTED_SHA256=${TS_SHA256}
+    -DTARGET=${NAME}
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${TS_CMAKE_FILE}
+      ${DEPS_BUILD_DIR}/src/${NAME}/CMakeLists.txt
+  CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+    -DPARSERLANG=${LANG})
+endfunction()
+
+BuildTSParser(c ${TREESITTER_C_URL} ${TREESITTER_C_SHA256} TreesitterParserCMakeLists.txt)
+BuildTSParser(lua ${TREESITTER_LUA_URL} ${TREESITTER_LUA_SHA256} TreesitterParserCMakeLists.txt)
+BuildTSParser(vim ${TREESITTER_VIM_URL} ${TREESITTER_VIM_SHA256} TreesitterParserCMakeLists.txt)
+BuildTSParser(help ${TREESITTER_HELP_URL} ${TREESITTER_HELP_SHA256} TreesitterParserCMakeLists.txt)

cmake.deps/cmake/BuildUnibilium.cmake

@@ -0,0 +1,37 @@
+if(WIN32)
+  set(UNIBILIUM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UnibiliumCMakeLists.txt
+      ${DEPS_BUILD_DIR}/src/unibilium/CMakeLists.txt
+    COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/unibilium
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      # Pass toolchain
+      -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
+      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+      ${BUILD_TYPE_STRING}
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+  set(UNIBILIUM_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
+  set(UNIBILIUM_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
+else()
+  set(UNIBILIUM_BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
+      PREFIX=${DEPS_INSTALL_DIR} CFLAGS=-fPIC LDFLAGS+=-static
+    BUILD_IN_SOURCE 1)
+  set(UNIBILIUM_INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install)
+endif()
+
+ExternalProject_Add(unibilium
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${UNIBILIUM_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/unibilium
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+    -DPREFIX=${DEPS_BUILD_DIR}
+    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/unibilium
+    -DURL=${UNIBILIUM_URL}
+    -DEXPECTED_SHA256=${UNIBILIUM_SHA256}
+    -DTARGET=unibilium
+    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND "${UNIBILIUM_CONFIGURE_COMMAND}"
+  BUILD_COMMAND "${UNIBILIUM_BUILD_COMMAND}"
+  INSTALL_COMMAND "${UNIBILIUM_INSTALL_COMMAND}")
+
+list(APPEND THIRD_PARTY_DEPS unibilium)

cmake.deps/cmake/GettextCMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(gettext C)
 
 # Adds PREFIX to each item in LIST

cmake.deps/cmake/LibiconvCMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(libiconv C)
 
 include_directories(

cmake.deps/cmake/Libvterm-tbl2inc_c.cmake

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 
 set(HEX_ALPHABET "0123456789abcdef")
 

cmake.deps/cmake/LibvtermCMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(libvterm LANGUAGES C)
 
 include(GNUInstallDirs)

cmake.deps/cmake/TreesitterCMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(tree-sitter LANGUAGES C)
 
 file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/lib/src/*.c)

cmake.deps/cmake/TreesitterParserCMakeLists.txt

@@ -1,10 +1,12 @@
-cmake_minimum_required(VERSION 2.8.12)
-# some parsers have c++ scanner, problem?
-project(parser C) # CXX
+cmake_minimum_required(VERSION 3.10)
+project(parser C)
+
+set(CMAKE_C_STANDARD 99)
+file(GLOB source_files src/*.c)
 
 add_library(parser
   MODULE
-  src/parser.c
+  ${source_files}
 )
 set_target_properties(
   parser

cmake.deps/cmake/UnibiliumCMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(unibilium LANGUAGES C)
 
 file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/*.c)

cmake.deps/cmake/libtermkeyCMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.10)
 project(libtermkey)
 
 add_definitions(-D _CRT_SECURE_NO_WARNINGS)

cmake.deps/patches/libuv-disable-shared.patch

@@ -0,0 +1,117 @@
+From 326a1845f924432332071d03d156b7df4af7c46f Mon Sep 17 00:00:00 2001
+From: Tim Tavlintsev <ttavlintsev@enttec.com>
+Date: Thu, 21 Jul 2022 16:42:21 +1000
+Subject: [PATCH] Add CMake option LIBUV_BUILD_SHARED to enable/disable shared
+ library build Fix #3637
+
+---
+ CMakeLists.txt | 66 +++++++++++++++++++++++++++++---------------------
+ 1 file changed, 38 insertions(+), 28 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c42c3ff..a8e19980 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ cmake_dependent_option(LIBUV_BUILD_BENCH
+   "Build the benchmarks when building unit tests and we are the root project" ON
+   "LIBUV_BUILD_TESTS" OFF)
+ 
++option(LIBUV_BUILD_SHARED "Build shared lib" ON)
++
+ # Qemu Build
+ option(QEMU "build for qemu" OFF)
+ if(QEMU)
+@@ -390,25 +392,27 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD")
+   list(APPEND uv_test_libraries util)
+ endif()
+ 
+-add_library(uv SHARED ${uv_sources})
+-target_compile_definitions(uv
+-  INTERFACE
+-    USING_UV_SHARED=1
+-  PRIVATE
+-    BUILDING_UV_SHARED=1
+-    ${uv_defines})
+-target_compile_options(uv PRIVATE ${uv_cflags})
+-target_include_directories(uv
+-  PUBLIC
+-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+-  PRIVATE
+-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
+-if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
+-  target_include_directories(uv PUBLIC $<BUILD_INTERFACE:${ZOSLIB_DIR}/include>)
+-  set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX)
++if(LIBUV_BUILD_SHARED)
++  add_library(uv SHARED ${uv_sources})
++  target_compile_definitions(uv
++    INTERFACE
++      USING_UV_SHARED=1
++    PRIVATE
++      BUILDING_UV_SHARED=1
++      ${uv_defines})
++  target_compile_options(uv PRIVATE ${uv_cflags})
++  target_include_directories(uv
++    PUBLIC
++      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
++      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
++    PRIVATE
++      $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
++  if(CMAKE_SYSTEM_NAME STREQUAL "OS390")
++    target_include_directories(uv PUBLIC $<BUILD_INTERFACE:${ZOSLIB_DIR}/include>)
++    set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX)
++  endif()
++  target_link_libraries(uv ${uv_libraries})
+ endif()
+-target_link_libraries(uv ${uv_libraries})
+ 
+ add_library(uv_a STATIC ${uv_sources})
+ target_compile_definitions(uv_a PRIVATE ${uv_defines})
+@@ -669,28 +673,34 @@ string(REPLACE ";" " " LIBS "${LIBS}")
+ file(STRINGS configure.ac configure_ac REGEX ^AC_INIT)
+ string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" PACKAGE_VERSION "${configure_ac}")
+ set(UV_VERSION_MAJOR "${CMAKE_MATCH_1}")
+-# The version in the filename is mirroring the behaviour of autotools.
+-set_target_properties(uv PROPERTIES
+-  VERSION ${UV_VERSION_MAJOR}.0.0
+-  SOVERSION ${UV_VERSION_MAJOR})
++
+ set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
+ set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ set(prefix ${CMAKE_INSTALL_PREFIX})
+-configure_file(libuv.pc.in libuv.pc @ONLY)
+ configure_file(libuv-static.pc.in libuv-static.pc @ONLY)
+ 
+ install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc
++install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+-install(TARGETS uv EXPORT libuvConfig
+-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(TARGETS uv_a EXPORT libuvConfig
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(EXPORT libuvConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv)
+ 
++if(LIBUV_BUILD_SHARED)
++  # The version in the filename is mirroring the behaviour of autotools.
++  set_target_properties(uv PROPERTIES
++          VERSION ${UV_VERSION_MAJOR}.0.0
++          SOVERSION ${UV_VERSION_MAJOR})
++  configure_file(libuv.pc.in libuv.pc @ONLY)
++  install(FILES ${PROJECT_BINARY_DIR}/libuv.pc
++          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++  install(TARGETS uv EXPORT libuvConfig
++          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
++
+ if(MSVC)
+   set(CMAKE_DEBUG_POSTFIX d)
+ endif()
+-- 
+2.37.0
+

cmake.packaging/CMakeLists.txt

@@ -0,0 +1,64 @@
+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)

cmake.packaging/WixPatch.xml

@@ -0,0 +1,14 @@
+<CPackWiXPatch>
+    <!--  Fragment ID is from: <your build dir>/_CPack_Packages/win64/WIX/files.wxs -->
+    <CPackWiXFragment Id="CM_CP_bin.nvim.exe">
+      <Environment
+        Id='UpdatePath'
+        Name='PATH'
+        Action='set'
+        Permanent='no'
+        System='yes'
+        Part='last'
+        Value='[INSTALL_ROOT]bin'
+      />
+    </CPackWiXFragment>
+</CPackWiXPatch>

cmake.packaging/neovim.svg

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   viewBox="0 0 256 256"
+   version="1.1"
+   id="svg4612"
+   sodipodi:docname="neovim.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata4616">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>neovim-mark@2x</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1333"
+     id="namedview4614"
+     showgrid="false"
+     inkscape:zoom="2.1945358"
+     inkscape:cx="132.84232"
+     inkscape:cy="196.34741"
+     inkscape:window-x="0"
+     inkscape:window-y="34"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4612" />
+  <title
+     id="title4587">neovim-mark@2x</title>
+  <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+  <defs
+     id="defs4604">
+    <linearGradient
+       x1="167.95833"
+       y1="-0.46142399"
+       x2="167.95833"
+       y2="335.45523"
+       id="linearGradient-1"
+       gradientTransform="scale(0.46142398,2.1672042)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#16B0ED"
+         stop-opacity="0.800235524"
+         offset="0%"
+         id="stop4589" />
+      <stop
+         stop-color="#0F59B2"
+         stop-opacity="0.83700023"
+         offset="100%"
+         id="stop4591" />
+    </linearGradient>
+    <linearGradient
+       x1="1118.3427"
+       y1="-0.46586797"
+       x2="1118.3427"
+       y2="338.68604"
+       id="linearGradient-2"
+       gradientTransform="scale(0.46586797,2.1465309)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#7DB643"
+         offset="0%"
+         id="stop4594" />
+      <stop
+         stop-color="#367533"
+         offset="100%"
+         id="stop4596" />
+    </linearGradient>
+    <linearGradient
+       x1="356.33795"
+       y1="0"
+       x2="356.33795"
+       y2="612.90131"
+       id="linearGradient-3"
+       gradientTransform="scale(0.84189739,1.1877932)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#88C649"
+         stop-opacity="0.8"
+         offset="0%"
+         id="stop4599" />
+      <stop
+         stop-color="#439240"
+         stop-opacity="0.84"
+         offset="100%"
+         id="stop4601" />
+    </linearGradient>
+  </defs>
+  <g
+     id="Page-1"
+     sketch:type="MSPage"
+     style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
+     transform="matrix(0.34367476,0,0,0.34367476,25.312651,1.7737533)">
+    <g
+       id="mark-copy"
+       sketch:type="MSLayerGroup"
+       transform="translate(2,3)">
+      <path
+         d="M 0,155.5704 155,-1 V 727 L 0,572.23792 Z"
+         id="Left---green"
+         sketch:type="MSShapeGroup"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient-1)" />
+      <path
+         d="M 443.0604,156.9824 600,-1 596.81879,727 442,572.21994 Z"
+         id="Right---blue"
+         sketch:type="MSShapeGroup"
+         transform="matrix(-1,0,0,1,1042,0)"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient-2)" />
+      <path
+         d="M 154.98629,0 558,615.1897 445.2246,728 42,114.17202 Z"
+         id="Cross---blue"
+         sketch:type="MSShapeGroup"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient-3)" />
+      <path
+         d="M 155,283.83232 154.78675,308 31,124.71061 42.461949,113 Z"
+         id="Shadow"
+         sketch:type="MSShapeGroup"
+         inkscape:connector-curvature="0"
+         style="fill:#000000;fill-opacity:0.12999998" />
+    </g>
+  </g>
+</svg>

cmake/CheckUncrustifyVersion.cmake

@@ -0,0 +1,13 @@
+if(UNCRUSTIFY_PRG)
+  execute_process(COMMAND uncrustify --version
+    OUTPUT_VARIABLE user_version
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  string(REGEX REPLACE "[A-Za-z_#-]" "" user_version ${user_version})
+
+  file(STRINGS ${CONFIG_FILE} required_version LIMIT_COUNT 1)
+  string(REGEX REPLACE "[A-Za-z_# -]" "" required_version ${required_version})
+
+  if(NOT user_version STREQUAL required_version)
+    message(FATAL_ERROR "Wrong uncrustify version! Required version is ${required_version} but found ${user_version}")
+  endif()
+endif()

cmake/FindLibIntl.cmake

@@ -41,6 +41,16 @@ endif()
 if (MSVC)
   list(APPEND CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
 endif()
+
+# On macOS, if libintl is a static library then we also need
+# to link libiconv and CoreFoundation.
+get_filename_component(LibIntl_EXT "${LibIntl_LIBRARY}" EXT)
+if (APPLE AND (LibIntl_EXT STREQUAL ".a"))
+  set(LibIntl_STATIC TRUE)
+  find_library(CoreFoundation_FRAMEWORK CoreFoundation)
+  list(APPEND CMAKE_REQUIRED_LIBRARIES "${ICONV_LIBRARY}" "${CoreFoundation_FRAMEWORK}")
+endif()
+
 check_c_source_compiles("
 #include <libintl.h>
 
@@ -54,6 +64,9 @@ int main(int argc, char** argv) {
 if (MSVC)
   list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
 endif()
+if (LibIntl_STATIC)
+  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES  "${ICONV_LIBRARY}" "${CoreFoundation_FRAMEWORK}")
+endif()
 if (LibIntl_INCLUDE_DIR)
   list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
 endif()

cmake/FindLibUV.cmake

@@ -13,7 +13,7 @@ endif()
 find_path(LIBUV_INCLUDE_DIR uv.h
   HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS})
 
-list(APPEND LIBUV_NAMES uv)
+list(APPEND LIBUV_NAMES uv_a uv)
 
 find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES}
   HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS})

cmake/FindLua.cmake

@@ -1,197 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindLua
-# -------
-#
-#
-#
-# Locate Lua library This module defines
-#
-# ::
-#
-#   LUA_FOUND          - if false, do not try to link to Lua
-#   LUA_LIBRARIES      - both lua and lualib
-#   LUA_INCLUDE_DIR    - where to find lua.h
-#   LUA_VERSION_STRING - the version of Lua found
-#   LUA_VERSION_MAJOR  - the major version of Lua
-#   LUA_VERSION_MINOR  - the minor version of Lua
-#   LUA_VERSION_PATCH  - the patch version of Lua
-#
-#
-#
-# Note that the expected include convention is
-#
-# ::
-#
-#   #include "lua.h"
-#
-# and not
-#
-# ::
-#
-#   #include <lua/lua.h>
-#
-# This is because, the lua location is not standardized and may exist in
-# locations other than lua/
-
-unset(_lua_include_subdirs)
-unset(_lua_library_names)
-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)
-
-    if (Lua_FIND_VERSION_EXACT)
-        if (Lua_FIND_VERSION_COUNT GREATER 1)
-            set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
-        endif ()
-    elseif (Lua_FIND_VERSION)
-        # once there is a different major version supported this should become a loop
-        if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
-            if (Lua_FIND_VERSION_COUNT EQUAL 1)
-                set(_lua_append_versions ${LUA_VERSIONS5})
-            else ()
-                foreach (subver IN LISTS LUA_VERSIONS5)
-                    if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
-                        list(APPEND _lua_append_versions ${subver})
-                    endif ()
-                endforeach ()
-            endif ()
-        endif ()
-    else ()
-        # once there is a different major version supported this should become a loop
-        set(_lua_append_versions ${LUA_VERSIONS5})
-    endif ()
-
-    list(APPEND _lua_include_subdirs "include/lua" "include")
-
-    foreach (ver IN LISTS _lua_append_versions)
-        string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
-        list(APPEND _lua_include_subdirs
-             include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
-    endforeach ()
-
-    set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
-    set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
-endfunction(_lua_set_version_vars)
-
-function(_lua_check_header_version _hdr_file)
-    # At least 5.[012] have different ways to express the version
-    # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
-    # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
-    file(STRINGS "${_hdr_file}" lua_version_strings
-         REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
-
-    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
-    if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
-        set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
-    else ()
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
-            string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        endif ()
-        string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
-    endif ()
-    foreach (ver IN LISTS _lua_append_versions)
-        if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
-            set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE)
-            set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE)
-            set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE)
-            set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE)
-            return()
-        endif ()
-    endforeach ()
-endfunction(_lua_check_header_version)
-
-_lua_set_version_vars()
-
-if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-    _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
-endif ()
-
-if (NOT LUA_VERSION_STRING)
-    foreach (subdir IN LISTS _lua_include_subdirs)
-        unset(LUA_INCLUDE_PREFIX CACHE)
-        find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
-          HINTS
-            ENV LUA_DIR
-          PATHS
-          ~/Library/Frameworks
-          /Library/Frameworks
-          /sw # Fink
-          /opt/local # DarwinPorts
-          /opt/csw # Blastwave
-          /opt
-        )
-        if (LUA_INCLUDE_PREFIX)
-            _lua_check_header_version("${LUA_INCLUDE_PREFIX}/${subdir}/lua.h")
-            if (LUA_VERSION_STRING)
-                set(LUA_INCLUDE_DIR "${LUA_INCLUDE_PREFIX}/${subdir}")
-                break()
-            endif ()
-        endif ()
-    endforeach ()
-endif ()
-unset(_lua_include_subdirs)
-unset(_lua_append_versions)
-
-if (LUA_VERSION_STRING)
-    set(_lua_library_names
-        lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}
-        lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
-        lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
-        lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
-    )
-endif ()
-
-find_library(LUA_LIBRARY
-  NAMES ${_lua_library_names} lua
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES lib
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-unset(_lua_library_names)
-
-if (LUA_LIBRARY)
-    # include the math library for Unix
-    if (UNIX AND NOT APPLE AND NOT BEOS)
-        find_library(LUA_MATH_LIBRARY m)
-        set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
-
-        # include dl library for statically-linked Lua library
-        get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
-        if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
-          list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
-        endif()
-
-    # For Windows and Mac, don't need to explicitly include the math library
-    else ()
-        set(LUA_LIBRARIES "${LUA_LIBRARY}")
-    endif ()
-endif ()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)

cmake/FindWinpty.cmake

@@ -1,10 +0,0 @@
-include(LibFindMacros)
-
-find_path(WINPTY_INCLUDE_DIR winpty.h)
-set(WINPTY_INCLUDE_DIRS ${WINPTY_INCLUDE_DIR})
-
-find_library(WINPTY_LIBRARY winpty)
-find_program(WINPTY_AGENT_EXE winpty-agent.exe)
-set(WINPTY_LIBRARIES ${WINPTY_LIBRARY})
-
-find_package_handle_standard_args(Winpty DEFAULT_MSG WINPTY_LIBRARY WINPTY_INCLUDE_DIR)

cmake/Format.cmake

@@ -0,0 +1,67 @@
+# Returns a list of all files that has been changed in current branch compared
+# to master branch. This includes unstaged, staged and committed files.
+function(get_changed_files outvar)
+  set(default_branch master)
+
+  execute_process(
+    COMMAND git branch --show-current
+    OUTPUT_VARIABLE current_branch
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  execute_process(
+    COMMAND git merge-base ${default_branch} ${current_branch}
+    OUTPUT_VARIABLE ancestor_commit
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # Changed files that have been committed
+  execute_process(
+    COMMAND git diff --name-only ${ancestor_commit}...${current_branch}
+    OUTPUT_VARIABLE committed_files
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  separate_arguments(committed_files NATIVE_COMMAND ${committed_files})
+
+  # Unstaged files
+  execute_process(
+    COMMAND git diff --name-only
+    OUTPUT_VARIABLE unstaged_files
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  separate_arguments(unstaged_files NATIVE_COMMAND ${unstaged_files})
+
+  # Staged files
+  execute_process(
+    COMMAND git diff --cached --name-only
+    OUTPUT_VARIABLE staged_files
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+  separate_arguments(staged_files NATIVE_COMMAND ${staged_files})
+
+  set(files ${committed_files} ${unstaged_files} ${staged_files})
+  list(REMOVE_DUPLICATES files)
+
+  set(${outvar} "${files}" PARENT_SCOPE)
+endfunction()
+
+get_changed_files(changed_files)
+
+if(LANG STREQUAL c)
+  list(FILTER changed_files INCLUDE REGEX "\\.[ch]$")
+  list(FILTER changed_files INCLUDE REGEX "^src/nvim/")
+
+  if(changed_files)
+    if(FORMAT_PRG)
+      execute_process(COMMAND ${FORMAT_PRG} -c "src/uncrustify.cfg" --replace --no-backup ${changed_files})
+    else()
+      message(STATUS "Uncrustify not found. Skip formatting C files.")
+    endif()
+  endif()
+elseif(LANG STREQUAL lua)
+  list(FILTER changed_files INCLUDE REGEX "\\.lua$")
+  list(FILTER changed_files INCLUDE REGEX "^runtime/")
+
+  if(changed_files)
+    if(FORMAT_PRG)
+      execute_process(COMMAND ${FORMAT_PRG} ${changed_files})
+    else()
+      message(STATUS "Stylua not found. Skip formatting lua files.")
+    endif()
+  endif()
+endif()

cmake/GenerateVersion.cmake

@@ -0,0 +1,34 @@
+set(NVIM_VERSION
+    "v${NVIM_VERSION_MAJOR}.${NVIM_VERSION_MINOR}.${NVIM_VERSION_PATCH}${NVIM_VERSION_PRERELEASE}")
+
+execute_process(
+  COMMAND git describe --first-parent --dirty --always
+  OUTPUT_VARIABLE GIT_TAG
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  RESULT_VARIABLE RES)
+
+if(RES AND NOT RES EQUAL 0)
+  message(STATUS "Using NVIM_VERSION: ${NVIM_VERSION}")
+  file(WRITE "${OUTPUT}" "")
+  return()
+endif()
+
+# `git describe` annotates the most recent tagged release; for pre-release
+# builds we append that to the dev version.
+if(NVIM_VERSION_PRERELEASE)
+  string(REGEX REPLACE "^v[0-9]+.[0-9]+.[0-9]+-" "" NVIM_VERSION_GIT "${GIT_TAG}")
+  string(REGEX REPLACE "^([0-9]+)-([a-z0-9]+)" "\\1+\\2" NVIM_VERSION_GIT "${NVIM_VERSION_GIT}")
+  set(NVIM_VERSION "${NVIM_VERSION}-${NVIM_VERSION_GIT}")
+endif()
+
+set(NVIM_VERSION_STRING "#define NVIM_VERSION_MEDIUM \"${NVIM_VERSION}\"\n")
+
+string(SHA1 CURRENT_VERSION_HASH "${NVIM_VERSION_STRING}")
+if(EXISTS ${OUTPUT})
+  file(SHA1 "${OUTPUT}" NVIM_VERSION_HASH)
+endif()
+
+if(NOT "${NVIM_VERSION_HASH}" STREQUAL "${CURRENT_VERSION_HASH}")
+  message(STATUS "Using NVIM_VERSION: ${NVIM_VERSION}")
+  file(WRITE "${OUTPUT}" "${NVIM_VERSION_STRING}")
+endif()

cmake/InstallClintErrors.cmake

@@ -1,2 +0,0 @@
-file(GLOB_RECURSE JSON_FILES *.json)
-file(COPY ${JSON_FILES} DESTINATION "${TARGET}")

cmake/InstallHelpers.cmake

@@ -45,7 +45,7 @@ function(create_install_dir_with_perms)
     while(NOT EXISTS \$ENV{DESTDIR}\${_current_dir} AND NOT \${_prev_dir} STREQUAL \${_current_dir})
       list(APPEND _parent_dirs \${_current_dir})
       set(_prev_dir \${_current_dir})
-      get_filename_component(_current_dir \${_current_dir} PATH)
+      get_filename_component(_current_dir \${_current_dir} DIRECTORY)
     endwhile()
 
     if(_parent_dirs)