feat: add support for editions (#1)

* grammar: add support for edition

* feat: add support for editions

In addition to adding support for edition keyword,
this also adds support for the new grammer rules introduced such as
skipping `"` (quotation) marks around reserved field names.

* fix: lint and do not test on swift

* bump: to 0.2.0

Author: asharkhan3101

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
         uses: tree-sitter/parser-test-action@v2
         with:
           test-rust: true
-          test-node: false
           test-python: true
           test-go: true
-          test-swift: true
+          test-swift: false
+          test-node: false

.github/workflows/fuzz.yml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-proto"
 description = "Parser for proto2 and proto3 files"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Mohammad Ashar Khan <[email protected]>"]
 license = "MIT"
 readme = "README.md"

CMakeLists.txt

@@ -2,12 +2,23 @@
 
 [![CI][ci]](https://github.com/coder3101/tree-sitter-proto/actions/workflows/ci.yml)
 [![crates][crates]](https://crates.io/coder3101/tree-sitter-proto)
-[![npm][npm]](https://www.npmjs.com/package/tree-sitter-proto)
-[![pypi][pypi]](https://pypi.org/project/tree-sitter-proto)
 
 Protocol buffer grammer for [tree-sitter](https://github.com/tree-sitter/tree-sitter).
 
+
+## ✨ Features
+
+- ✅ Basic Proto2 support
+- ✅ Proto3 support
+- ✅ Support for editions
+
+
+### Special Thanks 
+
+Special thanks to the following people for their amazing work in this grammer.
+
+- [mitchellh](https://github.com/mitchellh/tree-sitter-proto) for their original work.
+- [treywood](https://github.com/treywood/tree-sitter-proto) for basic proto2 support.
+
 [ci]: https://img.shields.io/github/actions/workflow/status/coder3101/tree-sitter-proto/ci.yml?logo=github&label=CI
-[npm]: https://img.shields.io/npm/v/tree-sitter-proto?logo=npm
-[crates]: https://img.shields.io/crates/v/tree-sitter-proto?logo=rust
-[pypi]: https://img.shields.io/pypi/v/tree-sitter-proto?logo=pypi&logoColor=ffd242
+[crates]: https://img.shields.io/crates/v/tree-sitter-proto?logo=rust

Cargo.toml

@@ -34,7 +34,7 @@ module.exports = grammar({
     // proto = syntax { import | package | option | topLevelDef | emptyStatement }
     // topLevelDef = message | enum | service
     source_file: $ => seq(
-      optional($.syntax),
+      optional(choice($.syntax, $.edition)),
       optional(repeat(choice(
         $.import,
         $.package,
@@ -49,6 +49,8 @@ module.exports = grammar({
 
     empty_statement: _ => ';',
 
+    // edition  = "edition" "=" quote numeric quote ";"
+    edition: $ => seq('edition', '=', field('year', $.string), ';'),
     // syntax = "syntax" "=" quote "proto3" quote ";"
     syntax: $ => seq('syntax', '=', choice('"proto3"', '"proto2"'), ';'),
 
@@ -411,17 +413,27 @@ module.exports = grammar({
       ))),
     )),
 
-    // reserved_identifier = \" letter { letter | decimalDigit | "_" } \"
-    reserved_identifier: $ => token(seq(
-      '"',
-      letter,
-      optional(repeat(choice(
-        letter,
-        decimal_digit,
-        '_',
-      ))),
-      '"',
-    )),
+    // reserved_identifier = \" | ' letter { letter | decimalDigit | "_" } ' | \"
+    reserved_identifier: $ => token(
+      choice(
+        seq(
+          '"',
+          letter,
+          optional(repeat(choice(letter, decimal_digit, '_'))),
+          '"',
+        ),
+        seq(
+          '\'',
+          letter,
+          optional(repeat(choice(letter, decimal_digit, '_'))),
+          '\'',
+        ),
+        seq(
+          letter,
+          optional(repeat(choice(letter, decimal_digit, '_'))),
+        ),
+      ),
+    ),
     _identifier_or_string: $ => choice($.identifier, $.string),
 
     // fullIdent = ident { "." ident }

Makefile

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-proto",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Parser for proto2 and proto3 files",
   "repository": "github:tree-sitter/tree-sitter-proto",
   "license": "MIT",
@@ -46,6 +46,7 @@
   "scripts": {
     "install": "node-gyp-build",
     "lint": "eslint grammar.js",
+    "lint-fix": "eslint grammar.js --fix",
     "prestart": "tree-sitter build --wasm",
     "start": "tree-sitter playground",
     "test": "node --test bindings/node/*_test.js"

README.md

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "tree-sitter-proto"
 description = "Parser for proto2 and proto3 files"
-version = "0.1.0"
+version = "0.2.0"
 keywords = ["incremental", "parsing", "tree-sitter", "proto"]
 classifiers = [
   "Intended Audience :: Developers",

grammar.js

@@ -1,5 +1,6 @@
 [
   "syntax"
+  "edition"
   "package"
   "option"
   "import"