Updated tree-sitter query scopes (#896)

* updated theme scopes

variable.property -> variable.field
property -> variable.field

* updated theme scopes

* update book and themes

updated book and themes to reflect scope changes

* wip

* update more queries

* update dark_plus.toml

book/src/themes.md

@@ -103,8 +103,6 @@ We use a similar set of scopes as
 [SublimeText](https://www.sublimetext.com/docs/scope_naming.html). See also
 [TextMate](https://macromates.com/manual/en/language_grammars) scopes.
 
-- `escape` (TODO: rename to (constant).character.escape)
-
 - `type` - Types
   - `builtin` - Primitive types provided by the language (`int`, `usize`)
 
@@ -112,8 +110,11 @@ We use a similar set of scopes as
   - `builtin` Special constants provided by the language (`true`, `false`, `nil` etc)
     - `boolean`
   - `character`
+    - `escape`
+  - `numeric` (numbers)
+    - `integer`
+    - `float`
 
-- `number` (TODO: rename to constant.number/.numeric.{integer, float, complex})
 - `string` (TODO: string.quoted.{single, double}, string.raw/.unquoted)?
   - `regexp` - Regular expressions
   - `special`
@@ -129,7 +130,8 @@ We use a similar set of scopes as
 - `variable` - Variables
   - `builtin` - Reserved language variables (`self`, `this`, `super`, etc)
   - `parameter` - Function parameters
-  - `property`
+  - `other`
+    - `member` - Fields of composite data types (e.g. structs, unions)
   - `function` (TODO: ?)
 
 - `label`

helix-core/src/lib.rs

@@ -35,6 +35,7 @@ pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
     line.chars().position(|ch| !ch.is_whitespace())
 }
 
+/// Find `.git` root.
 pub fn find_root(root: Option<&str>) -> Option<std::path::PathBuf> {
     let current_dir = std::env::current_dir().expect("unable to determine current directory");
 

runtime/queries/bash/highlights.scm

@@ -7,7 +7,7 @@
 
 (command_name) @function
 
-(variable_name) @property
+(variable_name) @variable.other.member
 
 [
   "case"
@@ -31,7 +31,7 @@
 
 (function_definition name: (word) @function)
 
-(file_descriptor) @number
+(file_descriptor) @constant.numeric.integer
 
 [
   (command_substitution)

runtime/queries/c-sharp/highlights.scm

@@ -20,16 +20,16 @@
 ] @type.builtin
 
 ;; Enum
-(enum_member_declaration (identifier) @variable.property)
+(enum_member_declaration (identifier) @variable.other.member)
 
 ;; Literals
 [
   (real_literal)
   (integer_literal)
-] @number
+] @constant.numeric.integer
 
+(character_literal) @constant.character
 [
-  (character_literal)
   (string_literal)
   (verbatim_string_literal)
   (interpolated_string_text)
@@ -40,8 +40,8 @@
   "$@\""
  ] @string
 
+(boolean_literal) @constant.builtin.boolean
 [
-  (boolean_literal)
   (null_literal)
   (void_keyword)
 ] @constant.builtin
@@ -98,7 +98,7 @@
 ;; Keywords
 (modifier) @keyword
 (this_expression) @keyword
-(escape_sequence) @keyword
+(escape_sequence) @constant.character.escape
 
 [
   "as"

runtime/queries/c/highlights.scm

@@ -60,8 +60,8 @@
 (system_lib_string) @string
 
 (null) @constant
-(number_literal) @number
+(number_literal) @constant.numeric.integer
-(char_literal) @string
+(char_literal) @constant.character
 
 (call_expression
   function: (identifier) @function)
@@ -73,7 +73,7 @@
 (preproc_function_def
   name: (identifier) @function.special)
 
-(field_identifier) @property
+(field_identifier) @variable.other.member
 (statement_identifier) @label
 (type_identifier) @type
 (primitive_type) @type

runtime/queries/css/highlights.scm

@@ -26,11 +26,11 @@
 (pseudo_element_selector (tag_name) @attribute)
 (pseudo_class_selector (class_name) @attribute)
 
-(class_name) @property
+(class_name) @variable.other.member
-(id_name) @property
+(id_name) @variable.other.member
-(namespace_name) @property
+(namespace_name) @variable.other.member
-(property_name) @property
+(property_name) @variable.other.member
-(feature_name) @property
+(feature_name) @variable.other.member
 
 (attribute_name) @attribute
 
@@ -55,8 +55,8 @@
 (string_value) @string
 (color_value) @string.special
 
-(integer_value) @number
+(integer_value) @constant.numeric.integer
-(float_value) @number
+(float_value) @constant.numeric.float
 (unit) @type
 
 "#" @punctuation.delimiter

runtime/queries/elixir/highlights.scm

@@ -39,13 +39,13 @@
 
 ; * module attribute
 (unary_operator
-  operator: "@" @variable.property
+  operator: "@" @variable.other.member
   operand: [
-    (identifier) @variable.property
+    (identifier) @variable.other.member
     (call
-      target: (identifier) @variable.property)
+      target: (identifier) @variable.other.member)
-    (boolean) @variable.property
+    (boolean) @variable.other.member
-    (nil) @variable.property
+    (nil) @variable.other.member
   ])
 
 ; * capture operator
@@ -79,11 +79,8 @@
 (nil) @constant.builtin
 
 (boolean) @constant.builtin.boolean
-
+(integer) @constant.numeric.integer
-[
+(float) @constant.numeric.float
-  (integer)
-  (float)
-] @number
 
 (alias) @type
 
@@ -97,7 +94,7 @@
 
 (interpolation "#{" @punctuation.special "}" @punctuation.special) @embedded
 
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
 
 [
   (atom)

runtime/queries/go/highlights.scm

@@ -25,7 +25,7 @@
 (variadic_parameter_declaration (identifier) @variable.parameter)
 
 (type_identifier) @type
-(field_identifier) @property
+(field_identifier) @variable.other.member
 (identifier) @variable
 (package_identifier) @variable
 
@@ -130,13 +130,13 @@
   (rune_literal)
 ] @string
 
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
 
 [
   (int_literal)
   (float_literal)
   (imaginary_literal)
-] @number
+] @constant.numeric.integer
 
 [
   (true)

runtime/queries/haskell/highlights.scm

@@ -13,9 +13,9 @@
 (constraint class: (class_name (type)) @class)
 (class (class_head class: (class_name (type)) @class))
 (instance (instance_head class: (class_name (type)) @class))
-(integer) @number
+(integer) @constant.numeric.integer
-(exp_literal (float)) @number
+(exp_literal (float)) @constant.numeric.float
-(char) @literal
+(char) @constant.character
 (con_unit) @literal
 (con_list) @literal
 (tycon_arrow) @operator

runtime/queries/java/highlights.scm

@@ -59,14 +59,15 @@
   (hex_integer_literal)
   (decimal_integer_literal)
   (octal_integer_literal)
-  (decimal_floating_point_literal)
+] @constant.numeric.integer
-  (hex_floating_point_literal)
-] @number
 
 [
-  (character_literal)
+  (decimal_floating_point_literal)
-  (string_literal)
+  (hex_floating_point_literal)
-] @string
+] @constant.numeric.float
+
+(character_literal) @constant.character
+(string_literal) @string
 
 [
   (true)

runtime/queries/javascript/highlights.scm

@@ -65,7 +65,7 @@
 ; Properties
 ;-----------
 
-(property_identifier) @property
+(property_identifier) @variable.other.member
 
 ; Literals
 ;---------
@@ -88,7 +88,7 @@
 ] @string
 
 (regex) @string.regexp
-(number) @number
+(number) @constant.numeric.integer
 
 ; Tokens
 ;-------

runtime/queries/json/highlights.scm

@@ -1,9 +1,20 @@
+[
+  (true)
+  (false)
+] @constant.builtin.boolean
+(null) @constant.builtin
+(number) @constant.numeric
 (pair
   key: (_) @keyword)
 
 (string) @string
+(escape_sequence) @constant.character.escape
+(ERROR) @error
 
-(object
+"," @punctuation.delimiter
-  "{" @escape
+[
-  (_)
+  "["
-  "}" @escape)
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket

runtime/queries/julia/highlights.scm

@@ -15,7 +15,7 @@
 
 (field_expression
   (identifier)
-  (identifier) @field .)
+  (identifier) @variable.other.member .)
 
 (function_definition
   name: (identifier) @function)
@@ -80,14 +80,14 @@
 (struct_definition
   name: (identifier) @type)
 
-(number) @number
+(number) @constant.numeric.integer
 (range_expression
-    (identifier) @number
+    (identifier) @constant.numeric.integer
-      (eq? @number "end"))
+      (eq? @constant.numeric.integer "end"))
 (range_expression
   (_
-    (identifier) @number
+    (identifier) @constant.numeric.integer
-      (eq? @number "end")))
+      (eq? @constant.numeric.integer "end")))
 (coefficient_expression
   (number)
   (identifier) @constant.builtin)

runtime/queries/ledger/highlights.scm

@@ -7,9 +7,9 @@
     (date)
     (interval)
     (quantity)
-] @number
+] @constant.numeric.integer
 
-((account) @field)
+((account) @variable.other.member)
 ((commodity) @text.literal)
 
 "include" @include

runtime/queries/lua/highlights.scm

@@ -150,14 +150,14 @@
 (table ["{" "}"] @constructor)
 (comment) @comment
 (string) @string
-(number) @number
+(number) @constant.numeric.integer
 (label_statement) @label
 ; A bit of a tricky one, this will only match field names
-(field . (identifier) @property (_))
+(field . (identifier) @variable.other.member (_))
 (shebang) @comment
 
 ;; Property
-(property_identifier) @property
+(property_identifier) @variable.other.member
 
 ;; Variable
 (identifier) @variable

runtime/queries/nix/highlights.scm

@@ -33,16 +33,14 @@
 
 (uri) @string.special.uri
 
-[
+(integer) @constant.numeric.integer
-  (integer)
+(float) @constant.numeric.float
-  (float)
-] @number
 
 (interpolation
   "${" @punctuation.special
   "}" @punctuation.special) @embedded
 
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
 
 (function
   universal: (identifier) @variable.parameter
@@ -66,8 +64,8 @@
 (binary
   operator: _ @operator)
 
-(attr_identifier) @property
+(attr_identifier) @variable.other.member
-(inherit attrs: (attrs_inherited (identifier) @property) )
+(inherit attrs: (attrs_inherited (identifier) @variable.other.member) )
 
 [
   ";"

runtime/queries/ocaml/highlights.scm

@@ -51,14 +51,14 @@
 ; Properties
 ;-----------
 
-[(label_name) (field_name) (instance_variable_name)] @property
+[(label_name) (field_name) (instance_variable_name)] @variable.other.member
 
 ; Constants
 ;----------
 
 [(boolean) (unit)] @constant
 
-[(number) (signed_number)] @number
+[(number) (signed_number)] @constant.numeric.integer
 
 (character) @constant.character
 
@@ -66,7 +66,7 @@
 
 (quoted_string "{" @string "}" @string) @string
 
-(escape_sequence) @string.escape
+(escape_sequence) @constant.character.escape
 
 [
   (conversion_specification)
@@ -145,7 +145,7 @@
 ; Attributes
 ;-----------
 
-(attribute_id) @property
+(attribute_id) @variable.other.member
 
 ; Comments
 ;---------

runtime/queries/php/highlights.scm

@@ -30,12 +30,12 @@
 ; Member
 
 (property_element
-  (variable_name) @property)
+  (variable_name) @variable.other.member)
 
 (member_access_expression
-  name: (variable_name (name)) @property)
+  name: (variable_name (name)) @variable.other.member)
 (member_access_expression
-  name: (name) @property)
+  name: (name) @variable.other.member)
 
 ; Variables
 
@@ -56,10 +56,10 @@
 
 (string) @string
 (heredoc) @string
-(boolean) @constant.builtin
+(boolean) @constant.builtin.boolean
 (null) @constant.builtin
-(integer) @number
+(integer) @constant.numeric.integer
-(float) @number
+(float) @constant.numeric.float
 (comment) @comment
 
 "$" @operator

runtime/queries/protobuf/highlights.scm

@@ -34,16 +34,14 @@
 [
   (fieldName)
   (optionName)
-] @property
+] @variable.other.member
 (enumVariantName) @type.enum.variant
 
 (fullIdent) @namespace
 
-[
+(intLit) @constant.numeric.integer
-  (intLit)
+(floatLit) @constant.numeric.float
-  (floatLit)
+(boolLit) @constant.builtin.boolean
-] @number
-(boolLit) @constant.builtin
 (strLit) @string
 
 (constant) @constant

runtime/queries/python/highlights.scm

@@ -29,7 +29,7 @@
   name: (identifier) @function)
 
 (identifier) @variable
-(attribute attribute: (identifier) @property)
+(attribute attribute: (identifier) @variable.other.member)
 (type (identifier) @type)
 
 ; Literals
@@ -40,14 +40,11 @@
   (false)
 ] @constant.builtin
 
-[
+(integer) @constant.numeric.integer
-  (integer)
+(float) @constant.numeric.float
-  (float)
-] @number
-
 (comment) @comment
 (string) @string
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
 
 (interpolation
   "{" @punctuation.special

runtime/queries/ruby/highlights.scm

@@ -55,7 +55,7 @@
 [
   (class_variable)
   (instance_variable)
-] @property
+] @variable.other.member
 
 ((identifier) @constant.builtin
  (#match? @constant.builtin "^__(FILE|LINE|ENCODING)__$"))
@@ -101,12 +101,12 @@
 ] @string.special.symbol
 
 (regex) @string.regexp
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
 
 [
   (integer)
   (float)
-] @number
+] @constant.numeric.integer
 
 [
   (nil)

runtime/queries/rust/highlights.scm

@@ -15,15 +15,13 @@
 ; Primitives
 ; ---
 
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
 (primitive_type) @type.builtin
 (boolean_literal) @constant.builtin.boolean
+(integer_literal) @constant.numeric.integer
+(float_literal) @constant.numeric.float
+(char_literal) @constant.character
 [
-  (integer_literal)
-  (float_literal)
-] @number
-[
-  (char_literal)
   (string_literal)
   (raw_string_literal)
 ] @string
@@ -40,10 +38,10 @@
 (enum_variant (identifier) @type.enum.variant)
 
 (field_initializer
-  (field_identifier) @property)
+  (field_identifier) @variable.other.member)
 (shorthand_field_initializer
-  (identifier) @variable.property)
+  (identifier) @variable.other.member)
-(shorthand_field_identifier) @variable.property
+(shorthand_field_identifier) @variable.other.member
 
 (lifetime
   "'" @label
@@ -81,9 +79,24 @@
   ] @punctuation.bracket)
 
 ; ---
-; Parameters
+; Variables
 ; ---
 
+(let_declaration
+  pattern: [
+    ((identifier) @variable)
+    ((tuple_pattern
+      (identifier) @variable))
+  ])
+  
+; It needs to be anonymous to not conflict with `call_expression` further below. 
+(_
+ value: (field_expression
+  value: (identifier)? @variable
+  field: (field_identifier) @variable.other.member))
+
+(arguments
+  (identifier) @variable.parameter)
 (parameter
 	pattern: (identifier) @variable.parameter)
 (closure_parameters
@@ -336,4 +349,4 @@
 
 (type_identifier) @type
 (identifier) @variable
-(field_identifier) @property
+(field_identifier) @variable.other.member

runtime/queries/svelte/highlights.scm

@@ -29,7 +29,7 @@
  (#match? @_attr "^(href|src)$"))
 
 (tag_name) @tag
-(attribute_name) @property
+(attribute_name) @variable.other.member
 (erroneous_end_tag_name) @error
 (comment) @comment
 

runtime/queries/toml/highlights.scm

@@ -1,17 +1,17 @@
 ; Properties
 ;-----------
 
-(bare_key) @property
+(bare_key) @variable.other.member
 (quoted_key) @string
 
 ; Literals
 ;---------
 
-(boolean) @constant.builtin
+(boolean) @constant.builtin.boolean
 (comment) @comment
 (string) @string
-(integer) @number
+(integer) @constant.numeric.integer
-(float) @number
+(float) @constant.numeric.float
 (offset_date_time) @string.special
 (local_date_time) @string.special
 (local_date) @string.special

runtime/queries/tsq/highlights.scm

@@ -35,12 +35,12 @@
 
 (comment) @comment
 
-(field_name) @property
+(field_name) @variable.other.member
 
 (capture) @label
 
 (predicate_name) @function
 
-(escape_sequence) @escape
+(escape_sequence) @constant.character.escape
 
 (node_name) @variable

runtime/queries/yaml/highlights.scm

@@ -1,12 +1,12 @@
-(block_mapping_pair key: (_) @property)
+(block_mapping_pair key: (_) @variable.other.member)
-(flow_mapping (_ key: (_) @property))
+(flow_mapping (_ key: (_) @variable.other.member))
 (boolean_scalar) @constant.builtin.boolean
 (null_scalar) @constant.builtin
 (double_quote_scalar) @string
 (single_quote_scalar) @string
-(escape_sequence) @string.escape
+(escape_sequence) @constant.character.escape
-(integer_scalar) @number
+(integer_scalar) @constant.numeric.integer
-(float_scalar) @number
+(float_scalar) @constant.numeric.float
 (comment) @comment
 (anchor_name) @type
 (alias_name) @type

runtime/queries/zig/highlights.scm

@@ -14,7 +14,7 @@ parameter: (IDENTIFIER) @variable.parameter
 [
   field_member: (IDENTIFIER)
   field_access: (IDENTIFIER)
-] @variable.property
+] @variable.other.member
 
 ;; assume TitleCase is a type
 (
@@ -75,9 +75,9 @@ field_constant: (IDENTIFIER) @constant
 ((BUILTINIDENTIFIER) @keyword.control.import
   (#any-of? @keyword.control.import "@import" "@cImport"))
 
-(INTEGER) @number
+(INTEGER) @constant.numeric.integer
 
-(FLOAT) @number
+(FLOAT) @constant.numeric.float
 
 [
   (LINESTRING)
@@ -85,7 +85,7 @@ field_constant: (IDENTIFIER) @constant
 ] @string
 
 (CHAR_LITERAL) @constant.character
-(EscapeSequence) @escape
+(EscapeSequence) @constant.character.escape
 (FormatSequence) @string.special
 
 [

runtime/themes/base16_default_dark.toml

@@ -16,14 +16,14 @@
 "operator" = "base05"
 "ui.text.focus" = { fg = "base05" }
 "variable" = "base08"
-"number" = "base09"
+"constant.numeric" = "base09"
 "constant" = "base09"
 "attributes" = "base09" 
 "type" = "base0A"
 "ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] }
 "strings"  = "base0B"
-"property" = "base0B"
+"variable.other.member" = "base0B"
-"escape" = "base0C"
+"constant.character.escape" = "base0C"
 "function" = "base0D"
 "constructor" = "base0D"
 "special" = "base0D"

runtime/themes/bogster.toml

@@ -8,7 +8,7 @@
 "punctuation.delimiter" = "#dc7759"
 "operator" = { fg = "#dc7759", modifiers = ["bold"] }
 "special" = "#7fdc59"
-"property" = "#c6b8ad"
+"variable.other.member" = "#c6b8ad"
 "variable" = "#c6b8ad"
 "variable.parameter" = "#c6b8ad"
 "type" = "#dc597f"
@@ -22,8 +22,8 @@
 "constant" = "#59dcb7"
 "constant.builtin" = "#59dcb7"
 "string" = "#59dcb7"
-"number" = "#59c0dc"
+"constant.numeric" = "#59c0dc"
-"escape" = { fg = "#7fdc59", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "#7fdc59", modifiers = ["bold"] }
 "label" = "#59c0dc"
 
 "module" = "#d32c5d"

runtime/themes/dark_plus.toml

@@ -7,7 +7,7 @@
 "type.builtin" = { fg = "type" }
 "type.enum.variant" = { fg = "constant" } 
 "constructor" = { fg = "constant" }
-"property" = { fg = "variable" }
+"variable.other.member" = { fg = "variable" }
 
 "keyword" = { fg = "keyword" }
 "keyword.directive" = { fg = "keyword" }
@@ -31,47 +31,64 @@
 "function.macro" = { fg = "keyword" }
 "attribute" = { fg = "fn_declaration" }
 
-"comment" = { fg = "#6A9955" }
+"comment" = { fg = "dark_green" }
 
-"string" = { fg = "#ce9178" }
+"string" = { fg = "orange" }
-"string.regexp" = { fg = "regex" }
+"constant.character" = { fg = "orange" }
-"number" = { fg = "#b5cea8" }
+"string.regexp" = { fg = "gold" }
-"escape" = { fg = "#d7ba7d" }
+"constant.numeric" = { fg = "pale_green" }
+"constant.character.escape" = { fg = "gold" }
 
-"ui.background" = { fg = "#d4d4d4", bg = "#1e1e1e" }
+"ui.background" = { fg = "light_gray", bg = "dark_gray2" }
 
 "ui.window" = { bg = "widget" }
 "ui.popup" = { bg = "widget" }
 "ui.help" = { bg = "widget" }
 "ui.menu.selected" = { bg = "widget" }
 
+# TODO: Alternate bg colour for `ui.cursor.match` and `ui.selection`.
 "ui.cursor" = { fg = "cursor", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] }
 "ui.cursor.match" = { bg = "#3a3d41", modifiers = ["underlined"] }
 
 "ui.selection" = { bg = "#3a3d41" }
-"ui.selection.primary" = { bg = "#264f78" }
+"ui.selection.primary" = { bg = "dark_blue" }
 
-"ui.linenr" = { fg = "#858585" }
+"ui.linenr" = { fg = "dark_gray" }
-"ui.linenr.selected" = { fg = "#c6c6c6" }
+"ui.linenr.selected" = { fg = "light_gray2" }
 
-"ui.statusline" = { fg = "#ffffff", bg = "#007acc" }
+"ui.statusline" = { fg = "white", bg = "blue" }
-"ui.statusline.inactive" = { fg = "#ffffff", bg = "#007acc" }
+"ui.statusline.inactive" = { fg = "white", bg = "blue" }
 
 "ui.text" = { fg = "text", bg = "background" }
-"ui.text.focus" = { fg = "#ffffff" }
+"ui.text.focus" = { fg = "white" }
 
-"warning" = { fg = "#cca700" }
+"warning" = { fg = "gold2" }
-"error" = { fg = "#ff1212" }
+"error" = { fg = "red" }
-"info" = { fg = "#75beff" }
+"info" = { fg = "light_blue" }
-"hint" = { fg = "#eeeeeeb3" }
+"hint" = { fg = "light_gray3" }
 
 diagnostic = { modifiers = ["underlined"] }
 
 [palette]
+white = "#ffffff"
+orange = "#ce9178"
+gold = "#d7ba7d"
+gold2 = "#cca700"
+pale_green = "#b5cea8"
+dark_green = "#6A9955"
+light_gray = "#d4d4d4"
+light_gray2 = "#c6c6c6"
+light_gray3 = "#eeeeee"
+dark_gray = "#858585"
+dark_gray2 = "#1e1e1e"
+blue = "#007acc"
+light_blue = "#75beff"
+dark_blue = "#264f78"
+red = "#ff1212"
+
 type = "#4EC9B0"
 keyword = "#569CD6"
-regex = "#CE9178"
 special = "#C586C0"
 variable = "#9CDCFE"
 fn_declaration = "#DCDCAA"

runtime/themes/everforest_dark.toml

@@ -8,16 +8,16 @@
 # Email: sainnhe@gmail.com
 # License: MIT License
 
-"escape" = "orange"
+"constant.character.escape" = "orange"
 "type" = "yellow"
 "constant" = "purple"
-"number" = "purple"
+"constant.numeric" = "purple"
 "string" = "grey2"
 "comment" = "grey0"
 "variable" = "fg"
 "variable.builtin" = "blue"
 "variable.parameter" = "fg"
-"variable.property" = "fg"
+"variable.other.member" = "fg"
 "label" = "aqua"
 "punctuation" = "grey2"
 "punctuation.delimiter" = "grey2"
@@ -32,7 +32,6 @@
 "attribute" = "aqua"
 "constructor" = "yellow"
 "module" = "blue"
-"property" = "fg"
 "special" = "orange"
 
 "ui.background" = { bg = "bg0" }

runtime/themes/gruvbox.toml

@@ -9,8 +9,7 @@
 "punctuation.delimiter" = "orange1"
 "operator" = "purple1"
 "special" = "purple0"
-"property" = "blue1"
+"variable.other.member" = "blue1"
-"variable.property" = "blue1"
 "variable" = "fg1"
 "variable.builtin" = "orange1"
 "variable.parameter" = "fg2"
@@ -24,8 +23,8 @@
 "constant" = { fg = "purple1" }
 "constant.builtin" = { fg = "purple1", modifiers = ["bold"] }
 "string" = "green1"
-"number" = "purple1"
+"constant.numeric" = "purple1"
-"escape" = { fg = "fg2", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "fg2", modifiers = ["bold"] }
 "label" = "aqua1"
 "module" = "aqua1"
 

runtime/themes/ingrid.toml

@@ -8,7 +8,7 @@
 "punctuation.delimiter" = "#C97270"
 "operator" = { fg = "#D74E50", modifiers = ["bold"] }
 "special" = "#D68482"
-"property" = "#89BEB7"
+"variable.other.member" = "#89BEB7"
 "variable" = "#A6B6CE"
 "variable.parameter" = "#89BEB7"
 "type" = { fg = "#A6B6CE", modifiers = ["bold"] }
@@ -22,8 +22,8 @@
 "constant" = "#D4A520"
 "constant.builtin" = "#D4A520"
 "string" = "#D74E50"
-"number" = "#D74E50"
+"constant.numeric" = "#D74E50"
-"escape" = { fg = "#D74E50", modifiers = ["bold"] }
+"constant.character.escape" = { fg = "#D74E50", modifiers = ["bold"] }
 "label" = "#D68482"
 
 "module" = "#839A53"

runtime/themes/monokai.toml

@@ -7,7 +7,7 @@
 "type.builtin" = { fg = "#66D9EF" }
 "type.enum.variant" = { fg = "text" } 
 "constructor" = { fg = "text" }
-"property" = { fg = "variable" }
+"variable.other.member" = { fg = "variable" }
 
 "keyword" = { fg = "keyword" }
 "keyword.directive" = { fg = "keyword" }
@@ -34,9 +34,10 @@
 "comment" = { fg = "#88846F" }
 
 "string" = { fg = "#e6db74" }
+"constant.character" = { fg = "#e6db74" }
 "string.regexp" = { fg = "regex" }
-"number" = { fg = "#ae81ff" }
+"constant.numeric" = { fg = "#ae81ff" }
-"escape" = { fg = "#ae81ff" }
+"constant.character.escape" = { fg = "#ae81ff" }
 
 "ui.background" = { fg = "text", bg = "background" }
 

runtime/themes/nord.toml

@@ -59,7 +59,7 @@
 # nord9 - operator, tags, units, punctuations
 "punctuation.delimiter" = "nord9"
 "operator" = { fg = "nord9" }
-"property" = "nord9"
+"variable.other.member" = "nord9"
 
 # nord10 - keywords, special
 "keyword" = { fg = "nord10" }
@@ -76,13 +76,13 @@
 
 # nord13 - warnings, escape characters, regex
 "warning" = "nord13"
-"escape" = { fg = "nord13" }
+"constant.character.escape" = { fg = "nord13" }
 
 # nord14 - strings
 "string" = "nord14"
 
 # nord15 - integer, floating point
-"number" = "nord15"
+"constant.numeric" = "nord15"
 
 [palette]
 nord0 = "#2e3440"

runtime/themes/rose_pine.toml

@@ -16,14 +16,14 @@
 "operator" = "rose"
 "ui.text.focus" = { fg = "base05" }
 "variable" = "text"
-"number" = "iris"
+"constant.numeric" = "iris"
 "constant" = "gold"
 "attributes" = "gold" 
 "type" = "foam"
 "ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
 "string"  = "gold"
 "property" = "foam"
-"escape" = "subtle"
+"constant.character.escape" = "subtle"
 "function" = "rose"
 "function.builtin" = "rose"
 "function.method"  = "foam"

theme.toml

@@ -6,7 +6,7 @@ punctuation = "lavender"
 "punctuation.delimiter" = "lavender"
 operator = "lilac"
 special = "honey"
-property = "white"
+variable.other.member = "white"
 variable = "lavender"
 # variable = "almond" # TODO: metavariables only
 # "variable.parameter" = { fg = "lavender", modifiers = ["underlined"] }