summaryrefslogtreecommitdiff
path: root/lua/nvim-treesitter
diff options
context:
space:
mode:
authorThomas Vigouroux <39092278+vigoux@users.noreply.github.com>2020-04-25 21:44:44 +0200
committerGitHub <noreply@github.com>2020-04-25 21:44:44 +0200
commit2ca0c348f73655b395ded2e60e13ba0c2249dc74 (patch)
treecebdee86382940748cc71c24afde455e3655d6e2 /lua/nvim-treesitter
parentbae9f329521f98a3d841e056a4ad701bd782a9a5 (diff)
parentf489b4b0a337379973d6801805aa9b7800d2e6e8 (diff)
Merge pull request #26 from kyazdani42/fix/config-isenabled
fix: config is enabled also checks parser existence
Diffstat (limited to 'lua/nvim-treesitter')
-rw-r--r--lua/nvim-treesitter/configs.lua12
1 files changed, 7 insertions, 5 deletions
diff --git a/lua/nvim-treesitter/configs.lua b/lua/nvim-treesitter/configs.lua
index c9450ed6..64d4170e 100644
--- a/lua/nvim-treesitter/configs.lua
+++ b/lua/nvim-treesitter/configs.lua
@@ -206,7 +206,9 @@ local function enable_all(mod, ft)
end
end
if ft then
- enable_mod_conf_autocmd(mod, ft)
+ if parser_utils.has_parser(ft) then
+ enable_mod_conf_autocmd(mod, ft)
+ end
else
for _, ft in pairs(M.available_parsers()) do
if parser_utils.has_parser(ft) then
@@ -245,9 +247,7 @@ local function disable_all(mod, ft)
disable_mod_conf_autocmd(mod, ft)
else
for _, ft in pairs(M.available_parsers()) do
- if parser_utils.has_parser(ft) then
- disable_mod_conf_autocmd(mod, ft)
- end
+ disable_mod_conf_autocmd(mod, ft)
end
config[mod].enable = false
end
@@ -291,7 +291,9 @@ M.commands = {
-- @param mod: module (string)
-- @param ft: filetype (string)
function M.is_enabled(mod, ft)
- if not M.get_parser_configs()[ft] then return false end
+ if not M.get_parser_configs()[ft] or not parser_utils.has_parser(ft) then
+ return false
+ end
local module_config = M.get_config()[mod]
if not module_config then return false end