Tweak highlighting; bump to 0.0.2

Signed-off-by: egibs <[email protected]>

Author: egibs

example.png

@@ -17,12 +17,12 @@ private rule test2: tag2 tag3 tag4 tag5 {
     filesize > 1MB and all of them
 }
 
-private rule test3: tag4 tag5 {
+rule test3: tag4 tag5 {
   strings:
     $hello = "hello world"
     $test = "test"
     $ = "test2"
     $ = "test3"
   condition:
-    filesize > 2MB and any of them
+    filesize > 2MB and any of them and none of ($h*) and none of ($t*)
 }

example.yara

@@ -1,11 +1,11 @@
 id = "yara"
 name = "Yara"
-version = "0.0.1"
+version = "0.0.2"
 schema_version = 1
 authors = ["egibs <[email protected]>"]
 description = "Yara syntax highlighting for Zed."
 repository = "https://github.com/egibs/yara-zed"
 
 [grammars.yara]
 repository = "https://github.com/egibs/tree-sitter-yara.git"
-commit = "a8058d3fcffa5d61aa66185c976e9f6efbea2a8d"
+commit = "eb3ede203275c38000177f72ec0f9965312806ef"

extension.toml

@@ -1,20 +1,25 @@
+; Comments
+(comment) @comment
+
 ; Keywords
 [
-  "rule"
   "global"
-  "private"
   "import"
-  "include"
+  "private"
+] @constant.builtin
+
+[
+  "rule"
+] @function
+
+[
+  "meta"
   "strings"
   "condition"
-  "meta"
-] @keyword
+] @property
 
-; Keywords (condition)
+; Operators
 [
-  "and"
-  "or"
-  "not"
   "matches"
   "contains"
   "icontains"
@@ -23,79 +28,110 @@
   "istartswith"
   "endswith"
   "iendswith"
-  "for"
+  "and"
+  "or"
+  "not"
+  "=="
+  "!="
+  "<"
+  ">"
+  ">="
+  "<="
   "of"
-  "in"
+  "for"
   "all"
   "any"
   "none"
-  "them"
-  "filesize"
-  "entrypoint"
-] @keyword.operator
+  "in"
+] @string.special
 
 ; String modifiers
 [
-  "ascii"
   "wide"
+  "ascii"
   "nocase"
   "fullword"
   "xor"
   "base64"
   "base64wide"
 ] @keyword.modifier
 
-; Rule names
-(rule_definition
-  name: (identifier) @module)
-
-; Tags
-((tag) @tag)
-
-; Meta definitions
-(meta_definition
-  key: (identifier) @property)
-
-; String identifiers
-(string_identifier
-  (identifier)? @string.special)
-
-; Constants
-(boolean_literal) @constant.builtin
-
+; Numbers and sizes
 (integer_literal) @constant.numeric
 (size_unit) @constant.numeric
 
 ; Strings
 (double_quoted_string) @string
 (single_quoted_string) @string
 (escape_sequence) @string.escape
+(text_string) @text.literal
 
 ; Hex strings
 (hex_string) @string.special
 (hex_byte) @constant.numeric
 (hex_wildcard) @constant.builtin
+(hex_jump) @constant.numeric
 
-; Regex strings
+; Regular expressions
 (regex_string) @string.regexp
 (pattern) @string.regexp
 
-; Operators
+; Boolean literals
 [
-  ">"
-  "<"
-  "=="
-  "<="
-  ">="
-  "!="
-  "+"
-  "-"
+  "true"
+  "false"
+] @constant.boolean
+
+; Keywords and special identifiers
+[
+  "them"
+  "all"
+  "any"
+  "none"
+] @keyword.operator
+
+
+; String identifiers
+"$" @string.special.symbol
+(identifier) @string
+(string_identifier) @string.special.symbol
+
+; Built-ins
+[
+  (filesize_keyword)
+  (entrypoint_keyword)
+] @constant.builtin
+
+; Tags
+(tag_list
+  [(identifier) (tag)] @tag)
+
+; Punctuation and delimiters
+[
+  "="
+  ":"
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+  "#"
+  "@"
+  ".."
+  "|"
+  ","
+  "!"
+  "/"
+  "\""
+  "'"
   "*"
-  "\\"
-  "%"
-] @operator
+] @string.special.symbol
 
-[":" "=" "{" "}" "(" ")" "[" "]" "$" "#" "@" "!" ".." "|" ","] @punctuation.delimiter
+; Rule names
+(rule_definition
+  name: (identifier) @string.special)
 
-; Comments
-(comment) @comment
+; Meta definitions
+(meta_definition
+  key: (identifier) @string.special)