diff options
| author | Stephan Seitz <stephan.seitz@fau.de> | 2021-09-09 22:48:57 +0200 |
|---|---|---|
| committer | Stephan Seitz <stephan.seitz@fau.de> | 2022-01-23 16:27:25 +0100 |
| commit | bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b (patch) | |
| tree | 88be817c63ac10956034fa3e345be5e90dd25c38 /lua | |
| parent | [docgen] Update README.md (diff) | |
| download | nvim-treesitter-bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b.tar nvim-treesitter-bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b.tar.gz nvim-treesitter-bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b.tar.bz2 nvim-treesitter-bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b.tar.lz nvim-treesitter-bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b.tar.xz nvim-treesitter-bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b.tar.zst nvim-treesitter-bb33aea03cd65e62e0b5cdd0b1077c09b88dce1b.zip | |
Set CXX standard per parser and fix Norg
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-treesitter/parsers.lua | 5 | ||||
| -rw-r--r-- | lua/nvim-treesitter/shell_command_selectors.lua | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lua/nvim-treesitter/parsers.lua b/lua/nvim-treesitter/parsers.lua index bfa4ccc86..cb9955850 100644 --- a/lua/nvim-treesitter/parsers.lua +++ b/lua/nvim-treesitter/parsers.lua @@ -893,12 +893,13 @@ list.hack = { list.norg = { install_info = { - url = "https://github.com/vhyrro/tree-sitter-norg", + url = "https://github.com/nvim-neorg/tree-sitter-norg", branch = "main", files = { "src/parser.c", "src/scanner.cc" }, use_makefile = true, + cxx_standard = "c++14", }, - maintainers = { "@JoeyGrajciar", "@vhyrro" }, + maintainers = { "@JoeyGrajciar", "@vhyrro", "@mrossinek" }, } local M = { diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua index fb322e014..5a16b58f5 100644 --- a/lua/nvim-treesitter/shell_command_selectors.lua +++ b/lua/nvim-treesitter/shell_command_selectors.lua @@ -94,7 +94,7 @@ function M.select_compiler_args(repo, compiler) end function M.select_compile_command(repo, cc, compile_location) - if string.match(cc, "cl$") or string.match(cc, "cl.exe$") or not repo.use_makefile then + if string.match(cc, "cl$") or string.match(cc, "cl.exe$") or not repo.use_makefile or fn.has "win32" == 1 then return { cmd = cc, info = "Compiling...", @@ -110,7 +110,11 @@ function M.select_compile_command(repo, cc, compile_location) info = "Compiling...", err = "Error during compilation", opts = { - args = { "--makefile=" .. utils.join_path(utils.get_package_path(), "scripts", "compile_parsers.makefile"), "CC=" .. cc }, + args = { + "--makefile=" .. utils.join_path(utils.get_package_path(), "scripts", "compile_parsers.makefile"), + "CC=" .. cc, + "CXX_STANDARD=" .. repo.cxx_standard, + }, cwd = compile_location, }, } |