From bde7441ddaf0aa478687dd6bbf2dfda4e3034b1d Mon Sep 17 00:00:00 2001 From: aktersnurra Date: Sun, 16 Oct 2022 23:50:22 +0200 Subject: Fix treesitter dropping TS group support (#8) * Rename treesitter hl groups * Update highlight color * Update lsp icons * Update icon colors * Revert "Update icon colors" This reverts commit 3046987e0459695576ae8520b37b9db8029d15eb. * Revert "Update lsp icons" This reverts commit 03968e6a0b4dda08043cc442f2bb8705921eac34. * Update diagnostics signs colors --- lua/no-clown-fiesta/highlight-group/lsp.lua | 5 +- lua/no-clown-fiesta/highlight-group/treesitter.lua | 104 ++++++++++----------- lua/no-clown-fiesta/highlights.lua | 6 +- 3 files changed, 58 insertions(+), 57 deletions(-) diff --git a/lua/no-clown-fiesta/highlight-group/lsp.lua b/lua/no-clown-fiesta/highlight-group/lsp.lua index 4f190a2..daf87f9 100644 --- a/lua/no-clown-fiesta/highlight-group/lsp.lua +++ b/lua/no-clown-fiesta/highlight-group/lsp.lua @@ -19,9 +19,10 @@ function M.highlight(palette) LspDiagnosticsFloatingHint = { fg = palette.hint_blue }, DiagnosticSignError = { fg = palette.error_red }, DiagnosticSignWarning = { fg = palette.warning_orange }, + DiagnosticSignWarn = { fg = palette.gray }, DiagnosticSignInformation = { fg = palette.info_yellow }, - DiagnosticSignInfo = { fg = palette.info_yellow }, - DiagnosticSignHint = { fg = palette.hint_blue }, + DiagnosticSignInfo = { fg = palette.gray }, + DiagnosticSignHint = { fg = palette.gray }, LspDiagnosticsSignError = { fg = palette.error_red }, LspDiagnosticsSignWarning = { fg = palette.warning_orange }, LspDiagnosticsSignInformation = { fg = palette.info_yellow }, diff --git a/lua/no-clown-fiesta/highlight-group/treesitter.lua b/lua/no-clown-fiesta/highlight-group/treesitter.lua index 665ac8a..0d3d1da 100644 --- a/lua/no-clown-fiesta/highlight-group/treesitter.lua +++ b/lua/no-clown-fiesta/highlight-group/treesitter.lua @@ -2,58 +2,58 @@ local M = {} function M.highlight(palette, opts) return { - TSComment = { fg = palette.medium_gray, style = opts.comments }, - TSAnnotation = { fg = palette.white }, - TSAttribute = { fg = palette.white }, - TSConstructor = { fg = palette.white }, - TSType = { fg = palette.white, style = opts.type }, - TSTypeBuiltin = { fg = palette.white }, - TSConditional = { fg = palette.gray_blue }, - TSException = { fg = palette.red }, - TSInclude = { fg = palette.red }, - TSKeyword = { fg = palette.gray_blue, style = opts.keywords }, - TSKeywordFunction = { fg = palette.gray_blue, style = opts.keywords }, - TSLabel = { fg = palette.white }, - TSNamespace = { fg = palette.white }, - TSRepeat = { fg = palette.gray_blue }, - TSConstant = { fg = palette.white }, - TSConstBuiltin = { fg = palette.red }, - TSFloat = { fg = palette.red }, - TSNumber = { fg = palette.red }, - TSBoolean = { fg = palette.red }, - TSCharacter = { fg = palette.light_green }, - TSError = { fg = palette.error_red }, - TSFunction = { fg = palette.cyan, style = opts.functions }, - TSFuncBuiltin = { fg = palette.cyan }, - TSMethod = { fg = palette.cyan }, - TSConstMacro = { fg = palette.cyan }, - TSFuncMacro = { fg = palette.cyan }, - TSVariable = { fg = palette.white, style = opts.variables }, - TSVariableBuiltin = { fg = palette.white }, - TSProperty = { fg = palette.white }, - TSOperator = { fg = palette.white }, - TSField = { fg = palette.white }, - TSParameter = { fg = palette.white }, - TSParameterReference = { fg = palette.white }, - TSSymbol = { fg = palette.medium_gray }, - TSText = { fg = palette.fg }, - TSPunctDelimiter = { fg = palette.white }, - TSTagDelimiter = { fg = palette.white }, - TSPunctBracket = { fg = palette.white }, - TSPunctSpecial = { fg = palette.medium_gray }, - TSString = { fg = palette.medium_gray_blue }, - TSStringRegex = { fg = palette.medium_gray_blue }, - TSStringEscape = { fg = palette.medium_gray_blue }, - TSTag = { fg = palette.pale_purple }, - TSEmphasis = { style = "italic" }, - TSUnderline = { style = "underline" }, - TSTitle = { fg = palette.medium_gray }, - TSLiteral = { fg = palette.medium_gray }, - TSURI = { fg = palette.cyan, style = "underline" }, - TSKeywordOperator = { fg = palette.gray_blue }, - TSStructure = { fg = palette.purple_test }, - TSStrong = { fg = palette.medium_gray }, - TSQueryLinterError = { fg = palette.warning_orange }, + Comment = { fg = palette.medium_gray, style = opts.comments }, + Annotation = { fg = palette.white }, + Attribute = { fg = palette.white }, + Constructor = { fg = palette.white }, + Type = { fg = palette.white, style = opts.type }, + TypeBuiltin = { fg = palette.white }, + Conditional = { fg = palette.gray_blue }, + Exception = { fg = palette.red }, + Include = { fg = palette.red }, + Keyword = { fg = palette.gray_blue, style = opts.keywords }, + KeywordFunction = { fg = palette.gray_blue, style = opts.keywords }, + Label = { fg = palette.white }, + Namespace = { fg = palette.white }, + Repeat = { fg = palette.gray_blue }, + Constant = { fg = palette.white }, + ConstBuiltin = { fg = palette.red }, + Float = { fg = palette.red }, + Number = { fg = palette.red }, + Boolean = { fg = palette.red }, + Character = { fg = palette.light_green }, + Error = { fg = palette.error_red }, + Function = { fg = palette.cyan, style = opts.functions }, + FuncBuiltin = { fg = palette.cyan }, + Method = { fg = palette.cyan }, + ConstMacro = { fg = palette.cyan }, + FuncMacro = { fg = palette.cyan }, + Variable = { fg = palette.white, style = opts.variables }, + VariableBuiltin = { fg = palette.white }, + Property = { fg = palette.white }, + Operator = { fg = palette.white }, + Field = { fg = palette.white }, + Parameter = { fg = palette.white }, + ParameterReference = { fg = palette.white }, + Symbol = { fg = palette.medium_gray }, + Text = { fg = palette.fg }, + PunctDelimiter = { fg = palette.white }, + TagDelimiter = { fg = palette.white }, + PunctBracket = { fg = palette.white }, + PunctSpecial = { fg = palette.medium_gray }, + String = { fg = palette.medium_gray_blue }, + StringRegex = { fg = palette.medium_gray_blue }, + StringEscape = { fg = palette.medium_gray_blue }, + Tag = { fg = palette.pale_purple }, + Emphasis = { style = "italic" }, + Underline = { style = "underline" }, + Title = { fg = palette.medium_gray }, + Literal = { fg = palette.medium_gray }, + URI = { fg = palette.cyan, style = "underline" }, + KeywordOperator = { fg = palette.gray_blue }, + Structure = { fg = palette.purple_test }, + Strong = { fg = palette.medium_gray }, + QueryLinterError = { fg = palette.warning_orange }, } end diff --git a/lua/no-clown-fiesta/highlights.lua b/lua/no-clown-fiesta/highlights.lua index f435511..5ebbc45 100644 --- a/lua/no-clown-fiesta/highlights.lua +++ b/lua/no-clown-fiesta/highlights.lua @@ -68,9 +68,9 @@ function M.highlight(palette, opts) Boolean = { fg = palette.red }, Float = { fg = palette.red }, Identifier = { fg = palette.white }, - Function = { fg = palette.gray_blue, style = opts.functions }, + Function = { fg = palette.cyan, style = opts.functions }, Operator = { fg = palette.white }, - Type = { fg = palette.white }, + Type = { fg = palette.white, style = opts.type }, StorageClass = { fg = palette.gray_blue }, Structure = { fg = palette.gray_blue }, Typedef = { fg = palette.white }, @@ -89,7 +89,7 @@ function M.highlight(palette, opts) SpecialChar = { fg = palette.medium_gray_blue }, Tag = { fg = palette.pale_purple }, Debug = { fg = palette.red }, - Delimiter = { fg = palette.gray }, + Delimiter = { fg = palette.white }, SpecialComment = { fg = palette.medium_gray, style = opts.comments }, Underlined = { style = "underline" }, Bold = { style = "bold" }, -- cgit v1.2.3-70-g09d2