From 098b6b6eedf6da8e760b334d61acef56be8d258b Mon Sep 17 00:00:00 2001 From: oberblastmeister <61095988+oberblastmeister@users.noreply.github.com> Date: Wed, 18 Aug 2021 12:02:15 -0400 Subject: [PATCH] gruvbox theme changes (#594) * changed some gruvbox highlights * more stuff including cursors * use property instead * use variable.property --- runtime/queries/rust/highlights.scm | 9 +++-- runtime/themes/gruvbox.toml | 61 +++++++++++++++-------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/runtime/queries/rust/highlights.scm b/runtime/queries/rust/highlights.scm index 5e469e67..6b14d74d 100644 --- a/runtime/queries/rust/highlights.scm +++ b/runtime/queries/rust/highlights.scm @@ -41,8 +41,9 @@ (field_initializer (field_identifier) @property) -(shorthand_field_initializer) @variable -(shorthand_field_identifier) @variable +(shorthand_field_initializer + (identifier) @variable.property) +(shorthand_field_identifier) @variable.property (lifetime "'" @label @@ -65,6 +66,8 @@ ")" "[" "]" + "{" + "}" ] @punctuation.bracket (type_arguments [ @@ -333,4 +336,4 @@ (type_identifier) @type (identifier) @variable -(field_identifier) @variable +(field_identifier) @property diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index b606568d..0a6eec07 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -1,53 +1,54 @@ # Author : Jakub Bartodziej # The theme uses the gruvbox dark palette with standard contrast: github.com/morhetz/gruvbox -"attribute" = "fg2" +"attribute" = "aqua1" "keyword" = { fg = "red1" } "keyword.directive" = "red0" -"namespace" = "yellow0" -"punctuation" = "fg4" -"punctuation.delimiter" = "fg4" -"operator" = "orange0" +"namespace" = "aqua1" +"punctuation" = "orange1" +"punctuation.delimiter" = "orange1" +"operator" = "purple1" "special" = "purple0" -"property" = "fg2" -"variable" = "fg2" -"variable.builtin" = "fg3" +"property" = "blue1" +"variable.property" = "blue1" +"variable" = "fg1" +"variable.builtin" = "orange1" "variable.parameter" = "fg2" -"type" = "orange1" -"type.builtin" = "orange0" -"constructor" = "fg2" -"function" = "green0" +"type" = "yellow1" +"type.builtin" = "yellow1" +"constructor" = { fg = "purple1", modifiers = ["bold"] } +"function" = { fg = "green1", modifiers = ["bold"] } "function.macro" = "aqua1" "function.builtin" = "yellow1" -"comment" = "gray1" -"constant" = { fg = "fg2", modifiers = ["bold"] } -"constant.builtin" = { fg = "fg1", modifiers = ["bold"] } +"comment" = { fg = "gray1", modifiers = ["italic"] } +"constant" = { fg = "purple1" } +"constant.builtin" = { fg = "purple1", modifiers = ["bold"] } "string" = "green1" "number" = "purple1" "escape" = { fg = "fg2", modifiers = ["bold"] } "label" = "aqua1" -"module" = "yellow1" +"module" = "aqua1" -"warning" = "orange0" -"error" = "red0" -"info" = "purple0" -"hint" = "blue0" +"warning" = { fg = "orange1", bg = "bg1" } +"error" = { fg = "red1", bg = "bg1" } +"info" = { fg = "aqua1", bg = "bg1" } +"hint" = { fg = "blue1", bg = "bg1" } "ui.background" = { bg = "bg0" } -"ui.linenr" = { fg = "fg3" } -"ui.linenr.selected" = { fg = "fg1", modifiers = ["bold"] } -"ui.statusline" = { fg = "fg2", bg = "bg2" } -"ui.statusline.inactive" = { fg = "fg3", bg = "bg4" } +"ui.linenr" = { fg = "bg4" } +"ui.linenr.selected" = { fg = "yellow1" } +"ui.statusline" = { fg = "fg1", bg = "bg2" } +"ui.statusline.inactive" = { fg = "fg4", bg = "bg1" } "ui.popup" = { bg = "bg1" } "ui.window" = { bg = "bg1" } "ui.help" = { bg = "bg1", fg = "fg1" } "ui.text" = { fg = "fg1" } -"ui.text.focus" = { fg = "fg1", modifiers = ["bold"] } -"ui.selection" = { bg = "bg3" } -"ui.cursor.primary" = { bg = "bg3" } -"ui.cursor.match" = { bg = "bg4" } -"ui.menu" = { fg = "fg1" } -"ui.menu.selected" = { fg = "fg3", bg = "bg3" } +"ui.text.focus" = { fg = "fg1" } +"ui.selection" = { bg = "bg3", modifiers = ["reversed"] } +"ui.cursor.primary" = { modifiers = ["reversed"] } +"ui.cursor.match" = { modifiers = ["reversed"] } +"ui.menu" = { fg = "fg1", bg = "bg2" } +"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] } "diagnostic" = { modifiers = ["underlined"] }