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

Fix: Allow repo.url to end in ".git"

Browse source
This commit is contained in:
Stephan Seitz 2021-03-02 17:44:20 +01:00 • committed by Santos Gallegos
parent c1a821b71f
commit 06660a73a7
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/nvim-treesitter/parsers.lua
View file

@ -317,7 +317,7 @@ list.vue = {
list.jsonc = { list.jsonc = {
install_info = { install_info = {
url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc", url = "https://gitlab.com/WhyNotHugo/tree-sitter-jsonc.git",
files = { "src/parser.c" }, files = { "src/parser.c" },
}, },
readme_name = "JSON with comments", readme_name = "JSON with comments",

7
lua/nvim-treesitter/shell_command_selectors.lua
View file

@ -117,6 +117,7 @@ function M.select_download_commands(repo, project_name, cache_folder, revision)
revision = revision or repo.branch or "master" revision = revision or repo.branch or "master"
local path_sep = utils.get_path_sep() local path_sep = utils.get_path_sep()
local url = repo.url:gsub('.git$', '')
return { return {
M.select_install_rm_cmd(cache_folder, project_name..'-tmp'), M.select_install_rm_cmd(cache_folder, project_name..'-tmp'),
@ -127,8 +128,8 @@ function M.select_download_commands(repo, project_name, cache_folder, revision)
opts = { opts = {
args = { args = {
'-L', -- follow redirects '-L', -- follow redirects
is_github and repo.url.."/archive/"..revision..".tar.gz" is_github and url.."/archive/"..revision..".tar.gz"
or repo.url.."/-/archive/"..revision.."/"..project_name.."-"..revision..".tar.gz", or url.."/-/archive/"..revision.."/"..project_name.."-"..revision..".tar.gz",
'--output', '--output',
project_name..".tar.gz" project_name..".tar.gz"
}, },
@ -151,7 +152,7 @@ function M.select_download_commands(repo, project_name, cache_folder, revision)
}, },
}, },
M.select_rm_file_cmd(cache_folder..path_sep..project_name..".tar.gz"), M.select_rm_file_cmd(cache_folder..path_sep..project_name..".tar.gz"),
M.select_mv_cmd(utils.join_path(project_name..'-tmp', repo.url:match('[^/]-$')..'-'..revision), M.select_mv_cmd(utils.join_path(project_name..'-tmp', url:match('[^/]-$')..'-'..revision),
project_name, project_name,
cache_folder), cache_folder),
M.select_install_rm_cmd(cache_folder, project_name..'-tmp') M.select_install_rm_cmd(cache_folder, project_name..'-tmp')