diff options
| -rw-r--r-- | doc/nvim-treesitter.txt | 191 | ||||
| -rw-r--r-- | lua/nvim-treesitter/highlight.lua | 89 |
2 files changed, 154 insertions, 126 deletions
diff --git a/doc/nvim-treesitter.txt b/doc/nvim-treesitter.txt index 7cdc38c9a..bafacfff0 100644 --- a/doc/nvim-treesitter.txt +++ b/doc/nvim-treesitter.txt @@ -397,21 +397,30 @@ Note: This is highly experimental, and folding can break on some types of ============================================================================== HIGHLIGHTS *nvim-treesitter-highlights* -`TSError` - *hl-TSError* -For syntax/parser errors. +`TSAnnotation` + *hl-TSAnnotation* +For C++/Dart attributes, annotations that can be attached to the code to +denote some kind of meta information. -`TSPunctDelimiter` - *hl-TSPunctDelimiter* -For delimiters ie: `.` +`TSAttribute` + hl-TSAttribute +(unstable) TODO: docs -`TSPunctBracket` - *hl-TSPunctBracket* -For brackets and parens. +`TSBoolean` + *hl-TSBoolean* +For booleans. -`TSPunctSpecial` - *hl-TSPunctSpecial* -For special punctutation that does not fall in the catagories before. +`TSCharacter` + *hl-TSCharacter* +For characters. + +`TSConstructor` + *hl-TSConstructor* +For constructor calls and definitions: `{}` in Lua, and Java constructors. + +`TSConditional` + *hl-TSConditional* +For keywords related to conditionnals. `TSConstant` *hl-TSConstant* @@ -425,29 +434,17 @@ For constant that are built in the language: `nil` in Lua. *hl-TSConstMacro* For constants that are defined by macros: `NULL` in C. -`TSString` - *hl-TSString* -For strings. - -`TSStringRegex` - *hl-TSStringRegex* -For regexes. - -`TSStringEscape` - *hl-TSStringEscape* -For escape characters within a string. - -`TSCharacter` - *hl-TSCharacter* -For characters. +`TSError` + *hl-TSError* +For syntax/parser errors. -`TSNumber` - *hl-TSNumber* -For integers. +`TSException` + *hl-TSException* +For exception related keywords. -`TSBoolean` - *hl-TSBoolean* -For booleans. +`TSField` + *hl-TSField* +For fields. `TSFloat` *hl-TSFloat* @@ -466,6 +463,43 @@ For builtin functions: `table.insert` in Lua. For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. +`TSInclude` + *hl-TSInclude* +For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` +in Lua. + +`TSKeyword` + *hl-TSKeyword* +For keywords that don't fall in previous categories. + +`TSKeywordFunction` + *hl-TSKeywordFunction* +For keywords used to define a fuction. + +`TSLabel` + *hl-TSLabel* +For labels: `label:` in C and `:label:` in Lua. + +`TSMethod` + *hl-TSMethod* +For method calls and definitions. + +`TSNamespace` + *hl-TSNamespace* +For identifiers referring to modules and namespaces. + +`TSNone` + *hl-None* +TODO: docs + +`TSNumber` + *hl-TSNumber* +For all numbers + +`TSOperator` + *hl-TSOperator* +For any operator: `+`, but also `->` and `*` in C. + `TSParameter` *hl-TSParameter* For parameters of a function. @@ -474,80 +508,54 @@ For parameters of a function. *hl-TSParameterReference* For references to parameters of a function. -`TSMethod` - *hl-TSMethod* -For method calls and definitions. - -`TSField` - *hl-TSField* -For fields. - `TSProperty` *hl-TSProperty* Same as `TSField`. -`TSConstructor` - *hl-TSConstructor* -For constructor calls and definitions: `{}` in Lua, and Java constructors. +`TSPunctDelimiter` + *hl-TSPunctDelimiter* +For delimiters ie: `.` -`TSConditional` - *hl-TSConditional* -For keywords related to conditionnals. +`TSPunctBracket` + *hl-TSPunctBracket* +For brackets and parens. + +`TSPunctSpecial` + *hl-TSPunctSpecial* +For special punctutation that does not fall in the catagories before. `TSRepeat` *hl-TSRepeat* For keywords related to loops. -`TSLabel` - *hl-TSLabel* -For labels: `label:` in C and `:label:` in Lua. - -`TSOperator` - *hl-TSOperator* -For any operator: `+`, but also `->` and `*` in C. - -`TSKeyword` - *hl-TSKeyword* -For keywords that don't fall in previous categories. - -`TSKeywordFunction` - *hl-TSKeywordFunction* -For keywords used to define a fuction. - -`TSException` - *hl-TSException* -For exception related keywords. +`TSString` + *hl-TSString* +For strings. -`TSType` - *hl-TSType* -For types. +`TSStringRegex` + *hl-TSStringRegex* +For regexes. -`TSTypeBuiltin` - *hl-TSTypeBuiltin* -For builtin types (you guessed it, right ?). +`TSStringEscape` + *hl-TSStringEscape* +For escape characters within a string. -`TSNamespace` - *hl-TSNamespace* -For identifiers referring to modules and namespaces. +`TSStructure` + *hl-TSStructure* +TODO: docs -`TSInclude` - *hl-TSInclude* -For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` -in Lua. +`TSTag` + *hl-TSTag* +Tags like html tag names. -`TSAnnotation` - *hl-TSAnnotation* -For C++/Dart attributes, annotations that can be attached to the code to -denote some kind of meta information. +`TSTagDelimiter` + *hl-TSTagDelimiter* +Tag delimiter like `<` `>` `/` `TSText` *hl-TSText* For strings considered text in a markup language. -`TSStrong` - *hl-TSStrong* -For text to be represented with strong. - `TSEmphasis` *hl-TSEmphasis* For text to be represented with emphasis. @@ -558,7 +566,6 @@ For text to be represented with an underline. `TSTitle` *hl-TSTitle* - Text that is part of a title. `TSLiteral` @@ -569,6 +576,14 @@ Literal text. *hl-TSURI* Any URI like a link or email. +`TSType` + *hl-TSType* +For types. + +`TSTypeBuiltin` + *hl-TSTypeBuiltin* +For builtin types. + `TSVariable` *hl-TSVariable* Any variable name that does not have another highlight. diff --git a/lua/nvim-treesitter/highlight.lua b/lua/nvim-treesitter/highlight.lua index ee68a4ad4..3cbaf6e38 100644 --- a/lua/nvim-treesitter/highlight.lua +++ b/lua/nvim-treesitter/highlight.lua @@ -11,58 +11,71 @@ local M = { local hlmap = vim.treesitter.highlighter.hl_map --- Misc -hlmap.error = "TSError" -hlmap["punctuation.delimiter"] = "TSPunctDelimiter" -hlmap["punctuation.bracket"] = "TSPunctBracket" -hlmap["punctuation.special"] = "TSPunctSpecial" - -- Constants +hlmap["annotation"] = "TSAnnotation" + +hlmap["attribute"] = "TSAttribute" + +hlmap["boolean"] = "TSBoolean" + +hlmap["character"] = "TSCharacter" + +hlmap["conditional"] = "TSConditional" + hlmap["constant"] = "TSConstant" hlmap["constant.builtin"] = "TSConstBuiltin" hlmap["constant.macro"] = "TSConstMacro" -hlmap["string"] = "TSString" -hlmap["string.regex"] = "TSStringRegex" -hlmap["string.escape"] = "TSStringEscape" -hlmap["character"] = "TSCharacter" -hlmap["number"] = "TSNumber" -hlmap["boolean"] = "TSBoolean" + +hlmap["constructor"] = "TSConstructor" + +hlmap.error = "TSError" +hlmap["exception"] = "TSException" + +hlmap["field"] = "TSField" + hlmap["float"] = "TSFloat" -hlmap["annotation"] = "TSAnnotation" -hlmap["attribute"] = "TSAttribute" -hlmap["namespace"] = "TSNamespace" --- Functions hlmap["function"] = "TSFunction" hlmap["function.builtin"] = "TSFuncBuiltin" hlmap["function.macro"] = "TSFuncMacro" -hlmap["parameter"] = "TSParameter" -hlmap["parameter.reference"] = "TSParameterReference" -hlmap["method"] = "TSMethod" -hlmap["field"] = "TSField" -hlmap["property"] = "TSProperty" -hlmap["constructor"] = "TSConstructor" --- Keywords -hlmap["conditional"] = "TSConditional" -hlmap["repeat"] = "TSRepeat" -hlmap["label"] = "TSLabel" +hlmap["include"] = "TSInclude" + hlmap["keyword"] = "TSKeyword" hlmap["keyword.function"] = "TSKeywordFunction" hlmap["keyword.operator"] = "TSKeywordOperator" + +hlmap["label"] = "TSLabel" + +hlmap["method"] = "TSMethod" + +hlmap["namespace"] = "TSNamespace" + +hlmap["none"] = "TSNone" +hlmap["number"] = "TSNumber" + hlmap["operator"] = "TSOperator" -hlmap["exception"] = "TSException" -hlmap["type"] = "TSType" -hlmap["type.builtin"] = "TSTypeBuiltin" +hlmap["parameter"] = "TSParameter" +hlmap["parameter.reference"] = "TSParameterReference" + +hlmap["property"] = "TSProperty" + +hlmap["punctuation.delimiter"] = "TSPunctDelimiter" +hlmap["punctuation.bracket"] = "TSPunctBracket" +hlmap["punctuation.special"] = "TSPunctSpecial" + +hlmap["repeat"] = "TSRepeat" + +hlmap["string"] = "TSString" +hlmap["string.regex"] = "TSStringRegex" +hlmap["string.escape"] = "TSStringEscape" + hlmap["structure"] = "TSStructure" -hlmap["include"] = "TSInclude" --- variable -hlmap["variable"] = "TSVariable" -hlmap["variable.builtin"] = "TSVariableBuiltin" +hlmap["tag"] = "TSTag" +hlmap["tag.delimiter"] = "TSTagDelimiter" --- Text hlmap["text"] = "TSText" hlmap["text.strong"] = "TSStrong" hlmap["text.emphasis"] = "TSEmphasis" @@ -71,11 +84,11 @@ hlmap["text.title"] = "TSTitle" hlmap["text.literal"] = "TSLiteral" hlmap["text.uri"] = "TSURI" --- Tags -hlmap["tag"] = "TSTag" -hlmap["tag.delimiter"] = "TSTagDelimiter" +hlmap["type"] = "TSType" +hlmap["type.builtin"] = "TSTypeBuiltin" -hlmap["none"] = "TSNone" +hlmap["variable"] = "TSVariable" +hlmap["variable.builtin"] = "TSVariableBuiltin" function M.attach(bufnr, lang) local parser = parsers.get_parser(bufnr, lang) |