benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-15 18:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: add typescript install

Browse source 
- add repo.location for typescript and compile at that location
- typescript and tsx must be installed separately as two different
  parsers.
This commit is contained in:
kiyan42 2020-04-21 19:28:23 +02:00
parent a7810728d2
commit b4ca1c4f78
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lua/nvim-treesitter/install.lua
View file

@ -76,7 +76,16 @@ M.repositories = {
url = "https://github.com/tree-sitter/tree-sitter-c-sharp", url = "https://github.com/tree-sitter/tree-sitter-c-sharp",
files = { "src/parser.c", "src/scanner.c" }, files = { "src/parser.c", "src/scanner.c" },
}, },
-- TODO: find a way to install typescript properly typescript = {
url = "https://github.com/tree-sitter/tree-sitter-typescript",
files = { "src/parser.c", "src/scanner.c" },
location = "tree-sitter-typescript/typescript"
},
tsx = {
url = "https://github.com/tree-sitter/tree-sitter-typescript",
files = { "src/parser.c", "src/scanner.c" },
location = "tree-sitter-tsx/tsx"
}
} }
local function get_package_path() local function get_package_path()
@ -122,6 +131,8 @@ end
local function run_install(cache_folder, package_path, ft, repo) local function run_install(cache_folder, package_path, ft, repo)
local project_name = 'tree-sitter-'..ft local project_name = 'tree-sitter-'..ft
local project_repo = cache_folder..'/'..project_name local project_repo = cache_folder..'/'..project_name
-- compile_location only needed for typescript installs.
local compile_location = cache_folder..'/'..(repo.location or project_name)
local parser_lib_name = package_path.."/parser/"..ft..".so" local parser_lib_name = package_path.."/parser/"..ft..".so"
local command_list = { local command_list = {
{ {
@ -145,13 +156,13 @@ local function run_install(cache_folder, package_path, ft, repo)
err = 'Error during compilation', err = 'Error during compilation',
opts = { opts = {
args = { '-o', 'parser.so', '-shared', '-lstdc++', unpack(repo.files), '-Os', '-I./src' }, args = { '-o', 'parser.so', '-shared', '-lstdc++', unpack(repo.files), '-Os', '-I./src' },
cwd = project_repo cwd = compile_location
} }
}, },
{ {
cmd = 'mv', cmd = 'mv',
opts = { opts = {
args = { project_repo..'/parser.so', parser_lib_name } args = { compile_location..'/parser.so', parser_lib_name }
} }
}, },
{ {
@ -207,17 +218,19 @@ function M.checkhealth()
if fn.executable('git') == 0 then if fn.executable('git') == 0 then
health_error('`git` executable not found.', { health_error('`git` executable not found.', {
'Install it with your package manager.', 'Install it with your package manager.',
'Check that your `$PATH` is set correctly.'}) 'Check that your `$PATH` is set correctly.'
})
else else
health_ok('`git` executable found.') health_ok('`git` executable found.')
end end
if fn.executable('cc') == 0 then if fn.executable('cc') == 0 then
health_error('`cc` executable not found.', { health_error('`cc` executable not found.', {
'Install `gcc` with your package manager.', 'Install `gcc` with your package manager.',
'Install `clang` with your package manager.', 'Install `clang` with your package manager.',
'Check that your `$PATH` is set correctly.'}) 'Check that your `$PATH` is set correctly.'
})
else else
health_ok('`cc` executable found.') health_ok('`cc` executable found.')
end end