tree-sitter-ucode 0.6.0 → 0.7.0

package/src/scanner_impl.h

@@ -255,6 +255,14 @@ static bool lookahead_is_stmt_close(TSLexer *lexer) {
 /*
  * Automatic Semicolon Insertion (ECMA-262 §12.10).
  *
+ * NOTE: This is intentionally MORE lenient than the ucode compiler.  ucode only
+ * lets a statement omit its terminating ';' immediately before '}', EOF, a tag
+ * close (%} / -%}), or an alt-syntax end keyword (endif/endfor/endwhile/
+ * endfunction/elif/else); it rejects a bare newline between two statements
+ * (`x = 1\ny = 2`).  We keep full ECMAScript-style ASI here on purpose so that
+ * incomplete, mid-edit code is not aggressively flagged as an error in editors.
+ * See test/corpus and README for the (deliberate) divergence.
+ *
  * Extended to allow ASI immediately before %} and -%} so that the last
  * statement in a statement tag does not need an explicit trailing semicolon:
  *   {% let x = 1 %}      — works without a semicolon

package/tree-sitter.json

@@ -78,7 +78,7 @@
     }
   ],
   "metadata": {
-    "version": "0.5.0",
+    "version": "0.7.0",
     "license": "MIT",
     "description": "Ucode grammar for tree-sitter",
     "links": {

package/ucdocs/grammar.js

@@ -41,7 +41,7 @@ module.exports = grammar({
     ),
 
     _begin: _ => token(seq('/', /\*+/)),
-    _end: _ => token(seq(/\**/, '/')),
+    _end: _ => token(seq(/\*+/, '/')),
 
     // Used after a type_expression/rest_type_expression has already claimed `{` at
     // this position (param_tag, returns_tag, throws_tag) — excludes _brace_text so
@@ -116,7 +116,7 @@ module.exports = grammar({
     typedef_tag: $ => seq(
       '@typedef',
       optional(field('type', $.type_expression)),
-      field('name', $.type_identifier),
+      field('name', choice($.type_identifier, $.identifier)),
     ),
 
     type_tag: $ => seq(
@@ -246,9 +246,10 @@ module.exports = grammar({
 
     module_path: _ => /[a-zA-Z_$][a-zA-Z0-9_$]*(\.[a-zA-Z_$][a-zA-Z0-9_$]*)*/,
 
-    // Covers bare TypeName and generic TypeName<T>, TypeName<T, U>, etc.
+    // Covers bare names and generic TypeName<T>, TypeName<T, U>, etc.
+    // Accepts both PascalCase (type_identifier) and lowercase (identifier) names.
     named_type: $ => seq(
-      field('name', $.type_identifier),
+      field('name', choice($.type_identifier, $.identifier)),
       optional(seq(
         '<',
         field('params', commaSep1($._type)),
@@ -294,8 +295,8 @@ module.exports = grammar({
     // ?T is sugar for T | null; higher precedence than union so ?T | U == (?T) | U.
     nullable_type: $ => prec(2, seq('?', $._type)),
 
-    // PascalCase names: typedef references and type parameters.
-    type_identifier: _ => /[A-Z][a-zA-Z0-9]*/,
+    // Uppercase-starting names: PascalCase typedef references and type parameters.
+    type_identifier: _ => /[A-Z][a-zA-Z0-9_$]*/,
 
     // Lowercase-starting names: parameter names and function param names.
     identifier: _ => /[a-z_$][a-zA-Z_$0-9]*/,

package/ucdocs/src/grammar.json

@@ -119,7 +119,7 @@
         "members": [
           {
             "type": "PATTERN",
-            "value": "\\**"
+            "value": "\\*+"
           },
           {
             "type": "STRING",
@@ -537,8 +537,17 @@
           "type": "FIELD",
           "name": "name",
           "content": {
-            "type": "SYMBOL",
-            "name": "type_identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "type_identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
           }
         }
       ]
@@ -1177,8 +1186,17 @@
           "type": "FIELD",
           "name": "name",
           "content": {
-            "type": "SYMBOL",
-            "name": "type_identifier"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "type_identifier"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "identifier"
+              }
+            ]
           }
         },
         {
@@ -1473,7 +1491,7 @@
     },
     "type_identifier": {
       "type": "PATTERN",
-      "value": "[A-Z][a-zA-Z0-9]*"
+      "value": "[A-Z][a-zA-Z0-9_$]*"
     },
     "identifier": {
       "type": "PATTERN",

package/ucdocs/src/node-types.json

@@ -683,6 +683,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "identifier",
+            "named": true
+          },
           {
             "type": "type_identifier",
             "named": true
@@ -1333,6 +1337,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "identifier",
+            "named": true
+          },
           {
             "type": "type_identifier",
             "named": true