aboutsummaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
authorKiyan Yazdani <yazdani.kiyan@protonmail.com>2020-05-07 14:09:50 +0200
committerGitHub <noreply@github.com>2020-05-07 14:09:50 +0200
commite9bcc844d47c18f6279e55208bd1d8aab0be1ab6 (patch)
tree8fe07f3adbf29af508d24c0291677d6ac4dff9d2 /lua
parentMerge pull request #44 from vigoux/statusline (diff)
parentfix(CONTRIBUTING): typos (diff)
downloadnvim-treesitter-e9bcc844d47c18f6279e55208bd1d8aab0be1ab6.tar
nvim-treesitter-e9bcc844d47c18f6279e55208bd1d8aab0be1ab6.tar.gz
nvim-treesitter-e9bcc844d47c18f6279e55208bd1d8aab0be1ab6.tar.bz2
nvim-treesitter-e9bcc844d47c18f6279e55208bd1d8aab0be1ab6.tar.lz
nvim-treesitter-e9bcc844d47c18f6279e55208bd1d8aab0be1ab6.tar.xz
nvim-treesitter-e9bcc844d47c18f6279e55208bd1d8aab0be1ab6.tar.zst
nvim-treesitter-e9bcc844d47c18f6279e55208bd1d8aab0be1ab6.zip
Merge pull request #40 from vigoux/contributing
Add CONTRIBUTING.md
Diffstat (limited to 'lua')
-rw-r--r--lua/nvim-treesitter/highlight.lua41
-rw-r--r--lua/nvim-treesitter/locals.lua4
2 files changed, 43 insertions, 2 deletions
diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua
index 65ab48dcb..9cf259639 100644
--- a/lua/nvim-treesitter/highlight.lua
+++ b/lua/nvim-treesitter/highlight.lua
@@ -6,6 +6,47 @@ local M = {
highlighters = {}
}
+local hlmap = vim.treesitter.TSHighlighter.hl_map
+
+-- Misc
+hlmap.error = "Error"
+hlmap["punctuation.delimiter"] = "Delimiter"
+hlmap["punctuation.bracket"] = "Delimiter"
+
+-- Constants
+hlmap["constant"] = "Constant"
+hlmap["constant.builtin"] = "Special"
+hlmap["constant.macro"] = "Define"
+hlmap["string"] = "String"
+hlmap["string.regex"] = "String"
+hlmap["string.escape"] = "SpecialChar"
+hlmap["character"] = "Character"
+hlmap["number"] = "Number"
+hlmap["boolean"] = "Boolean"
+hlmap["float"] = "Float"
+
+-- Functions
+hlmap["function"] = "Function"
+hlmap["function.builtin"] = "Special"
+hlmap["function.macro"] = "Macro"
+hlmap["parameter"] = "Identifier"
+hlmap["method"] = "Function"
+hlmap["field"] = "Identifier"
+hlmap["property"] = "Identifier"
+hlmap["constructor"] = "Special"
+
+-- Keywords
+hlmap["conditional"] = "Conditional"
+hlmap["repeat"] = "Repeat"
+hlmap["label"] = "Label"
+hlmap["operator"] = "Operator"
+hlmap["keyword"] = "Keyword"
+hlmap["exception"] = "Exception"
+
+hlmap["type"] = "Type"
+hlmap["type.builtin"] = "Type"
+hlmap["structure"] = "Structure"
+
function M.attach(bufnr, ft)
local buf = bufnr or api.nvim_get_current_buf()
local ft = ft or api.nvim_buf_get_option(buf, 'ft')
diff --git a/lua/nvim-treesitter/locals.lua b/lua/nvim-treesitter/locals.lua
index 3e5174548..b16408ac5 100644
--- a/lua/nvim-treesitter/locals.lua
+++ b/lua/nvim-treesitter/locals.lua
@@ -52,8 +52,8 @@ function M.get_definitions(bufnr)
local defs = {}
for _, loc in ipairs(locals) do
- if loc.definition and loc.definition.node then
- table.insert(defs, {node=loc.definition.node, kind=loc.kind})
+ if loc.definition then
+ table.insert(defs, loc.definition)
end
end