[feat] Implement basic highlighting

.gitignore

@@ -13,8 +13,11 @@ node_modules
 # Grammar description file
 !grammar.js
 
+# Track the queries directory
+!queries/**
+
 # Track packaging files
-!package*.json
+!package.json
 !Cargo.toml
 
 # Track the project readme and software license

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Adam Henley
+Copyright (c) 2023 Adam Henley <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -29,4 +29,8 @@ This is a from-scratch implementation of a tree-sitter parser for the Liquid tem
 
 ## Support
 
-If you've found this useful, please star the repository and consider sponsoring me, for any amount, to help support the open source ecosystem.
+If you've found this useful, please consider:  
+    🌟 starring the repo  
+    💲 [sponsoring](https://github.com/sponsors/adamazing) me  
+    ⚧️  supporting [OutLine](https://outline.org.nz/donate)  
+    ✍️ following me on [Medium](https://medium.com/@adamhenley)

grammar.js

@@ -1,6 +1,8 @@
 module.exports = grammar({
   name: 'liquid',
 
+  word: $ => $.identifier,
+
   rules: {
     template: $ => repeat(
       choice(
@@ -21,8 +23,18 @@ module.exports = grammar({
       choice("}}", "-}}")
     ),
 
+    comment: $ => token(choice(
+      seq("{%", /\s#/, /[^%-]+/,),
+    )),
+
     code: $ => repeat1(
-      choice(/[^%}-]+|[%}-]/)
+      choice(
+        $._expression
+      )
+    ),
+
+    control_code: $ => choice(
+      ""
     ),
 
     _literal: $ => choice($.string, $.number, $.boolean),
@@ -33,30 +45,62 @@ module.exports = grammar({
     ),
 
     number: $ => choice(
-      /\d+/, // TODO: Check if this is correct
+      /-?\d*\.?\d+/,
     ),
 
     boolean: $ => choice('true', 'false'),
 
     _expression: $ => choice(
       $.identifier,
-      $._literal,
+      $.include_expression,
+      $.render_expression,
+      $.selector_expression,
       $.binary_expression,
+      $._literal
       //TODO: add more expression types
     ),
 
+    selector_expression: $ => choice(
+      prec(1, seq(
+        field('operand', $.identifier),
+        repeat1(
+          seq(
+            '.',
+            field('field', $.identifier)
+          )
+        )
+      )
+    )),
+
     identifier: $ => /[a-zA-Z_][a-zA-Z0-9]+/,
 
+    binary_operator: $ => choice(
+      "==",
+      "!=",
+      ">",
+      "<",
+      ">=",
+      "<=",
+      "or",
+      "and",
+    ),
+
+    // special case binary operator
+    contains_operator: $ => "contains",
+
+    include_expression: $ => seq(
+      field('include', "include"),
+      field('included_file',$.string)
+    ),
+
+    render_expression: $ => seq(
+      field('render', "render"),
+      field('rendered_file', $.string)
+    ),
+
     binary_expression: $ => choice(
-      seq($._expression, "==", $._expression),
-      seq($._expression, "!=", $._expression),
-      seq($._expression, ">", $._expression),
-      seq($._expression, "<", $._expression),
-      seq($._expression, ">=", $._expression),
-      seq($._expression, "<=", $._expression),
-      seq($._expression, "or", $._expression),
-      seq($._expression, "and", $._expression),
-      seq($._expression, "contains", $.string)
+      prec.right(1,seq($._expression, $.binary_operator, $._expression)),
+      prec.right(1,seq($._expression, $.contains_operator, $.string))
     )
   }
 });

package.json

@@ -17,5 +17,13 @@
   },
   "devDependencies": {
     "tree-sitter-cli": "^0.20.8"
-  }
+  },
+  "tree-sitter": [
+    {
+      "scope": "text.html.liquid",
+      "file-types": [
+        "liquid"
+      ]
+    }
+  ]
 }

queries/highlights.scm

@@ -0,0 +1,6 @@
+(output_directive) @keyword
+(directive) @keyword
+(code) @comment.line
+(string) @string
+(number) @constant.numeric
+(boolean) @constant.language