Updates for v0.28.0

README.md

@@ -76,6 +76,14 @@ Contributing
 3. Add parser feature tests to the relevant file(s) in `test/corpus/`, or make a new one.
 4. Run `npm run test` and fix any failing tests.
 
+Policies
+--------
+
+Per the conversation in [#55](https://github.com/gleam-lang/tree-sitter-gleam/pull/55), we have decided that from v0.28.0 forward, tree-sitter-gleam will maintain backwards compatibility with the previous two versions; meaning that each release will support three versions:
+- Current
+- Current - 1
+- Current - 2
+
 Style
 -----
 

grammar.js

@@ -4,7 +4,6 @@ module.exports = grammar({
   name: "gleam",
   externals: ($) => [$.quoted_content],
   extras: ($) => [
-    ";",
     NEWLINE,
     /\s/,
     $.module_comment,
@@ -26,6 +25,7 @@ module.exports = grammar({
     [$.case_subjects],
     [$.source_file],
     [$._constant_value, $._case_clause_guard_unit],
+    [$.integer],
   ],
   rules: {
     /* General rules */
@@ -251,7 +251,7 @@ module.exports = grammar({
       seq(field("label", $.label), field("name", $.identifier)),
     _name_param: ($) => field("name", $.identifier),
     _statement_seq: ($) => repeat1($._statement),
-    _statement: ($) => choice($._expression, $.let, $.use),
+    _statement: ($) => choice($._expression, $.let, $.let_assert, $.use),
     _expression: ($) => choice($._expression_unit, $.binary_expression),
     binary_expression: ($) =>
       choice(
@@ -302,11 +302,11 @@ module.exports = grammar({
         $.list,
         alias($._expression_bit_string, $.bit_string),
         $.anonymous_function,
-        $.expression_group,
+        $.block,
         $.case,
-        $.let_assert,
         $.assert,
-        $.negation,
+        $.boolean_negation,
+        $.integer_negation,
         $.record_update,
         $.tuple_access,
         $.field_access,
@@ -363,7 +363,7 @@ module.exports = grammar({
         choice($._discard_param, $._name_param),
         optional($._type_annotation)
       ),
-    expression_group: ($) => seq("{", $._statement_seq, "}"),
+    block: ($) => seq("{", $._statement_seq, "}"),
     case: ($) =>
       seq(
         "case",
@@ -429,7 +429,8 @@ module.exports = grammar({
         field("value", $._expression)
       ),
     assert: ($) => seq("assert", $._assignment),
-    negation: ($) => seq("!", $._expression_unit),
+    boolean_negation: ($) => seq("!", $._expression_unit),
+    integer_negation: ($) => seq("-", $._expression_unit),
     _assignment: ($) =>
       seq(
         field("pattern", $._pattern),
@@ -466,7 +467,7 @@ module.exports = grammar({
         $.identifier,
         $.function_call,
         $.tuple,
-        $.expression_group,
+        $.block,
         $.case,
         $.field_access,
         $.tuple_access
@@ -484,7 +485,7 @@ module.exports = grammar({
         $.record,
         $.identifier,
         $.function_call,
-        $.expression_group,
+        $.block,
         $.case,
         $.record_update,
         $.field_access,
@@ -510,7 +511,7 @@ module.exports = grammar({
       choice(
         $.identifier,
         $.anonymous_function,
-        $.expression_group,
+        $.block,
         $.case,
         $.tuple_access,
         $.field_access,

queries/highlights.scm

@@ -63,7 +63,8 @@
 ; Operators
 (binary_expression
   operator: _ @operator)
-"!" @operator
+(boolean_negation "!" @operator)
+(integer_negation "-" @operator)
 
 ; Keywords
 [