NVIM v0.8.0

BREAKING CHANGES
- Remove 'insertmode' 'remap' and 'terse' options
- highlight: Rename attributes to match Vim (#19159)
- highlight: Error on invalid names and allow '.' and '@'
- terminal: Drop winpty, require Windows 10 #18253
- treesitter: Use @foo.bar style highlight groups
- treesitter: Do not merge queries by default (#20105)

FEATURES
- runtime: Enable filetype.lua by default (#19216)
- Add `undo!`
- Add "prerelease" to version dict
- Click support for 'statusline', 'winbar' #18650
- Add preview functionality to user commands
- allow cmdheight=0 (EXPERIMENTAL) #16251
- Stdpath('run'), /tmp/nvim.user/ #18993
- Add 'mousescroll' option (#12355)
- Allow :wincmd to accept a count (#19815)
- Multibuffer preview support for inccommand
- Man: Port to Lua (#19912)
- api: Ui options relevant for remote TUI
- api: Add `nvim_parse_cmd` And `nvim_cmd`
- api: Support handling stdin stream in remote ui
- api: Add `group_name` to `nvim_get_autocmds`
- api: Enable nvim_exec_autocmds to pass arbitrary data (#18613)
- api: Support pattern array for exec_autocmds
- api: Add `unsilent` to command APIs
- api: Add replace_keycodes to nvim_set_keymap (#19598)
- api: Add support for :horizontal modifier
- api: Add "move" to nvim_input_mouse
- api/ui: "ui_watched" option for ui-side extmarks
- build: Add_glob_target runs only on changed files #19070
- checkhealth: Check for slow shell #17829
- defaults: Session data in $XDG_STATE_HOME #15583
- defaults: Search selection by * and # in visual mode (#18538)
- defaults: Nnoremap & :&&<CR> #19365
- defaults: enable mouse by default (set mouse=nvi)  #19290
- diagnostic: Pass diagnostics as data to DiagnosticChanged autocmd (#20173)
- docs: Gen_help_html.lua
- edit: Insert an unsimplified key using CTRL-SHIFT-V
- treesitter: Full support for spelling
- filetype: Convert more patterns to filetype.lua
- filetype: Remove side effects from vim.filetype.match (#18894)
- filetype: Expand environment variables in filetype patterns (#20145)
- fs: Add vim.fs functions: parents() dirname() basename() dir() find() normalize()
- highlight: Implement CurSearch highlight
- highlight: Support scoped @spam.eggs.baked_beans groups
- input: Delay all simplifications
- l10n: Turkish translations #19441
- l10n: Improve zh_CN translations (#19483)
- lsp: Remove capabilities sanitization (#17814)
- lsp: Show feedback on empty hover response (#18308)
- lsp: Options to filter and auto-apply code actions (#18221)
- lsp: Add vim.lsp.buf.format (#18193)
- lsp: Add logging level "OFF" (#18379)
- lsp: Add LspAttach and LspDetach autocommands
- lsp: Add filter to vim.lsp.get_active_clients()
- lsp: Option to reuse_win for jump actions (#18577)
- lsp: Add a start function (#18631)
- lsp: Send didChangeConfiguration after init (#18847)
- lsp: Defaults: tagfunc, omnifunc, formatexpr (#19003, #19677)
- lsp: Allow passing custom list handler to LSP functions that return lists (#19213)
- lsp: Provide feedback if server can't compute rename result (#19546)
- lsp: Add range option to code_action; deprecate range_code_action (#19551)
- lsp: Disable exit_timeout by default (#19672)
- lsp: Add tcp support
- lua: Vim.deprecate() #18320
- lua: Vim.cmd() with kwargs acts like nvim_cmd() #18523
- lua: Allow some vim script functions to run in fast callbacks
- lua: Measure require in --startuptime
- lua: Allow vim.cmd to be indexed (#19238)
- lua: Print source locations of lua callbacks (#19597)
- lua: Add vim.iconv (#18286)
- lua: Vim.ui_attach to get ui events from lua (EXPERIMENTAL)
- man.vim: List command flags in "gO" outline #17558
- mappings: Do not replace existing mapping for simplified form
- mappings: Allow special keys and modifiers in <Cmd> mapping
- mapset: Support restoring "replace_keycodes" and "desc"
- mapset: Support restoring Lua callback (#20024)
- marks: Restore viewport on jump #15831
- nvim_create_user_command: Pass structured modifiers to commands
- pum: Pretend 'mousemoveevent' is set when showing right-click menu
- server: Set $NVIM, unset $NVIM_LISTEN_ADDRESS #11009
- server: Instance "name", store pipes in stdpath(state)
- term: Add support for libvterm >= 0.2
- terminal: Implement <c-\><c-o> for terminal mode
- terminal: Recognize underdouble and undercurl
- terminfo: Bump built-in terminfo entries (#18570)
- treesitter: Allow customizing language symbol name
- treesitter: Add ability to retreive a tree/node given a range
- treesitter: Upstream node methods from nvim-treesitter
- treesitter: Include language in invalid query error (#14053)
- treesitter: Bundle Lua parser and queries
- treesitter: Add viml parser and queries
- treesitter: Add injections
- treesitter: Add vim.treesitter.start(), enable for Lua
- treesitter: Bundle :help parser and queries
- tui: Query terminal for CSI u support (#18181)
- tui: Recognize keypad keys when using kitty keyboard protocol
- tui: Try terminfo for [re]set_cursor_color OSC #19255
- tui: Allow grid and host to disagree on ambiguous-width chars (#19686)
- tui: Recognize sidescroll events (#19992)
- tui: Support 'mousemoveevent'
- ui: Add `'winbar'`
- ui: Clear message history explicitly with msg_history_clear event
- ui: Make right-click menu work properly with ext_multigrid
- ui: Allow to set the highlight namespace per window
- ui: Use msg_grid based implementation for cmdheight=0
- ui-ext: Make 'mousemoveevent' a ui_option
- eval: Make Lua Funcref work as method and in substitute() (#20217)
- eval: Input() support any type for "cancelreturn" in a dict (#19357)

BUG FIXES
- Show autocmd output when F is in shortmess (#18251)
- Has() should preserve v:shell_error #18280
- Suppress "is a directory" messages with shortmess 'F' (#18296)
- Display global statusline correctly with ext_messages
- Correct nlua_wait error message #18867
- Right-click in clickable statusline #19252
- Remote UI may get invalid 'pumblend' value #19379
- Assertion failure when requiring missing module in autocmd
- api: Nvim_eval_statusline should validate input #18347
- api: Check error after getting win/buf handle (#19052)
- api: Check for inclusive buffer line index out of bounds correctly (#19056)
- api: Change default value of 'pattern' in nvim_exec_autocmds (#19115)
- api: Do not switch win/buf if getting option in current win/buf (#19383)
- api: Make nvim_set_hl(ns=0, ...) redraw screen properly
- api: Nvim_set_hl bail out on invalid group name (#20021)
- api: Notify dict watchers on nvim_set_var and vim.g setter
- api/command: Fargs behavior when no arguments are passed (#19862)
- autocmds: Separate command from desc (#18617)
- buffer: Disable buffer-updates before removing from window #18933
- build: Missing definitions for sizeof macros #16393
- build: Only pass -municode if MINGW #19049
- build: Strip trailing newline from variable (#19084)
- build: Don't disable byte precompilation on debug builds
- build: Fails if git is missing #19366
- charclass: Make behavior with empty str match latest Vim (#19749)
- checkhealth: Skip vim.health #18816
- ci: Remove 2000ms blocking wait in many plugin/lsp_spec.lua tests
- cmd: Make :-tabmove work with modifiers (#18447)
- cmdheight=0: Various issues part3 #19816
- cmdline: Fix passing -1 as char
- cmdline: Trigger CmdlineEnter and ModeChanged earlier (#19474)
- cmdline: Do not trigger completion at wrong time (#19920)
- cmdline: Don't send invalid cursor with incsearch and cmdheight=0
- column: Move sign sentinel after inserting/deleting lines (#20400)
- completion: Remove wrong FUNC_ATTR_NONNULL_ALL (#19627)
- diagnostic: Use nvim_exec_autocmds to trigger DiagnosticChanged (#18188)
- diagnostic: Check for negative column value (#18868)
- diagnostic: Remove buf from cache on `BufWipeout` (#20099)
- diagnostic: Populate data key in DiagnosticChanged autocmd in reset (#20207)
- docs: Correct obsolete note about 'writedelay' in dev docs
- docs: Remove internal function from docs
- edit.c: Indentkeys double indent after "!" #12894
- eval: Check for v:lua when calling callback (#19855)
- eval/f_getmatches: Return empty list for invalid win argument (#18893)
- events: Make CursorHold behave as documented
- ex_cmds: Correct flags for :const (#19387)
- exceptions: Restore `did_throw` (#20000)
- exmode: Do not throttle messages when pressing enter to print line
- extmarks: Make virt_lines always start at 0 virtcol
- filetype: Fix and improve filetype patterns
- fillchars: Change fallback after setcellwidths()
- float: Make `screen*()` functions respect floating windows
- float: Fix glitch when making float window with border a split
- float: Fix mouse drag position if float window turned to a split
- folds: Fix fold regression with :move (#18685)
- folds: Fix fold remains when :delete makes buffer empty (#19673)
- ftdetect: Source plugins in autogroup (#18237)
- gen_vimdoc.py: Handle missing luajit
- getchar: Flush screen before doing a blocking wait
- handlers: More specific error messages (#16772)
- health: Correct shada file path #18603
- health: Handle non-existent log file #18610
- highlight: Use ctermbg/fg instead of bg/fg when use_rgb=false #18982
- highlight: Add missing 'nocombine' to nvim_get_hl apis (#19586)
- highlight: Set the window namespace when redrawing statusline
- hl: Set Normal hl group sg_attr value #18820
- hl: Return cterm fg/bg even if they match Normal #18981
- inccommand: Do not try to preview an ambiguous command (#18827)
- inccommand: Avoid crash if callback changes inccommand option (#18830)
- inccommand: Clear cmdpreview state if preview is not shown (#18923)
- inccommand: Skip split window if not enough room #18937
- inccommand: Never preview if parsing command failed (#18944)
- inccommand: Parse the command to check if it is previewable
- inccommand: Deal with unsynced undo (#20041)
- input: Allow Ctrl-C to interrupt a recursive mapping even if mapped (#18885)
- input: Fix macro recording with ALT and special key (#18917)
- input: Use correct grid when restoring cursor for <expr> mapping (#19047)
- input: Do no reinterpret mouse keys with ALT modifiers
- input: Use click number of last click for mouse drag (#20300)
- inspect: Escape identifiers that are lua keywords (#19898)
- keywordprg: Default to :help if set to empty string (#19983)
- l10n: Improve zh_CN and zh_TW translations (#19969)
- log: Back even again
- logging: Skip recursion, fix crash #18764
- logging: Make logmsg() thread-safe again
- logging: Try harder to resolve Nvim "name" #19016
- lsp: Unify progress message handling (#18040)
- lsp: Fix unnecessary buffers being added on empty diagnostics (#18275)
- lsp: Fix infinite loop in resolved_capabilities deprecation message (#18333)
- lsp: Add missing bufnr argument (#18382)
- lsp: Fix rename capability checks and multi client support (#18441)
- lsp: Detach spawned LSP server processes (#18477)
- lsp: Perform client side filtering of code actions (#18392)
- lsp: Only send diagnostics from current buffer in code_action() (#18639)
- lsp: Respect global syntax setting in open float preview (#15225)
- lsp: Include cancellable in progress message table (#18809)
- lsp: Adjust offset encoding in lsp.buf.rename() (#18829)
- lsp: Set buflisted before switching to buffer (#18854)
- lsp: Fix multi client handling in code action (#18869)
- lsp: Small bugs in snippet-parser #18998
- lsp: Pcall nvim_del_augroup_by_name (#19302)
- lsp: Abort pending changes after flush when debouncing (#19314)
- lsp: Don't attach a client in lsp.start() if there is none (#19328)
- lsp: Account for initializing servers in vim.lsp.start (#19329)
- lsp: Move augroup define to if statement (#19406)
- lsp: Set workspace.configuration capability (#19548)
- lsp: Send didOpen if name changes on write (#19583)
- lsp: Prevent unexpected position jumps (#19370)
- lsp: Avoid  ^M character in hover window on Windows (#19640)
- lsp: Set end_col in formatexpr (#19676)
- lsp: Handle multiple clients with incremental sync (#19658)
- lsp: Fix some type annotations in lsp.rpc (#19714)
- lsp: Avoid pipe leaks if lsp cmd isn't executable (#19717)
- lsp: Handle nil client in onexit callback (#19722)
- lsp: Fix nil value error in get_group (#19735)
- lsp: Clean the diagnostic cache when buffer delete (#19449)
- lsp: When buffer detach remove buffer from client attached buffers (#20081)
- lsp: Schedule removal of client object (#20148)
- lsp: Support `false` result in handlers (#20252)
- lsp: Out of bounds error in lsp.util.apply_text_edits (#20137)
- lsp: Use correct function name in deprecated message (#20308)
- lsp: Create missing directory before creating file (#19835)
- lua: Don't mutate opts parameter of vim.keymap.del (#18227)
- lua: Stop pending highlight.on_yank timer, if any (#18824)
- lua: Highlight.on_yank can close timer in twice #18976
- lua: Clear got_int when calling vim.on_key() callback (#18979)
- lua: Don't leak memory on error
- lua: Double entries in :lua completion #19410
- lua: Make it possible to cancel vim.wait() with Ctrl-C (#19217)
- lua: Make ui_attach()/ui_detach() take effect immediately (#20037)
- lua: Make vim.str_utfindex and vim.str_byteindex handle NUL bytes
- lua: Free vim.ui_attach callback before lua close (#20205)
- lua: Fix architecture-dependent behavior in usercmd "reg" (#20384)
- mac: Use same $LANG fallback mechanism as Vim
- mac: Add CoreServices to flake.nix #18358
- man.vim: Q in "$MANPAGER mode" does not quit #18443
- maparg: Remove double allocation (#20033)
- mappings: Fix double-free when unmapping simplifiable Lua mapping
- mapset: Remove existing abbreviation of same lhs (#20320)
- mark: Set mark fnum from buffer (#19195)
- mark: Mark without a view restores at topline #19224
- mark: Fix unexpected cursor movements (#19253)
- mark: Give correct error message when mark is in another buffer (#19454)
- menu: Make :menu still print header when there are no menus
- messages: Add color when showing nvim_echo in :messages history
- messages: Do not crash on cmdheight=0 and g< redisplay
- messages: Validate msg_grid before silent! message with cmdheight=0
- mksession: Don't store floats in session #18635
- mouse: Click on global statusline with splits (#19390)
- mouse: Fix using uninitialized memory with K_MOUSEMOVE (#19480)
- mpack: Make sure a `bool` always is a `bool`
- normal: Fix segfault with bracket command jumping to a mark
- options: Properly free string options (#19510)
- options: Mark `winhighlight` as list style  (#19477)
- packaging: Remove excess forward slash in Wix Patch (#18121)
- paste: Ignore mappings in Cmdline mode (#18114)
- path: Path_is_url returns false for "foo:/" #19797
- powershell: Filter ":!" commands with args #19268
- pum: Make right drag in anchor grid to select work in multigrid UI (#19382)
- query: Fix unnatural order for inherits in treesitter queries (#20298)
- redraw: Make sure :redraw! redraws command line
- redraw: Handle switching to a tabpage with larger p_ch value
- redraw: Avoid unnecessary redraws and glitches with floats+messages
- redraw: Make redrawdebug=nodelta handle all the cases
- rpc: Break nvim_error_event feedback loop between two nvim instances
- runtime/genvimvim: Omit s[ubstitute] from vimCommand #18480
- screen: Restart win_update() if a decor provider changes signcols (#18768)
- screen: Check for col instead of vcol when drawing fold (#19572)
- session: Respect sessionoptions=terminal #19497
- shared: Avoid indexing unindexable values in vim.tbl_get() (#18337)
- signs: Priority of extmark signs (#19718)
- source: Make changing 'shellslash' change expand() result
- source: Fix expand('<sfile>') no longer works for Lua
- spell: Make setting 'encoding' clear word list
- spell: Correct spell move behavior without "noplainbuffer" (#20386)
- startup: Nvim with --clean should not load user rplugins
- substitute: Subtract number of backslashes later
- tabpage: Check if ROWS_AVAIL changed for resize (#19620)
- terminal: Invalid pointer comparison #18453
- terminal: Do not trim whitespace that is actually in the terminal (#16423)
- terminal: Scrollback delete lines immediately #18832
- terminal: Coverity USE_AFTER_FREE #18978
- terminal: Crash if TermClose deletes own buffer #19222
- terminal: Avoid reading over the end of cell.chars (#19580)
- terminal: Skip aucmd_win when checking terminal size (#19668)
- terminal: Adopt altscreen test for libvterm 0.2 changes
- terminfo: Disable smglr for vtpcon and conemu (#18855)
- termopen: Avoid ambiguity in URI when CWD is root dir (#16988)
- tests: Fix some screen.lua warnings
- tests: Fix some issues with ui/inccommand_spec.lua causing slowness
- tests: Unreliable parser_spec #18911
- tests: Check for EOF on exit of nvim properly
- tests: Missing clear() #18927
- tests: Remove misleading $TEST_PATH segment #19050
- tests: Remove irrelevant usage of display-=msgsep
- tests: Use pending_c_parser when needed
- tests: Indicate in test logs when nvim exit times out
- tmpdir: Invalid tempname() if username has slashes #19323
- treesitter: Create new parser if language is not the same as cached parser (#18149)
- treesitter: Bump match limit up
- treesitter: Offset directive associates range with capture (#18276)
- treesitter: Correct region for string parser (#18794)
- treesitter: New iter if folded
- treesitter: Don't error when node argument of predicate is nil (#19355)
- treesitter: Free memory on removing parser (#19933)
- treesitter: More efficient node:root()
- treesitter: Make it get_captures_at_position
- treesitter: Do not link @error by default
- treesitter: Don't support legacy syntax in start()
- treesitter: Use the right loading order for base queries (#20117)
- treesitter: Prevent endless loop on self-inheritence
- treesitter: Return full metadata for get_captures_at_position (#20203)
- ts: Do not clobber spelloptions (#20095)
- tui: Update modifyOtherKeys reporting (#18158)
- tui: Disable extended keys before exiting alternate screen (#18318)
- tui: Piping nodejs to nvim breaks input handling #18932
- tui: Resize at startup #17795
- tui: Add fixups for hterm family #19078
- tui: Handle padding requirements for visual bell (#20238)
- ui: Require window-local value to show winbar on floating windows (#18773)
- ui: Do not call showmode() when setting window height (#18969)
- ui: Set redraw_cmdline when setting window height (#19630)
- ui: Don't allow decor provider with ns_id==0
- ui: Ui compositor does not correctly free event callbacks
- ui: Allow redrawing statusline when msgsep is used (#20337)
- ui: Redraw end of buffer if last line is modified (#20354)
- unittests: Coredump when running unit tests #18663
- usercmd: Also check for whitespace after escaped character (#19942)
- version.c: Mark N/A vim patches #18587
- vim.ui.input: Accept nil or empty "opts"  #19109
- window: Close floats first when closing buffer in other tab (#20284)
- window: Fix equalization with cmdheight=0 (#20369)
- windows: Stdpath("state") => "nvim-data" #18546
- windows: Exepath, stdpath return wrong slashes #19111
- winhl: Do not crash when unsetting winhl in just opened window
- Make :undo! notify buffer update callbacks (#20344)
- eval: Make Vim functions return inner window width and height (#19743)

BUILD SYSTEM
- Bump Doxyfile to minimum required version 1.9.0 #18118
- Bump msgpack to 4.0.0
- Enable EXITFREE on Debug builds (#17783)
- Add formatting targets for c and lua files (#19488)
- clang-format: Align with project style #18192
- clint: Remove all python2-isms with pyupgrade
- clint: Remove "function size is too large" warning
- clint: Remove rules for includes, whitespace, tabs #18611
- cmake: Simplify and speed up the uninstall target
- cmake: Simplify def_cmd_target function
- cmake: Use glob_wrapper instead of file(GLOB in main CMakeLists
- cmake: Fix static `libintl` test on macOS
- deps: Bump LuaJIT, Luv and libuv
- deps: Support universal builds on macOS
- deps: Bump tree-sitter to v0.20.7 (#20067)
- deps: Bump tree-sitter parsers
- deps: Bump required libvterm to v0.3 (#20222)
- deps: Require libtermkey version 0.22
- deps: update neovim-qt, win32tools.zip

PERFORMANCE
- Only redraw for CurSearch when it is currently in use
- highlight: Allocate permanent names in an arena for fun and cache locality
- highlight: Use binary search to lookup RGB color names
- map: Visit only one hash bucket instead of all, like an actual hash table
- memory: Get rid of extraneous heap allocations
- memory: implement arena memory allocation with a shared freelist
- memory: Use an arena for RPC decoding and some API return values
- messages: Don't call ui_flush() per message line in various places
- treesitter: Use a reuse list for query cursors
- ui: Reduce allocations when encoding and decoding "redraw" events
- ui: Avoid ui_flush() work in headless mode

REFACTOR
- checkhealth: Rename to vim.health, move logic to Lua #18720
- Add pure attribute to pure functions
- Replace char_u variables and functions with char
- Enable -Wconversion warning for all Nvim source files
- Add warnings for deprecated functions (#18662)
- Change type of linenr_T from long to int32_t
- Use nvim_get/set_option_value for vim.{b,w}o
- Remove functions marked for deprecation in 0.8 (#19299)
- Rename function prefix mb to the more accurate utf_cp (#19590)
- Remove some unused includes
- Change remaining sourcing_name/sourcing_lnum to exestack
- Change FALSE/TRUE to false/true
- api: Use a hashy hash for looking up api method and event names
- api: Use a unpacker based on libmpack instead of msgpack-c
- api: restructure api/vim.c and api/private/helpers.c code in separate files
- api: Remove redundant fields of CmdParseInfo
- aucmd: Call define_autocmd() directly for default autocmds
- ci: Cleanup release.yml #19132
- cmd: Format do_one_cmd()
- cmd: Hoist out some code into functions
- cmd: Unify execute_cmd with do_one_cmd
- decor: Use decor levels properly
- drawline.c: Factor out utf8 multibyte check
- eval: Use Hashy McHashFace instead of gperf
- eval.c: Resolve all clint issues (#19774)
- eval/funcs.c: Resolve all clint errors
- events: Remove unnecessary fudging of updating_screen
- ex_cd: Add an early return to fix clint warning
- ex_docmd.c: Resolve most clint errors (#19775)
- filetype: Allow vim.filetype.match to accept buf and filename (#19114)
- highlight: Make hlattrs2dict always use pre-allocated dict
- log: Simplify log_path_init #18898
- log: Use msg_schedule_semsg #18950
- lsp: Remove redundant client cleanup (#18744)
- lsp: Make the use of local aliases more consistent
- lsp: Use autocmd api (#19407)
- lsp: Factor out read_loop function
- lsp: Encapsulate rpc uv handle
- lsp: Extract rpc client from rpc.start
- lua: Replace hard-coded gsub with vim.pesc() (#18407)
- lua: Reformat with stylua 0.14.0 (#19264)
- lua: Git-blame-ignore stylua update PR (#19273)
- lua: Replace vim.cmd use with API calls (#19283)
- map: Simplify free_all_mem handling
- map: Statically initialize maphash array
- map: Simplify add_map params
- normal: Convert function comments to doxygen format
- object: Get rid of redundant FIXED_TEMP_ARRAY
- ops: Doxygen docstrings #17743
- option: DRY get/set option value #19038
- plines: Use a struct for chartabsize state
- provider: Use list comprehension #19027
- regexp_nfa.c: Match where Vim calls fopen() (#18778)
- runtime: Convert dist#ft functions to lua (#18247)
- runtime: Convert more dist#ft functions to lua (#18430)
- runtime: Convert the remaining dist#ft functions to lua (#18623)
- runtime: Port remaining patterns from filetype.vim to filetype.lua (#18814)
- runtime: Refactor filetype.lua (#18813)
- runtime: Port scripts.vim to lua (#18710)
- setcellwidths: Use TV_LIST_ITEM_NEXT properly
- signs: Handle non-sign attrs separately (#19784)
- tests: Introduce testprg()
- treesitter: Get_{nodes,captures}_at_{position,cursor}
- typval: Change FC_CFUNC abstraction into FC_LUAREF
- ui: Simplify stdin handling
- uncrustify: Format all c code under /src/nvim/
- vim.opt: Remove del arg
- vim.opt: Unify vim.bo/wo building
- vim.opt: Optimize append/prepend/remove
- Format runtime with stylua

.builds/freebsd.yml

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

.builds/openbsd.yml

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

.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

@@ -36,5 +36,32 @@ BraceWrapping:
   BeforeElse:      false
   IndentBraces:    false
 PointerAlignment: Right
-SortIncludes: false
+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,6 @@ 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

.flake8

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

.git-blame-ignore-revs

@@ -47,7 +47,16 @@ a68faed02dc8e37b8f10da14dc02e33e6ed93947
 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/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

.github/scripts/reviews.js

@@ -9,15 +9,16 @@ module.exports = async ({github, context}) => {
   const reviewers = new Set()
   if (labels.includes('api')) {
     reviewers.add("bfredl")
-    reviewers.add("gpanders")
     reviewers.add("muniter")
   }
 
   if (labels.includes('build')) {
     reviewers.add("jamessan")
+    reviewers.add("justinmk")
   }
 
   if (labels.includes('ci')) {
+    reviewers.add("dundargoc")
     reviewers.add("jamessan")
   }
 
@@ -54,18 +55,14 @@ module.exports = async ({github, context}) => {
     reviewers.add("gpanders")
   }
 
-  if (labels.includes('gui')) {
-    reviewers.add("glacambre")
-    reviewers.add("smolck")
-  }
-
   if (labels.includes('lsp')) {
     reviewers.add("mfussenegger")
-    reviewers.add("mjlbach")
+    reviewers.add("glepnir")
   }
 
   if (labels.includes('treesitter')) {
     reviewers.add("bfredl")
+    reviewers.add("clason")
     reviewers.add("vigoux")
   }
 

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

@@ -1,7 +1,6 @@
 name: Missing API docs
 on:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
     branches-ignore:
       - 'marvim/api-doc-update**'
     paths:
@@ -11,7 +10,6 @@ on:
 
 jobs:
   call-regen-api-docs:
-    if: github.event.pull_request.draft == false
     permissions:
       contents: write
       pull-requests: write

.github/workflows/api-docs.yml

@@ -21,23 +21,24 @@ on:
 
 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
         run: |
           sudo apt-get update
-          sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y python3 luajit
-          conda install -c conda-forge doxygen=1.9.2 msgpack-python
-          echo "$CONDA/bin" >> $GITHUB_PATH
+          sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y doxygen python3 python3-msgpack luajit
 
       - name: Setup git config
         run: |
@@ -58,8 +59,7 @@ jobs:
         run: |
           echo "Job failed, run ./scripts/gen_vimdoc.py and commit your doc changes"
           echo "The doc generation produces the following changes:"
-          git --no-pager diff
-          exit 1
+          git diff --color --exit-code
 
       - name: Automatic PR
         if: ${{ steps.docs.outputs.UPDATED_DOCS != 0 && !inputs.check_only }}

.github/workflows/backport.yml

@@ -2,8 +2,6 @@ name: Backport
 on:
   pull_request_target:
     types: [closed, labeled]
-  issue_comment:
-    types: [created]
 jobs:
   backport:
     permissions:
@@ -14,20 +12,16 @@ jobs:
       github.repository_owner == 'neovim' && (
         github.event_name == 'pull_request_target' &&
         github.event.pull_request.merged
-      ) || (
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        contains(github.event.comment.body, '/backport')
       )
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - 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,7 +5,6 @@ on:
       - 'master'
       - 'release-[0-9]+.[0-9]+'
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
     branches:
       - 'master'
       - 'release-[0-9]+.[0-9]+'
@@ -19,18 +18,13 @@ concurrency:
 
 jobs:
   lint:
-    # This job tests two things: it lints the code but also builds neovim using
-    # system dependencies instead of bundled dependencies. This is to make sure
-    # we are able to build neovim without pigeonholing ourselves into specifics
-    # of the bundled dependencies.
-
-    if: (github.event_name == 'pull_request' && github.base_ref == 'master' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/master')
+    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@v2
+      - uses: actions/checkout@v3
 
       - name: Setup common environment variables
         run: ./.github/workflows/env.sh lint
@@ -43,11 +37,131 @@ jobs:
             autoconf \
             automake \
             build-essential \
-            ccache \
             cmake \
             flake8 \
             gettext \
-            gperf \
+            libluajit-5.1-dev \
+            libmsgpack-dev \
+            libtermkey-dev \
+            libtool-bin \
+            libtree-sitter-dev \
+            libunibilium-dev \
+            libuv1-dev \
+            libvterm-dev \
+            locales \
+            lua-busted \
+            lua-check \
+            lua-filesystem \
+            lua-inspect \
+            lua-lpeg \
+            lua-luv-dev \
+            lua-nvim \
+            luajit \
+            ninja-build \
+            pkg-config
+
+      - name: Cache 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 \
@@ -69,38 +183,25 @@ jobs:
             pkg-config
 
       - name: Cache artifacts
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ env.CACHE_NVIM_DEPS_DIR }}
-            ~/.ccache
-          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!third-party/**CMakeLists.txt') }}-${{ github.base_ref }}
+          key: lint-${{ hashFiles('cmake/*', '**/CMakeLists.txt', '!cmake.deps/**CMakeLists.txt') }}-${{ github.base_ref }}
 
-      - name: Build third-party
+      - name: Build third-party deps
         run: ./ci/before_script.sh
 
       - name: Build nvim
         run: ./ci/run_tests.sh build_nvim
 
       - if: "!cancelled()"
-        name: clint-full
-        run: ./ci/run_lint.sh clint-full
-
-      - if: "!cancelled()"
-        name: lualint
-        run: ./ci/run_lint.sh lualint
-
-      - if: "!cancelled()"
-        name: pylint
-        run: ./ci/run_lint.sh pylint
-
-      - if: "!cancelled()"
-        name: shlint
-        run: ./ci/run_lint.sh shlint
+        name: lintc
+        run: make lintc
 
       - if: "!cancelled()"
         name: check-single-includes
-        run: ./ci/run_lint.sh check-single-includes
+        run: make check-single-includes
 
       - name: Cache dependencies
         run: ./ci/before_cache.sh
@@ -119,18 +220,20 @@ jobs:
             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
 
-            # The functionaltest-lua test two things simultaneously:
+            # 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
@@ -138,12 +241,11 @@ jobs:
             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 }}
@@ -152,7 +254,7 @@ 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
+          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'
@@ -184,20 +286,19 @@ jobs:
         if: matrix.os == 'osx'
         run: |
           brew update --quiet
-          brew install automake ccache cpanminus ninja
+          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
@@ -225,25 +326,33 @@ jobs:
   windows:
     runs-on: windows-2019
     timeout-minutes: 45
-    if: github.event.pull_request.draft == false
     env:
       DEPS_BUILD_DIR: ${{ format('{0}/nvim-deps', github.workspace) }}
       DEPS_PREFIX: ${{ format('{0}/nvim-deps/usr', github.workspace) }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config: [ MINGW_64-gcov, MSVC_64 ]
-    name: windows (${{ matrix.config }})
+      CMAKE_BUILD_TYPE: "RelWithDebInfo"
+    name: windows (MSVC_64)
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ${{ env.DEPS_BUILD_DIR }}
-          key: ${{ matrix.config }}-${{ hashFiles('third-party\**') }}
+          key: ${{ hashFiles('cmake.deps\**') }}
 
-      - name: Run CI
-        run: powershell ci\build.ps1
-        env:
-          CONFIGURATION: ${{ matrix.config }}
+      - 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

@@ -4,12 +4,14 @@ on:
   # to merge a PR, it can't be skipped, so use pull_request_target
   pull_request_target:
     types: [opened, synchronize, reopened, ready_for_review]
+    branches:
+      - 'master'
 jobs:
   lint-commits:
     runs-on: ubuntu-latest
     if: github.event.pull_request.draft == false
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}

.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"
 
@@ -43,6 +39,11 @@ EOF
     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)
@@ -51,7 +52,6 @@ EOF
     DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUV=ON"
     cat <<EOF >> "$GITHUB_ENV"
 USE_BUNDLED=OFF
-CI_TARGET=lint
 EOF
     ;;
   functionaltest-lua)

.github/workflows/labeler.yml

@@ -10,7 +10,7 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-    - uses: actions/labeler@main
+    - uses: actions/labeler@v4
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
         sync-labels: ""
@@ -40,7 +40,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: 'Request reviewers'
         uses: actions/github-script@v6
         with:

.github/workflows/notes.md

@@ -21,8 +21,9 @@ ${NVIM_VERSION}
 ### 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)
 

.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,52 +35,46 @@ 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/"
           cpack -C $NVIM_BUILD_TYPE
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: nvim-linux64
-          path: build/nvim-linux64.tar.gz
-          retention-days: 1
-      - uses: actions/upload-artifact@v2
-        with:
-          name: nvim-linux64
-          path: build/nvim-linux64.deb
+          path: |
+            build/nvim-linux64.tar.gz
+            build/nvim-linux64.deb
           retention-days: 1
 
   appimage:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     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: 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
@@ -91,31 +85,44 @@ jobs:
         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:
@@ -123,6 +130,7 @@ jobs:
     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:
@@ -130,41 +138,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 }}
-      - 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
-          retention-days: 1
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ matrix.archive }}
-          path: build/${{ matrix.archive }}.msi
+          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
@@ -175,16 +180,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
@@ -223,7 +224,6 @@ jobs:
           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: |
@@ -232,3 +232,30 @@ jobs:
           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

@@ -8,7 +8,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: 'Remove reviewers'
         uses: actions/github-script@v6
         with:

.github/workflows/reviews.yml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: 'Request reviewers'
         uses: actions/github-script@v6
         with:

.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 }}

.gitignore

@@ -73,3 +73,5 @@ tags
 
 # vim patches
 /vim-*.patch
+
+/CMakeUserPresets.json

.luacheckrc

@@ -28,6 +28,13 @@ read_globals = {
 
 globals = {
   "vim.g",
+  "vim.b",
+  "vim.w",
+  "vim.o",
+  "vim.bo",
+  "vim.wo",
+  "vim.go",
+  "vim.env"
 }
 
 exclude_files = {

.mailmap

@@ -8,13 +8,15 @@ Anmol Sethi <hi@nhooyr.io> <nhooyr@users.noreply.github.com>
 BK1603 <chouhan.shreyansh2702@gmail.com> Shreyansh Chouhan
 Billy Su <g4691821@gmail.com> Billy SU
 Billy Vong <billyvg@gmail.com> <billyvg@users.noreply.github.com>
-Björn Linse <bjorn.linse@gmail.com> bfredl
+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
@@ -52,6 +54,7 @@ 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>
@@ -92,7 +95,7 @@ Steven Sojka <Steven.Sojka@tdameritrade.com> <steelsojka@gmail.com>
 Steven Sojka <steelsojka@gmail.com> <steelsojka@users.noreply.github.com>
 TJ DeVries <devries.timothyj@gmail.com> <timothydvrs1234@gmail.com>
 Thomas Fehér <thomas.feher@yahoo.de> <thomasfeher@web.de>
-Thomas Vigouroux <tomvig38@gmail.com> <39092278+vigoux@users.noreply.github.com>
+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

.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

@@ -6,12 +6,6 @@
 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)
-endif()
 if(POLICY CMP0075)
   cmake_policy(SET CMP0075 NEW)
 endif()
@@ -21,6 +15,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)
 
@@ -30,7 +27,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")
@@ -62,7 +59,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}
@@ -71,13 +68,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)
@@ -91,10 +83,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()
@@ -119,32 +121,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 7)
+set(NVIM_VERSION_MINOR 8)
 set(NVIM_VERSION_PATCH 0)
 set(NVIM_VERSION_PRERELEASE "") # for package maintainers
 
 # API level
-set(NVIM_API_LEVEL 9)         # 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)
 
@@ -178,7 +170,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)
@@ -276,11 +268,12 @@ 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
@@ -294,25 +287,27 @@ else()
     add_compile_options(-Wimplicit-fallthrough)
   endif()
 
-  # Clang doesn't have -Wsuggest-attribute so check for each one.
-  check_c_compiler_flag(-Wsuggest-attribute=pure HAVE_WSUGGEST_ATTRIBUTE_PURE)
-  if(HAVE_WSUGGEST_ATTRIBUTE_PURE)
-    add_compile_options(-Wsuggest-attribute=pure)
-  endif()
+  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=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=malloc HAVE_WSUGGEST_ATTRIBUTE_MALLOC)
+    if(HAVE_WSUGGEST_ATTRIBUTE_MALLOC)
+      add_compile_options(-Wsuggest-attribute=malloc)
+    endif()
 
-  check_c_compiler_flag(-Wsuggest-attribute=cold HAVE_WSUGGEST_ATTRIBUTE_COLD)
-  if(HAVE_WSUGGEST_ATTRIBUTE_COLD)
-    add_compile_options(-Wsuggest-attribute=cold)
+    check_c_compiler_flag(-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
@@ -325,6 +320,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
@@ -370,7 +366,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()
@@ -405,7 +401,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)
@@ -449,11 +445,11 @@ 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.
@@ -502,18 +498,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)
@@ -583,11 +574,7 @@ endif()
 
 message(STATUS "Using Lua interpreter: ${LUA_PRG}")
 
-if(DEBUG)
-  option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" OFF)
-else()
-  option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" ON)
-endif()
+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)
@@ -617,17 +604,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 88
+  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)
 
 #
@@ -637,7 +685,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)
@@ -660,20 +708,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
@@ -699,11 +736,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}
@@ -718,8 +755,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}
@@ -734,7 +770,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)
@@ -754,28 +790,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()
-
-
-#add uninstall target
-if(NOT TARGET uninstall)
-    configure_file(
-        "cmake/UninstallHelper.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/UninstallHelper.cmake"
-        IMMEDIATE @ONLY)
-
-    add_custom_target(uninstall
-        COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/UninstallHelper.cmake)
-endif()
-
+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(packaging)
+  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

@@ -10,7 +10,7 @@ low-risk/isolated tasks:
 - 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] (familiarity with Vim is *strongly* recommended)
 
 Reporting problems
@@ -92,7 +92,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 +111,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 +125,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 +205,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,15 +232,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.)
+
+- 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
+- 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
 ---------
@@ -266,30 +304,36 @@ 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
-[gh]: https://cli.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
+[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
+[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/
-[lua-language-server]: https://github.com/sumneko/lua-language-server/
+[wiki-contribute-help]: https://github.com/neovim/neovim/wiki/contribute-%3Ahelp
+[wiki-faq]: https://github.com/neovim/neovim/wiki/FAQ

MAINTAIN.md

@@ -52,21 +52,17 @@ has a major bug:
 3. Cut a release from `release-x.y`.
     - Run `./scripts/release.sh`
     - Update (force-push) the remote `stable` tag.
-    - The [nightly job](https://github.com/neovim/neovim/blob/master/.github/workflows/release.yml#L4)
+    - The [CI job](https://github.com/neovim/neovim/blob/3d45706478cd030c3ee05b4f336164bb96138095/.github/workflows/release.yml#L11-L13)
       will update the release assets based on 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.
+form `backport release-0.X`.
 
 Third-party dependencies
 --------------
 
-These "bundled" dependencies can be updated by bumping their versions in `third-party/CMakeLists.txt`:
+These "bundled" dependencies can be updated by bumping their versions in `cmake.deps/CMakeLists.txt`:
   - [Lua](https://www.lua.org/download.html)
   - [LuaJIT](https://github.com/LuaJIT/LuaJIT)
   - [Luv](https://github.com/luvit/luv)
@@ -87,6 +83,7 @@ These dependencies are "vendored" (inlined), we need to update the sources manua
   - [xdiff](https://github.com/git/git/tree/master/xdiff)
   - [lua-cjson](https://github.com/openresty/lua-cjson)
   - [Klib](https://github.com/attractivechaos/klib)
+  - [inspect.lua](https://github.com/kikito/inspect.lua)
 
 We also maintain some forks, particularly for Windows, if we are waiting on upstream changes:
 https://github.com/neovim/neovim/wiki/Deps

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) -u NONE -es +"lua require('scripts.lintcommit').main({trace=false})"
-
-_opt_commitlint:
-	@test -x build/bin/nvim && { $(MAKE) commitlint; exit $$?; } \
-		|| echo "SKIP: commitlint (build/bin/nvim not found)"
-
-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

@@ -7,7 +7,6 @@
 [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)
@@ -63,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:
@@ -81,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
@@ -93,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

ci/before_cache.sh

@@ -12,11 +12,6 @@ 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 && [ -d "${DEPS_BUILD_DIR}" ]; then
   # Do not cache downloads.  They should not be needed with up-to-date deps.

ci/before_script.sh

@@ -16,11 +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
-
 # 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,148 +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'
+$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
   }
-  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'
-  $cmakeGenerator = 'Visual Studio 16 2019'
 }
 
-if ($compiler -eq 'MSVC') {
-  $installationPath = vswhere.exe -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
-  if ($installationPath -and (test-path "$installationPath\Common7\Tools\vsdevcmd.bat")) {
-    & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -arch=x${bits} -no_logo && set" | foreach-object {
-      $name, $value = $_ -split '=', 2
-      set-content env:\"$name" $value
+function BuildDeps {
+
+  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}"
     }
   }
+
+  # 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
 }
 
-if (-not $NoTests) {
-  python -m ensurepip
-  python -m pip install pynvim ; 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
+  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
-}
 
-function convertToCmakeArgs($vars) {
-  return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
-}
-
-cd $env:DEPS_BUILD_DIR
-if ($compiler -eq 'MSVC') {
-  if ($bits -eq 32) {
-    cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
-  } else {
-    cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
+  if ($env:USE_LUACOV -eq 1) {
+    & $env:DEPS_PREFIX\luarocks\luarocks.bat install cluacov
   }
-} else {
-  cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
-}
-cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-cd $buildDir
-
-# Build Neovim
-mkdir build
-cd build
-if ($compiler -eq 'MSVC') {
-  if ($bits -eq 32) {
-    cmake -G $cmakeGenerator -A Win32 $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
-  } else {
-    cmake -G $cmakeGenerator -A x64 $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
-  }
-} else {
-  cmake -G $cmakeGenerator $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
-}
-cmake --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) {
@@ -177,10 +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 -C $cmakeBuildType
+if ($PSCmdlet.ParameterSetName) {
+  & (Get-ChildItem "Function:$($PSCmdlet.ParameterSetName)")
+  exit
+}

ci/common/build.sh

@@ -24,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
@@ -35,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

ci/install.sh

@@ -5,7 +5,7 @@ set -o pipefail
 
 # Use default CC to avoid compilation problems when installing Python modules.
 echo "Install neovim module for Python."
-CC=cc python -m pip -q install --user --upgrade pynvim
+CC=cc python3 -m pip -q install --user --upgrade pynvim
 
 echo "Install neovim RubyGem."
 gem install --no-document --bindir "$HOME/.local/bin" --user-install --pre neovim
@@ -14,5 +14,7 @@ echo "Install neovim npm package"
 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,24 +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"
-
-rm -f "$END_MARKER"
-
-# Run all tests if no input argument is given
-if (($# == 0)); then
-  tests=('clint-full' 'lualint' 'pylint' 'shlint' 'check-single-includes')
-else
-  tests=("$@")
-fi
-
-for i in "${tests[@]}"; do
-  make "$i" || fail "$i"
-done
-
-end_tests

ci/run_tests.sh

@@ -33,3 +33,9 @@ for i in "${tests[@]}"; do
 done
 
 end_tests
+
+if [[ -s "${GCOV_ERROR_FILE}" ]]; then
+  echo '=== Unexpected gcov errors: ==='
+  cat "${GCOV_ERROR_FILE}"
+  exit 1
+fi

ci/script.sh

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

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.44.1.tar.gz)
-set(LIBUV_SHA256 e91614e6dc2dd0bfdd140ceace49438882206b7a6fb00b8750914e67a9ed6d6b)
+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/5e3c45c43bb0e0f1f2917d432e9d2dba12c42a6e.tar.gz)
-set(LUAJIT_SHA256 72294770c73ff2ed03deb9c81a38253c45fd634917583c6ae39f5143c9adc1e1)
+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)
@@ -166,45 +173,48 @@ set(UNIBILIUM_SHA256 29815283c654277ef77a3adcc8840db79ddbb20a0f0b0c8f648bd8cd49a
 set(LIBTERMKEY_URL https://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz)
 set(LIBTERMKEY_SHA256 6945bd3c4aaa83da83d80a045c5563da4edd7d0374c62c0d35aec09eb3014600)
 
-set(LIBVTERM_URL https://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.43.0-0)
-set(LUV_URL https://github.com/luvit/luv/archive/${LUV_VERSION}.tar.gz)
-set(LUV_SHA256 a36865f34db029e2caa01245a41341a067038c09e94459b50db1346d9fdf82f0)
+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.6.tar.gz)
-set(TREESITTER_SHA256 4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de)
+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.1.0.tar.gz)
+set(TREESITTER_HELP_SHA256 4c0ef80c6dc09acab362478950ec6be58a4ab1cbf2d95754b8fbb566e4c647a1)
+
+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,14 +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,12 +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}
         -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-    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 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)
 

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/WixPatch.xml

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

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,33 @@
+if(NVIM_VERSION_MEDIUM)
+  message(STATUS "USING NVIM_VERSION_MEDIUM: ${NVIM_VERSION_MEDIUM}")
+  return()
+endif()
+
+set(NVIM_VERSION_MEDIUM
+    "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
+  RESULT_VARIABLE RES)
+
+if(RES AND NOT RES EQUAL 0)
+  message(STATUS "Using NVIM_VERSION_MEDIUM: ${NVIM_VERSION_MEDIUM}")
+  file(WRITE "${OUTPUT}" "${NVIM_VERSION_STRING}")
+  return()
+endif()
+
+string(STRIP "${GIT_TAG}" GIT_TAG)
+string(REGEX REPLACE "^v[0-9]+.[0-9]+.[0-9]+-" "" NVIM_VERSION_GIT "${GIT_TAG}")
+set(NVIM_VERSION_MEDIUM "${NVIM_VERSION_MEDIUM}-${NVIM_VERSION_GIT}")
+set(NVIM_VERSION_STRING "#define NVIM_VERSION_MEDIUM \"${NVIM_VERSION_MEDIUM}\"\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_MEDIUM: ${NVIM_VERSION_MEDIUM}")
+  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)

cmake/RunTests.cmake

@@ -2,7 +2,9 @@
 set(ENV{LC_ALL} "en_US.UTF-8")
 
 if(POLICY CMP0012)
-  # Handle CI=true, without dev warnings.
+  # Avoid policy warning due to CI=true. This is needed even if the main
+  # project has already set this policy as policy settings are reset when using
+  # the cmake script mode (-P).
   cmake_policy(SET CMP0012 NEW)
 endif()
 
@@ -11,6 +13,7 @@ set(ENV{NVIM_RPLUGIN_MANIFEST} ${BUILD_DIR}/Xtest_rplugin_manifest)
 set(ENV{XDG_CONFIG_HOME} ${BUILD_DIR}/Xtest_xdg/config)
 set(ENV{XDG_DATA_HOME} ${BUILD_DIR}/Xtest_xdg/share)
 unset(ENV{XDG_DATA_DIRS})
+unset(ENV{NVIM})  # Clear $NVIM in case tests are running from Nvim. #11009
 
 if(NOT DEFINED ENV{NVIM_LOG_FILE})
   set(ENV{NVIM_LOG_FILE} ${BUILD_DIR}/.nvimlog)
@@ -50,8 +53,8 @@ if(DEFINED ENV{TEST_FILTER_OUT} AND NOT "$ENV{TEST_FILTER_OUT}" STREQUAL "")
   list(APPEND BUSTED_ARGS --filter-out $ENV{TEST_FILTER_OUT})
 endif()
 
-# TMPDIR: use relative test path (for parallel test runs / isolation).
-set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${TEST_PATH}")
+# TMPDIR: for helpers.tmpname() and Nvim tempname().
+set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir")
 execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR})
 
 # HISTFILE: do not write into user's ~/.bash_history

cmake/UninstallHelper.cmake

@@ -0,0 +1,13 @@
+if(NOT EXISTS "${CMAKE_BINARY_DIR}/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: ${CMAKE_BINARY_DIR}/install_manifest.txt")
+endif()
+
+file(STRINGS "${CMAKE_BINARY_DIR}/install_manifest.txt" files)
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    file(REMOVE $ENV{DESTDIR}${file})
+  else()
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif()
+endforeach()

cmake/UninstallHelper.cmake.in

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

cmake/Util.cmake

@@ -0,0 +1,185 @@
+# Defines a target that depends on FILES and the files found by globbing
+# when using GLOB_PAT and GLOB_DIRS. The target will rerun if any files it
+# depends on has changed. Which files the target will run the command on
+# depends on the value of TOUCH_STRATEGY.
+#
+# Options:
+# REQUIRED            - Abort if COMMAND doesn't exist.
+#
+# Single value arguments:
+# TARGET         - Name of the target
+# COMMAND        - Path of the command to be run
+# GLOB_PAT       - Glob pattern to use. Only used if GLOB_DIRS is specified
+# TOUCH_STRATEGY - Specify touch strategy, meaning decide how to group files
+#                  and connect them to a specific touch file.
+#
+# For example, let us say we have file A and B and that we create a touch file
+# for each of them, TA and TB. This would essentially make file A and B
+# independent of each other, meaning that if I change file A and run the
+# target, then the target will only run its commands for file A and ignore
+# file B.
+#
+# Another example: let's say we have file A and B, but now we create only a
+# single touch file T for both of them. This would mean that if I change
+# either file A or B, then the target will run its commands on both A and B.
+# Meaning that even if I only change file A, the target will still run
+# commands on both A and B.
+#
+# The more touch files we create for a target, the fewer commands we'll need
+# to rerun, and by extension, the more time we'll save. Unfortunately, the
+# more touch files we create the more intermediary targets will be created,
+# one for each touch file. This makes listing all targets with
+# `cmake --build build --target help` less useful since each touch file will
+# be listed. The tradeoff that needs to be done here is between performance
+# and "discoverability". As a general guideline: the more popular a target is
+# and the more time it takes to run it, the more granular you want your touch
+# files to be. Conversely, if a target rarely needs to be run or if it's fast,
+# then you should create fewer targets.
+#
+# Possible values for TOUCH_STRATEGY:
+# "SINGLE":   create a single touch file for all files.
+# "PER_FILE": create a touch file for each file. Defaults to this if
+#             TOUCH_STRATEGY isn't specified.
+# "PER_DIR":  create a touch file for each directory.
+#
+# List arguments:
+# FLAGS     - List of flags to use after COMMAND
+# FILES     - List of files to use COMMAND on. It's possible to combine this
+#             with GLOB_PAT and GLOB_DIRS; the files found by globbing will
+#             simple be added to FILES
+# GLOB_DIRS - The directories to recursively search for files with extension
+#             GLOB_PAT
+#
+function(add_glob_targets)
+  cmake_parse_arguments(ARG
+    "REQUIRED"
+    "TARGET;COMMAND;GLOB_PAT;TOUCH_STRATEGY"
+    "FLAGS;FILES;GLOB_DIRS"
+    ${ARGN}
+  )
+
+  if(NOT ARG_COMMAND)
+    add_custom_target(${ARG_TARGET})
+    if(ARG_REQUIRED)
+      add_custom_command(TARGET ${ARG_TARGET}
+        COMMAND ${CMAKE_COMMAND} -E echo "${ARG_TARGET}: ${ARG_COMMAND} not found"
+        COMMAND false)
+    else()
+      add_custom_command(TARGET ${ARG_TARGET}
+        COMMAND ${CMAKE_COMMAND} -E echo "${ARG_TARGET} SKIP: ${ARG_COMMAND} not found")
+    endif()
+    return()
+  endif()
+
+  foreach(gd ${ARG_GLOB_DIRS})
+    file(GLOB_RECURSE globfiles ${PROJECT_SOURCE_DIR}/${gd}/${ARG_GLOB_PAT})
+    list(APPEND ARG_FILES ${globfiles})
+  endforeach()
+
+  if(NOT ARG_TOUCH_STRATEGY)
+    set(ARG_TOUCH_STRATEGY PER_FILE)
+  endif()
+  set(POSSIBLE_TOUCH_STRATEGIES SINGLE PER_FILE PER_DIR)
+  if(NOT ARG_TOUCH_STRATEGY IN_LIST POSSIBLE_TOUCH_STRATEGIES)
+    message(FATAL_ERROR "Unrecognized value for TOUCH_STRATEGY: ${ARG_TOUCH_STRATEGY}")
+  endif()
+
+  if(ARG_TOUCH_STRATEGY STREQUAL SINGLE)
+    set(touch_file ${TOUCHES_DIR}/ran-${ARG_TARGET})
+    add_custom_command(
+      OUTPUT ${touch_file}
+      COMMAND ${CMAKE_COMMAND} -E touch ${touch_file}
+      COMMAND ${ARG_COMMAND} ${ARG_FLAGS} ${ARG_FILES}
+      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+      DEPENDS ${ARG_FILES})
+    list(APPEND touch_list ${touch_file})
+  elseif(ARG_TOUCH_STRATEGY STREQUAL PER_FILE)
+    set(touch_dir ${TOUCHES_DIR}/${ARG_TARGET})
+    file(MAKE_DIRECTORY ${touch_dir})
+    foreach(f ${ARG_FILES})
+      string(REGEX REPLACE "^${PROJECT_SOURCE_DIR}/" "" tf ${f})
+      string(REGEX REPLACE "[/.]" "-" tf ${tf})
+      set(touch_file ${touch_dir}/ran-${tf})
+      add_custom_command(
+        OUTPUT ${touch_file}
+        COMMAND ${CMAKE_COMMAND} -E touch ${touch_file}
+        COMMAND ${ARG_COMMAND} ${ARG_FLAGS} ${f}
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        DEPENDS ${f})
+      list(APPEND touch_list ${touch_file})
+    endforeach()
+  elseif(ARG_TOUCH_STRATEGY STREQUAL PER_DIR)
+    set(touch_dirs)
+    foreach(f ${ARG_FILES})
+      get_filename_component(out ${f} DIRECTORY)
+      list(APPEND touch_dirs ${out})
+    endforeach()
+    list(REMOVE_DUPLICATES touch_dirs)
+
+    foreach(touch_dir ${touch_dirs})
+      set(relevant_files)
+      foreach(f ${ARG_FILES})
+        get_filename_component(out ${f} DIRECTORY)
+        if(${touch_dir} STREQUAL ${out})
+          list(APPEND relevant_files ${f})
+        endif()
+      endforeach()
+
+      set(td ${TOUCHES_DIR}/${ARG_TARGET})
+      file(MAKE_DIRECTORY ${td})
+      string(REGEX REPLACE "^${PROJECT_SOURCE_DIR}/" "" tf ${touch_dir})
+      string(REGEX REPLACE "[/.]" "-" tf ${tf})
+      set(touch_file ${td}/ran-${tf})
+
+      add_custom_command(
+        OUTPUT ${touch_file}
+        COMMAND ${CMAKE_COMMAND} -E touch ${touch_file}
+        COMMAND ${ARG_COMMAND} ${ARG_FLAGS} ${relevant_files}
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        DEPENDS ${relevant_files})
+      list(APPEND touch_list ${touch_file})
+    endforeach()
+  endif()
+
+  add_custom_target(${ARG_TARGET} DEPENDS ${touch_list})
+endfunction()
+
+# Set default build type to Debug. Also limit the list of allowable build types
+# to the ones defined in variable allowableBuildTypes.
+#
+# The correct way to specify build type (for example Release) for
+# single-configuration generators (Make and Ninja) is to run
+#
+# cmake -B build -D CMAKE_BUILD_TYPE=Release
+# cmake --build build
+#
+# while for multi-configuration generators (Visual Studio, Xcode and Ninja
+# Multi-Config) is to run
+#
+# cmake -B build
+# cmake --build build --config Release
+#
+# Passing CMAKE_BUILD_TYPE for multi-config generators will now not only
+# not be used, but also generate a warning for the user.
+function(set_default_buildtype)
+  set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo)
+
+  get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+  if(isMultiConfig)
+    set(CMAKE_CONFIGURATION_TYPES ${allowableBuildTypes} PARENT_SCOPE)
+    if(CMAKE_BUILD_TYPE)
+      message(WARNING "CMAKE_BUILD_TYPE specified which is ignored on \
+      multi-configuration generators. Defaulting to Debug build type.")
+    endif()
+  else()
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "${allowableBuildTypes}")
+    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)
+    elseif(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes)
+      message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}")
+    else()
+      message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
+    endif()
+  endif()
+endfunction()

cmake/i386-linux-gnu.toolchain.cmake

@@ -1,7 +0,0 @@
-set(CMAKE_SYSTEM_PROCESSOR i386)
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION gnu)
-if(NOT ${CMAKE_C_COMPILER})
-  set(CMAKE_C_COMPILER gcc)
-endif()
-set(CMAKE_C_COMPILER_ARG1 "-m32")

contrib/YouCompleteMe/README.md

@@ -1,31 +0,0 @@
-# YouCompleteMe Integration
-
-## What is this?
-
-This provides the code necessary to configure vim's YCM plugin to provide C
-semantic support (completion, go-to-definition, etc) for developers working on
-the Neovim project.
-
-## Installation
-
-### Step 1
-
-Install [YouCompleteMe](https://github.com/Valloric/YouCompleteMe).
-
-### Step 2
-
-```bash
-cp contrib/YouCompleteMe/ycm_extra_conf.py .ycm_extra_conf.py
-echo .ycm_extra_conf.py >> .git/info/exclude
-make
-```
-
-Tip: to improve source code navigation, add something like this to your nvim
-configuration:
-
-```vim
-au FileType c,cpp nnoremap <buffer> <c-]> :YcmCompleter GoTo<CR>
-```
-
-And use `ctrl+]` when the cursor is positioned in a symbol to quickly jump to a
-definition or declaration.

contrib/YouCompleteMe/ycm_extra_conf.py

@@ -1,65 +0,0 @@
-# .ycm_extra_conf.py for nvim source code.
-import os
-import ycm_core
-
-
-def DirectoryOfThisScript():
-    return os.path.dirname(os.path.abspath(__file__))
-
-
-def GetDatabase():
-    compilation_database_folder = os.path.join(DirectoryOfThisScript(),
-                                               'build')
-    if os.path.exists(compilation_database_folder):
-        return ycm_core.CompilationDatabase(compilation_database_folder)
-    return None
-
-
-def GetCompilationInfoForFile(filename):
-    database = GetDatabase()
-    if not database:
-        return None
-    return database.GetCompilationInfoForFile(filename)
-
-
-# It seems YCM does not resolve directories correctly. This function will
-# adjust paths in the compiler flags to be absolute
-def FixDirectories(args, compiler_working_dir):
-    def adjust_path(path):
-        return os.path.abspath(os.path.join(compiler_working_dir, path))
-
-    adjust_next_arg = False
-    new_args = []
-    for arg in args:
-        if adjust_next_arg:
-            arg = adjust_path(arg)
-            adjust_next_arg = False
-        else:
-            for dir_flag in ['-I', '-isystem', '-o', '-c']:
-                if arg.startswith(dir_flag):
-                    if arg != dir_flag:
-                        # flag and path are concatenated in same arg
-                        path = arg[len(dir_flag):]
-                        new_path = adjust_path(path)
-                        arg = '{0}{1}'.format(dir_flag, new_path)
-                    else:
-                        # path is specified in next argument
-                        adjust_next_arg = True
-        new_args.append(arg)
-    return new_args
-
-
-def FlagsForFile(filename):
-    compilation_info = GetCompilationInfoForFile(filename)
-    if not compilation_info:
-        return None
-    # Add flags not needed for clang-the-binary,
-    # but needed for libclang-the-library (YCM uses this last one).
-    flags = FixDirectories((list(compilation_info.compiler_flags_)
-                            if compilation_info.compiler_flags_
-                            else []), compilation_info.compiler_working_dir_)
-    extra_flags = ['-Wno-newline-eof']
-    return {
-        'flags': flags + extra_flags,
-        'do_cache': True
-    }

contrib/asan.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Helper script to build and run neovim with Address Sanitizer enabled.
+# You may read more information in src/nvim/README.md in the section "Build
+# with ASAN".
+
+shopt -s nullglob
+
+root_path=$(git rev-parse --show-toplevel)
+log_path=$(mktemp -d)
+export CC='clang'
+
+# Change to detect_leaks=1 to detect memory leaks (slower).
+export ASAN_OPTIONS="detect_leaks=0:log_path=$log_path/asan"
+
+# Show backtraces in the logs.
+export UBSAN_OPTIONS="print_stacktrace=1"
+
+make -C "$root_path" CMAKE_EXTRA_FLAGS="-DCLANG_ASAN_UBSAN=ON"
+VIMRUNTIME="$root_path"/runtime "$root_path"/build/bin/nvim
+
+# Need to manually reset terminal to avoid mangled output, nvim does not
+# properly restore the terminal when it crashes.
+tput reset
+
+for i in "$log_path"/*; do
+  cat "$i"
+done

contrib/doxygen/customdoxygen.css

@@ -1,757 +0,0 @@
-
-/*
- * Title, should be H1
- */
-
-.title {
-  font-family: 'Lato', sans-serif;
-  font-size: 2em;
-  margin: 0.67em 0 0;
-}
-
-dt {
-	font-weight: bold;
-}
-
-div.multicol {
-	-moz-column-gap: 1em;
-	-webkit-column-gap: 1em;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
-}
-
-
-div.qindex, div.navtab {
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-}
-
-div.line {
-  font-family: monospace, fixed;
-  min-height: 13px;
-  line-height: 1.0;
-  text-wrap: unrestricted;
-  white-space: -moz-pre-wrap; /* Moz */
-  white-space: -pre-wrap;     /* Opera 4-6 */
-  white-space: -o-pre-wrap;   /* Opera 7 */
-  white-space: pre-wrap;      /* CSS3  */
-  word-wrap: break-word;      /* IE 5.5+ */
-  text-indent: -53px;
-  padding-left: 53px;
-  padding-bottom: 0px;
-  margin: 0px;
-}
-
-span.lineno {
-  padding-right: 4px;
-  text-align: right;
-  border-right: 2px solid #0F0;
-  white-space: pre;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
-	color: #008000
-}
-
-span.keywordtype {
-	color: #604020
-}
-
-span.keywordflow {
-	color: #e08000
-}
-
-span.comment {
-	color: #800000
-}
-
-span.preprocessor {
-	color: #806020
-}
-
-span.stringliteral {
-	color: #002080
-}
-
-span.charliteral {
-	color: #008080
-}
-
-span.vhdldigit {
-	color: #ff00ff
-}
-
-span.vhdlchar {
-	color: #000000
-}
-
-span.vhdlkeyword {
-	color: #700070
-}
-
-span.vhdllogic {
-	color: #ff0000
-}
-
-blockquote {
-  background-color: #F7F8FB;
-  border-left: 2px solid #9CAFD4;
-  margin: 0 24px 0 4px;
-  padding: 0 12px 0 16px;
-}
-
-/* @end */
-
-hr {
-	height: 0px;
-	border: none;
-  display: none;
-}
-
-dl {
-  padding: 0 0 0 10px;
-}
-
-/* dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug */
-dl.section {
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-dl.note {
-  margin-left:-7px;
-  padding-left: 3px;
-  border-left:4px solid;
-  border-color: #D0C000;
-}
-
-dl.warning, dl.attention {
-  margin-left:-7px;
-  padding-left: 3px;
-  border-left:4px solid;
-  border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant {
-  margin-left:-7px;
-  padding-left: 3px;
-  border-left:4px solid;
-  border-color: #00D000;
-}
-
-dl.deprecated {
-  margin-left:-7px;
-  padding-left: 3px;
-  border-left:4px solid;
-  border-color: #505050;
-}
-
-dl.todo {
-  margin-left:-7px;
-  padding-left: 3px;
-  border-left:4px solid;
-  border-color: #00C0E0;
-}
-
-dl.test {
-  margin-left:-7px;
-  padding-left: 3px;
-  border-left:4px solid;
-  border-color: #3030E0;
-}
-
-dl.bug {
-  margin-left:-7px;
-  padding-left: 3px;
-  border-left:4px solid;
-  border-color: #C08050;
-}
-
-dl.section dd {
-	margin-bottom: 6px;
-}
-
-/* tooltip related style info */
-
-.ttc {
-        position: absolute;
-        display: none;
-}
-
-#powerTip {
-	cursor: default;
-	white-space: nowrap;
-	background-color: white;
-	border: 1px solid gray;
-	border-radius: 4px 4px 4px 4px;
-	box-shadow: 1px 1px 7px gray;
-	display: none;
-	font-size: smaller;
-	max-width: 80%;
-	opacity: 0.9;
-	padding: 1ex 1em 1em;
-	position: absolute;
-	z-index: 2147483647;
-}
-
-#powerTip div.ttdoc {
-        color: grey;
-	font-style: italic;
-}
-
-#powerTip div.ttname a {
-        font-weight: bold;
-}
-
-#powerTip div.ttname {
-        font-weight: bold;
-}
-
-#powerTip div.ttdeci {
-        color: #006318;
-}
-
-#powerTip div {
-        margin: 0px;
-        padding: 0px;
-        font: 12px/16px Roboto,sans-serif;
-}
-
-#powerTip:before, #powerTip:after {
-	content: "";
-	position: absolute;
-	margin: 0px;
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.w:after,  #powerTip.w:before,
-#powerTip.e:after,  #powerTip.e:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.nw:after, #powerTip.nw:before,
-#powerTip.sw:after, #powerTip.sw:before {
-	border: solid transparent;
-	content: " ";
-	height: 0;
-	width: 0;
-	position: absolute;
-}
-
-#powerTip.n:after,  #powerTip.s:after,
-#powerTip.w:after,  #powerTip.e:after,
-#powerTip.nw:after, #powerTip.ne:after,
-#powerTip.sw:after, #powerTip.se:after {
-	border-color: rgba(255, 255, 255, 0);
-}
-
-#powerTip.n:before,  #powerTip.s:before,
-#powerTip.w:before,  #powerTip.e:before,
-#powerTip.nw:before, #powerTip.ne:before,
-#powerTip.sw:before, #powerTip.se:before {
-	border-color: rgba(128, 128, 128, 0);
-}
-
-#powerTip.n:after,  #powerTip.n:before,
-#powerTip.ne:after, #powerTip.ne:before,
-#powerTip.nw:after, #powerTip.nw:before {
-	top: 100%;
-}
-
-#powerTip.n:after, #powerTip.ne:after, #powerTip.nw:after {
-	border-top-color: #ffffff;
-	border-width: 10px;
-	margin: 0px -10px;
-}
-#powerTip.n:before {
-	border-top-color: #808080;
-	border-width: 11px;
-	margin: 0px -11px;
-}
-#powerTip.n:after, #powerTip.n:before {
-	left: 50%;
-}
-
-#powerTip.nw:after, #powerTip.nw:before {
-	right: 14px;
-}
-
-#powerTip.ne:after, #powerTip.ne:before {
-	left: 14px;
-}
-
-#powerTip.s:after,  #powerTip.s:before,
-#powerTip.se:after, #powerTip.se:before,
-#powerTip.sw:after, #powerTip.sw:before {
-	bottom: 100%;
-}
-
-#powerTip.s:after, #powerTip.se:after, #powerTip.sw:after {
-	border-bottom-color: #ffffff;
-	border-width: 10px;
-	margin: 0px -10px;
-}
-
-#powerTip.s:before, #powerTip.se:before, #powerTip.sw:before {
-	border-bottom-color: #808080;
-	border-width: 11px;
-	margin: 0px -11px;
-}
-
-#powerTip.s:after, #powerTip.s:before {
-	left: 50%;
-}
-
-#powerTip.sw:after, #powerTip.sw:before {
-	right: 14px;
-}
-
-#powerTip.se:after, #powerTip.se:before {
-	left: 14px;
-}
-
-#powerTip.e:after, #powerTip.e:before {
-	left: 100%;
-}
-#powerTip.e:after {
-	border-left-color: #ffffff;
-	border-width: 10px;
-	top: 50%;
-	margin-top: -10px;
-}
-#powerTip.e:before {
-	border-left-color: #808080;
-	border-width: 11px;
-	top: 50%;
-	margin-top: -11px;
-}
-
-#powerTip.w:after, #powerTip.w:before {
-	right: 100%;
-}
-#powerTip.w:after {
-	border-right-color: #ffffff;
-	border-width: 10px;
-	top: 50%;
-	margin-top: -10px;
-}
-#powerTip.w:before {
-	border-right-color: #808080;
-	border-width: 11px;
-	top: 50%;
-	margin-top: -11px;
-}
-
-/*
- * Centered container for all content
- */
-
-div.contents,
-div.header > *,
-ul.tablist,
-.navpath ul {
-  margin:0 15px;
-}
-@media (min-width: 568px) {
-  div.contents,
-  div.header > *,
-  ul.tablist,
-  .navpath ul {
-    margin: 0 auto;
-    width: 90%;
-    max-width: 1200px;
-  }
-}
-
-/*
- * padding inside content
- */
-
-div.contents > * {
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
-@media (min-width: 568px) {
-  div.contents > h2,
-  div.contents > div.textblock,
-  div.contents > div.memitem,
-  div.contents > table.memberdecls h2,
-  div.contents > p {
-    padding-top: 30px;
-  }
-}
-
-div.contents h2 {
-  margin-top: 0px;
-}
-
-div.summary {
-  display: none;
-}
-
-/*
- * Tabs
- *
- * Based on doxygen tabs.css
- */
-
-.tabs, .tabs2, .tabs3 {
-  width: 100%;
-  background-color: #f4f4f4;
-  border-top: solid 1px #ececec;
-}
-
-.tablist {
-  margin: 0;
-  padding: 0;
-  display: table;
-}
-
-.tablist li {
-  float: left;
-  display: table-cell;
-  line-height: 36px;
-  list-style: none;
-}
-
-.tablist a {
-  display: block;
-  padding: 0 30px 0 0;
-}
-
-.tabs3 .tablist a {
-  padding: 0 20px 0 0;
-}
-
-.tablist li.current a {
-  color: #54a23d;
-}
-
-/*
- * Navpath
- */
-
-.navpath ul
-{
-	padding:20px 0px;
-}
-
-.navpath li
-{
-	list-style-type:none;
-	padding-right: 10px;
-	float:left;
-}
-
-.navpath li.navelem a
-{
-  padding-left: 10px;
-}
-
-.navpath li.navelem:before {
-  content: "/";
-  color: #777;
-}
-
-/*
- * Member
- *
- * Styles for detailed member documentation
- */
-
-.memitem {
-  border-top: solid 1px #c9c9c9;
-}
-
-.memname {
-  font-weight: bold;
-  font-family: monospace;
-}
-
-td.memname {
-  color: #54a23d;
-}
-
-.memname td {
-  vertical-align: bottom;
-}
-
-.memproto, dl.reflist dt {
-  font-weight: bold;
-}
-
-.memdoc, dl.reflist dd {
-}
-
-/*
- * Parameters
- */
-
-.paramkey {
-  text-align: right;
-}
-
-.paramtype {
-  white-space: nowrap;
-}
-
-.paramname {
-  color: #aa0e0e;
-  white-space: nowrap;
-}
-
-.paramname em {
-  font-style: normal;
-}
-
-.params, .retval, .exception, .tparams {
-  margin-left: 0px;
-  padding-left: 0px;
-}
-
-.params td {
-  padding-right: 1em;
-  padding-bottom: 0.5em;
-}
-
-.params .paramname, .retval .paramname {
-  font-weight: bold;
-  vertical-align: top;
-}
-
-.params .paramtype {
-  font-style: italic;
-  vertical-align: top;
-}
-
-/*
- * Inline Label etc.
- */
-
-table.mlabels {
-  border-spacing: 0px;
-}
-
-td.mlabels-left {
-  width: 100%;
-  padding: 0px;
-}
-
-td.mlabels-right {
-  vertical-align: bottom;
-  padding: 0px;
-  white-space: nowrap;
-}
-
-span.mlabels {
-  margin-left: 8px;
-}
-
-/*
- * Member Descriptions
- */
-
-table.memberdecls {
-  font-family: monospace;
-	border-spacing: 0px;
-	padding: 0px;
-}
-
-.memSeparator {
-  line-height: 1px;
-  margin: 0px;
-  padding: 0 0 0.2em 0;
-}
-
-.memItemLeft, .memTemplItemLeft {
-  white-space: nowrap;
-}
-
-.memItemRight {
-	width: 100%;
-}
-
-.memTemplParams {
-	color: #4665A2;
-  white-space: nowrap;
-	font-size: 80%;
-}
-
-/*
- * Fieldtable (Enums)
- */
-
-.fieldtable td, .fieldtable th {
-  padding: 0 1em 0.2em 0;
-}
-
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
-        white-space: nowrap;
-        vertical-align: top;
-}
-
-/*
- * Directory
- */
-
-.directory table {
-  border-collapse:collapse;
-}
-
-.directory td {
-  margin: 0px;
-  padding: 0px;
-	vertical-align: top;
-}
-
-.directory td.entry {
-  white-space: nowrap;
-  padding-right: 6px;
-	padding-top: 3px;
-}
-
-.directory td.entry a {
-  outline:none;
-}
-
-.directory td.entry a img {
-  border: none;
-}
-
-.directory td.desc {
-  width: 100%;
-  padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-}
-
-.directory tr.even {
-	padding-left: 6px;
-}
-
-.directory img {
-	vertical-align: -30%;
-}
-
-.directory .levels {
-  white-space: nowrap;
-  width: 100%;
-  text-align: right;
-}
-
-.directory .levels span {
-  cursor: pointer;
-  padding-left: 2px;
-  padding-right: 2px;
-	color: #3c92d1;
-}
-
-.arrow {
-    color: #9CAFD4;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    cursor: pointer;
-    font-size: 80%;
-    display: inline-block;
-    width: 16px;
-    height: 22px;
-}
-
-.icon {
-    font-family: Arial, Helvetica;
-    font-weight: bold;
-    font-size: 12px;
-    height: 14px;
-    width: 16px;
-    display: inline-block;
-    background-color: #54a23d;
-    color: white;
-    text-align: center;
-    border-radius: 4px;
-    margin-left: 2px;
-    margin-right: 2px;
-}
-
-.icona {
-    width: 24px;
-    height: 22px;
-    display: inline-block;
-}
-
-.iconfopen {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('ftv2folderopen.png');
-    background-position: 0px 0px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.iconfclosed {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('ftv2folderclosed.png');
-    background-position: 0px 0px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-.icondoc {
-    width: 24px;
-    height: 18px;
-    margin-bottom: 4px;
-    background-image:url('ftv2doc.png');
-    background-position: 0px -1px;
-    background-repeat: repeat-y;
-    vertical-align:top;
-    display: inline-block;
-}
-
-/*
- * Data Structure Index
- *
- * Hardcoded style attribute
- */
-
-.contents > table[style] {
-   margin: 20px auto !important;
-}
-
-/*
- * Search Box
- */
-
-#MSearchBox {
-  right: 4%;
-}
-
-@media print
-{
-  #top { display: none; }
-  #side-nav { display: none; }
-  #nav-path { display: none; }
-  body { overflow:visible; }
-  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
-  .summary { display: none; }
-  .memitem { page-break-inside: avoid; }
-  #doc-content
-  {
-    margin-left:0 !important;
-    height:auto !important;
-    width:auto !important;
-    overflow:inherit;
-    display:inline;
-  }
-}
-