From 19d7dced2c7a94f585ecbe52a3cca9b2b05a6793 Mon Sep 17 00:00:00 2001 From: Oliver Marriott Date: Sun, 2 Jan 2022 14:11:48 +1100 Subject: [PATCH] Update TS*, Diagnostic* and LSP* highlights --- lua/lush_theme/lush_template.lua | 186 ++++++++++++++++--------------- 1 file changed, 96 insertions(+), 90 deletions(-) diff --git a/lua/lush_theme/lush_template.lua b/lua/lush_theme/lush_template.lua index f44d2fa..00aa9ef 100644 --- a/lua/lush_theme/lush_template.lua +++ b/lua/lush_theme/lush_template.lua @@ -173,99 +173,105 @@ local theme = lush(function() -- Todo { }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - -- These groups are for the native LSP client. Some other LSP clients may - -- use these groups, or use their own. Consult your LSP client's - -- documentation. + -- These groups are for the native LSP client and diagnostic system. Some + -- other LSP clients may use these groups, or use their own. Consult your + -- LSP client's documentation. - -- LspReferenceText { }, -- used for highlighting "text" references - -- LspReferenceRead { }, -- used for highlighting "read" references - -- LspReferenceWrite { }, -- used for highlighting "write" references + -- See :h lsp-highlight, some groups may not be listed, submit a PR fix to lush-template! + -- + -- LspReferenceText { } , -- used for highlighting "text" references + -- LspReferenceRead { } , -- used for highlighting "read" references + -- LspReferenceWrite { } , -- used for highlighting "write" references + -- LspCodeLens { } , -- Used to color the virtual text of the codelens. See |nvim_buf_set_extmark()|. + -- LspCodeLensSeparator { } , -- Used to color the seperator between two or more code lens. + -- LspSignatureActiveParameter { } , -- Used to highlight the active parameter in the signature help. See |vim.lsp.handlers.signature_help()|. - -- LspDiagnosticsDefaultError { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - -- LspDiagnosticsDefaultWarning { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - -- LspDiagnosticsDefaultInformation { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - -- LspDiagnosticsDefaultHint { }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - - -- LspDiagnosticsVirtualTextError { }, -- Used for "Error" diagnostic virtual text - -- LspDiagnosticsVirtualTextWarning { }, -- Used for "Warning" diagnostic virtual text - -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text - -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text - - -- LspDiagnosticsUnderlineError { }, -- Used to underline "Error" diagnostics - -- LspDiagnosticsUnderlineWarning { }, -- Used to underline "Warning" diagnostics - -- LspDiagnosticsUnderlineInformation { }, -- Used to underline "Information" diagnostics - -- LspDiagnosticsUnderlineHint { }, -- Used to underline "Hint" diagnostics - - -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float - - -- LspDiagnosticsSignError { }, -- Used for "Error" signs in sign column - -- LspDiagnosticsSignWarning { }, -- Used for "Warning" signs in sign column - -- LspDiagnosticsSignInformation { }, -- Used for "Information" signs in sign column - -- LspDiagnosticsSignHint { }, -- Used for "Hint" signs in sign column - - -- LspCodeLens { }, -- Used to color the virtual text of the codelens - - -- These groups are for the neovim tree-sitter highlights. - -- As of writing, tree-sitter support is a WIP, group names may change. - -- By default, most of these groups link to an appropriate Vim group, - -- TSError -> Error for example, so you do not have to define these unless - -- you explicitly want to support Treesitter's improved syntax awareness. - - -- TSAnnotation { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. - -- TSAttribute { }; -- (unstable) TODO: docs - -- TSBoolean { }; -- For booleans. - -- TSCharacter { }; -- For characters. - -- TSComment { }; -- For comment blocks. - -- TSConstructor { }; -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. - -- TSConditional { }; -- For keywords related to conditionnals. - -- TSConstant { }; -- For constants - -- TSConstBuiltin { }; -- For constant that are built in the language: `nil` in Lua. - -- TSConstMacro { }; -- For constants that are defined by macros: `NULL` in C. - -- TSError { }; -- For syntax/parser errors. - -- TSException { }; -- For exception related keywords. - -- TSField { }; -- For fields. - -- TSFloat { }; -- For floats. - -- TSFunction { }; -- For function (calls and definitions). - -- TSFuncBuiltin { }; -- For builtin functions: `table.insert` in Lua. - -- TSFuncMacro { }; -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. - -- TSInclude { }; -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. - -- TSKeyword { }; -- For keywords that don't fall in previous categories. - -- TSKeywordFunction { }; -- For keywords used to define a fuction. - -- TSLabel { }; -- For labels: `label:` in C and `:label:` in Lua. - -- TSMethod { }; -- For method calls and definitions. - -- TSNamespace { }; -- For identifiers referring to modules and namespaces. - -- TSNone { }; -- TODO: docs - -- TSNumber { }; -- For all numbers - -- TSOperator { }; -- For any operator: `+`, but also `->` and `*` in C. - -- TSParameter { }; -- For parameters of a function. - -- TSParameterReference { }; -- For references to parameters of a function. - -- TSProperty { }; -- Same as `TSField`. - -- TSPunctDelimiter { }; -- For delimiters ie: `.` - -- TSPunctBracket { }; -- For brackets and parens. - -- TSPunctSpecial { }; -- For special punctutation that does not fall in the catagories before. - -- TSRepeat { }; -- For keywords related to loops. - -- TSString { }; -- For strings. - -- TSStringRegex { }; -- For regexes. - -- TSStringEscape { }; -- For escape characters within a string. - -- TSSymbol { }; -- For identifiers referring to symbols or atoms. - -- TSType { }; -- For types. - -- TSTypeBuiltin { }; -- For builtin types. - -- TSVariable { }; -- Any variable name that does not have another highlight. - -- TSVariableBuiltin { }; -- Variable names that are defined by the languages, like `this` or `self`. - - -- TSTag { }; -- Tags like html tag names. - -- TSTagDelimiter { }; -- Tag delimiter like `<` `>` `/` - -- TSText { }; -- For strings considered text in a markup language. - -- TSEmphasis { }; -- For text to be represented with emphasis. - -- TSUnderline { }; -- For text to be represented with an underline. - -- TSStrike { }; -- For strikethrough text. - -- TSTitle { }; -- Text that is part of a title. - -- TSLiteral { }; -- Literal text. - -- TSURI { }; -- Any URI like a link or email. + -- See :h diagnostic-highlights, some groups may not be listed, submit a PR fix to lush-template! + -- + -- DiagnosticError { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticWarn { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticInfo { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticHint { } , -- Used as the base highlight group. Other Diagnostic highlights link to this by default (except Underline) + -- DiagnosticVirtualTextError { } , -- Used for "Error" diagnostic virtual text. + -- DiagnosticVirtualTextWarn { } , -- Used for "Warn" diagnostic virtual text. + -- DiagnosticVirtualTextInfo { } , -- Used for "Info" diagnostic virtual text. + -- DiagnosticVirtualTextHint { } , -- Used for "Hint" diagnostic virtual text. + -- DiagnosticUnderlineError { } , -- Used to underline "Error" diagnostics. + -- DiagnosticUnderlineWarn { } , -- Used to underline "Warn" diagnostics. + -- DiagnosticUnderlineInfo { } , -- Used to underline "Info" diagnostics. + -- DiagnosticUnderlineHint { } , -- Used to underline "Hint" diagnostics. + -- DiagnosticFloatingError { } , -- Used to color "Error" diagnostic messages in diagnostics float. See |vim.diagnostic.open_float()| + -- DiagnosticFloatingWarn { } , -- Used to color "Warn" diagnostic messages in diagnostics float. + -- DiagnosticFloatingInfo { } , -- Used to color "Info" diagnostic messages in diagnostics float. + -- DiagnosticFloatingHint { } , -- Used to color "Hint" diagnostic messages in diagnostics float. + -- DiagnosticSignError { } , -- Used for "Error" signs in sign column. + -- DiagnosticSignWarn { } , -- Used for "Warn" signs in sign column. + -- DiagnosticSignInfo { } , -- Used for "Info" signs in sign column. + -- DiagnosticSignHint { } , -- Used for "Hint" signs in sign column. + -- See :h nvim-treesitter-highlights, some groups may not be listed, submit a PR fix to lush-template! + -- + -- TSAttribute { } , -- Annotations that can be attached to the code to denote some kind of meta information. e.g. C++/Dart attributes. + -- TSBoolean { } , -- Boolean literals: `True` and `False` in Python. + -- TSCharacter { } , -- Character literals: `'a'` in C. + -- TSComment { } , -- Line comments and block comments. + -- TSConditional { } , -- Keywords related to conditionals: `if`, `when`, `cond`, etc. + -- TSConstant { } , -- Constants identifiers. These might not be semantically constant. E.g. uppercase variables in Python. + -- TSConstBuiltin { } , -- Built-in constant values: `nil` in Lua. + -- TSConstMacro { } , -- Constants defined by macros: `NULL` in C. + -- TSConstructor { } , -- Constructor calls and definitions: `{}` in Lua, and Java constructors. + -- TSError { } , -- Syntax/parser errors. This might highlight large sections of code while the user is typing still incomplete code, use a sensible highlight. + -- TSException { } , -- Exception related keywords: `try`, `except`, `finally` in Python. + -- TSField { } , -- Object and struct fields. + -- TSFloat { } , -- Floating-point number literals. + -- TSFunction { } , -- Function calls and definitions. + -- TSFuncBuiltin { } , -- Built-in functions: `print` in Lua. + -- TSFuncMacro { } , -- Macro defined functions (calls and definitions): each `macro_rules` in Rust. + -- TSInclude { } , -- File or module inclusion keywords: `#include` in C, `use` or `extern crate` in Rust. + -- TSKeyword { } , -- Keywords that don't fit into other categories. + -- TSKeywordFunction { } , -- Keywords used to define a function: `function` in Lua, `def` and `lambda` in Python. + -- TSKeywordOperator { } , -- Unary and binary operators that are English words: `and`, `or` in Python; `sizeof` in C. + -- TSKeywordReturn { } , -- Keywords like `return` and `yield`. + -- TSLabel { } , -- GOTO labels: `label:` in C, and `::label::` in Lua. + -- TSMethod { } , -- Method calls and definitions. + -- TSNamespace { } , -- Identifiers referring to modules and namespaces. + -- TSNone { } , -- No highlighting (sets all highlight arguments to `NONE`). this group is used to clear certain ranges, for example, string interpolations. Don't change the values of this highlight group. + -- TSNumber { } , -- Numeric literals that don't fit into other categories. + -- TSOperator { } , -- Binary or unary operators: `+`, and also `->` and `*` in C. + -- TSParameter { } , -- Parameters of a function. + -- TSParameterReference { } , -- References to parameters of a function. + -- TSProperty { } , -- Same as `TSField`. + -- TSPunctDelimiter { } , -- Punctuation delimiters: Periods, commas, semicolons, etc. + -- TSPunctBracket { } , -- Brackets, braces, parentheses, etc. + -- TSPunctSpecial { } , -- Special punctuation that doesn't fit into the previous categories. + -- TSRepeat { } , -- Keywords related to loops: `for`, `while`, etc. + -- TSString { } , -- String literals. + -- TSStringRegex { } , -- Regular expression literals. + -- TSStringEscape { } , -- Escape characters within a string: `\n`, `\t`, etc. + -- TSStringSpecial { } , -- Strings with special meaning that don't fit into the previous categories. + -- TSSymbol { } , -- Identifiers referring to symbols or atoms. + -- TSTag { } , -- Tags like HTML tag names. + -- TSTagAttribute { } , -- HTML tag attributes. + -- TSTagDelimiter { } , -- Tag delimiters like `<` `>` `/`. + -- TSText { } , -- Non-structured text. Like text in a markup language. + -- TSStrong { } , -- Text to be represented in bold. + -- TSEmphasis { } , -- Text to be represented with emphasis. + -- TSUnderline { } , -- Text to be represented with an underline. + -- TSStrike { } , -- Strikethrough text. + -- TSTitle { } , -- Text that is part of a title. + -- TSLiteral { } , -- Literal or verbatim text. + -- TSURI { } , -- URIs like hyperlinks or email addresses. + -- TSMath { } , -- Math environments like LaTeX's `$ ... $` + -- TSTextReference { } , -- Footnotes, text references, citations, etc. + -- TSEnvironment { } , -- Text environments of markup languages. + -- TSEnvironmentName { } , -- Text/string indicating the type of text environment. Like the name of a `\begin` block in LaTeX. + -- TSNote { } , -- Text representation of an informational note. + -- TSWarning { } , -- Text representation of a warning note. + -- TSDanger { } , -- Text representation of a danger note. + -- TSType { } , -- Type (and class) definitions and annotations. + -- TSTypeBuiltin { } , -- Built-in types: `i32` in Rust. + -- TSVariable { } , -- Variable names that don't fit into other categories. + -- TSVariableBuiltin { } , -- Variable names defined by the language: `this` or `self` in Javascript. } end)