Merge pull request #1 from nvim-treesitter/master

Updates from master

1 files changed, 43 insertions, 15 deletions

diff --git a/lua/nvim-treesitter.lua b/lua/nvim-treesitter.lua
index b053f39b0..90b5468a3 100644
--- a/lua/nvim-treesitter.lua
+++ b/lua/nvim-treesitter.lua
@@ -1,30 +1,58 @@
 local api = vim.api
-local parsers = require'nvim-treesitter.parsers'
-local configs = require 'nvim-treesitter.configs'
 local install = require'nvim-treesitter.install'
 local locals = require'nvim-treesitter.locals'
-local highlight = require'nvim-treesitter.highlight'
+local utils = require'nvim-treesitter.utils'
+local info = require'nvim-treesitter.info'
+local configs = require'nvim-treesitter.configs'
 
 local M = {}
 
-function M.available_parsers()
-  return vim.tbl_keys(configs.repositories)
-end
-
 -- This function sets up everythin needed for a given language
 -- this is the main interface through the plugin
 function M.setup(lang)
-  if parsers.has_parser(lang) then
-    local autocmd = "autocmd NvimTreesitter FileType %s lua require'nvim-treesitter.highlight'.setup()"
-    api.nvim_command(string.format(autocmd, lang))
+  utils.setup_commands('install', install.commands)
+  utils.setup_commands('info', info.commands)
+  utils.setup_commands('configs', configs.commands)
+
+  for _, ft in pairs(configs.available_parsers()) do
+    for _, mod in pairs(configs.available_modules()) do
+      if configs.is_enabled(mod, ft) then
+        local cmd = string.format("lua require'nvim-treesitter.%s'.attach()", mod)
+        api.nvim_command(string.format("autocmd FileType %s %s", ft, cmd))
+      end
+    end
   end
 end
 
--- This function initialize the plugin
--- it is run at startup
-M._root = {}
-function M._root.setup()
-  install.setup()
+function M.statusline(indicator_size)
+  local indicator_size = indicator_size or 1000
+  local expr = require"nvim-treesitter.utils".expression_at_point()
+  local current_node =
+    require'nvim-treesitter.node_movement'.current_node[api.nvim_get_current_buf()]
+
+  local indicator = ""
+  while expr and (#indicator + #(expr:type()) + 5) < indicator_size do
+
+    local prefix = ""
+    if expr:parent() then
+      prefix = "->"
+    end
+
+
+    if expr == current_node then
+      indicator = string.format("%s[%s]%s", prefix, expr:type(), indicator)
+    else
+      indicator = prefix .. expr:type() .. indicator
+    end
+
+    expr = expr:parent()
+  end
+
+  if expr then
+    return "..." .. indicator
+  else
+    return indicator
+  end
 end
 
 return M