aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2023-06-08 13:25:31 +0200
committerChristian Clason <c.clason@uni-graz.at>2025-05-12 18:43:40 +0200
commitf0a984347c0e9c1e6efc493bbfb9b062041a9855 (patch)
tree16c918a2579c135a77ff06d85c5b679fc0d87f58 /lua
parentrefactor: use vim.system (#4923) (diff)
downloadnvim-treesitter-f0a984347c0e9c1e6efc493bbfb9b062041a9855.tar
nvim-treesitter-f0a984347c0e9c1e6efc493bbfb9b062041a9855.tar.gz
nvim-treesitter-f0a984347c0e9c1e6efc493bbfb9b062041a9855.tar.bz2
nvim-treesitter-f0a984347c0e9c1e6efc493bbfb9b062041a9855.tar.lz
nvim-treesitter-f0a984347c0e9c1e6efc493bbfb9b062041a9855.tar.xz
nvim-treesitter-f0a984347c0e9c1e6efc493bbfb9b062041a9855.tar.zst
nvim-treesitter-f0a984347c0e9c1e6efc493bbfb9b062041a9855.zip
feat!: drop makefile support, norg parser
Norg install_info and queries are maintained by neorg. All other parsers are compatible with C++11, so fix that as standard. (Can be bumped if all supported platforms support C++14.) Remove Makefile support, as it's no longer needed.
Diffstat (limited to 'lua')
-rw-r--r--lua/nvim-treesitter/install.lua15
-rw-r--r--lua/nvim-treesitter/parsers.lua11
2 files changed, 2 insertions, 24 deletions
diff --git a/lua/nvim-treesitter/install.lua b/lua/nvim-treesitter/install.lua
index 097a5ab0e..9f99f0cfe 100644
--- a/lua/nvim-treesitter/install.lua
+++ b/lua/nvim-treesitter/install.lua
@@ -391,19 +391,8 @@ end
---@param compile_location string
---@return SystemCompleted
local function do_compile(repo, cc, compile_location)
- local make = M.select_executable({ 'gmake', 'make' })
-
- local cmd --- @type string[]
- if cc:find('cl$') or cc:find('cl.exe$') or not repo.use_makefile or iswin or not make then
- local args = vim.tbl_flatten(select_compiler_args(repo, cc))
- cmd = vim.list_extend({ cc }, args)
- else
- cmd = {
- make,
- '--makefile=' .. M.get_package_path('scripts', 'compile_parsers.makefile'),
- 'CC=' .. cc,
- }
- end
+ local args = vim.tbl_flatten(select_compiler_args(repo, cc))
+ local cmd = vim.list_extend({ cc }, args)
return system(cmd, { cwd = compile_location })
end
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua
index 357d11650..7f0041e36 100644
--- a/lua/nvim-treesitter/parsers.lua
+++ b/lua/nvim-treesitter/parsers.lua
@@ -6,7 +6,6 @@
---@field generate_requires_npm boolean|nil
---@field requires_generate_from_grammar boolean|nil
---@field location string|nil
----@field use_makefile boolean|nil
---@class ParserInfo
---@field install_info InstallInfo
@@ -1583,16 +1582,6 @@ M.configs = {
maintainers = { '@leo60228' },
},
- norg = {
- install_info = {
- url = 'https://github.com/nvim-neorg/tree-sitter-norg',
- files = { 'src/parser.c', 'src/scanner.cc' },
- use_makefile = true,
- },
- maintainers = { '@JoeyGrajciar', '@vhyrro' },
- tier = 4,
- },
-
nqc = {
install_info = {
url = 'https://github.com/amaanq/tree-sitter-nqc',