tree-sitter-sed 0.1.0 → 0.2.0

package/README.md

@@ -14,8 +14,7 @@ npm install tree-sitter-sed
 
 ## Grammars
 
-This repository contains two grammars. You can find [`sed`](sed) and
-[`sed_ere`](sed-ere) here.
+This repository contains two grammars. You can find [`sed_ere`](sed_ere) here.
 
 ## Specifications
 

package/grammar.js

@@ -0,0 +1,3 @@
+const defineGrammar = require("./common/grammar");
+
+module.exports = defineGrammar("sed", "bre");

package/package.json

@@ -1,27 +1,29 @@
 {
   "name": "tree-sitter-sed",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Tree-sitter grammars for POSIX sed.",
   "license": "MIT",
   "repository": "git+https://github.com/konomanoasa/tree-sitter-sed.git",
   "files": [
     "common/*.js",
     "common/scanner.h",
-    "sed/grammar.js",
-    "sed/src/*.c",
-    "sed/src/*.json",
-    "sed/src/tree_sitter/*.h",
-    "sed-ere/grammar.js",
-    "sed-ere/src/*.c",
-    "sed-ere/src/*.json",
-    "sed-ere/src/tree_sitter/*.h",
+    "grammar.js",
+    "queries/*.scm",
+    "src/*.c",
+    "src/*.json",
+    "src/tree_sitter/*.h",
+    "sed_ere/grammar.js",
+    "sed_ere/queries/*.scm",
+    "sed_ere/src/*.c",
+    "sed_ere/src/*.json",
+    "sed_ere/src/tree_sitter/*.h",
     "tree-sitter.json"
   ],
   "scripts": {
     "check": "biome check . && node scripts/check-scanner.js && node scripts/check-generated.js && npm test",
     "format": "biome check --write . && node scripts/check-scanner.js --write",
     "generate": "npm run tree-sitter -- generate-all",
-    "test": "npm run tree-sitter -- test --rebuild && node --test test/parser.test.js",
+    "test": "npm run tree-sitter -- test-corpus --rebuild && node --test",
     "test:fuzz": "npm run tree-sitter -- fuzz-all --iterations 100 --edits 5",
     "tree-sitter": "node scripts/tree-sitter.js"
   },

package/queries/highlights.scm

@@ -0,0 +1,122 @@
+[
+  (address_escape)
+  (escaped_delimiter_token)
+  (quoted_character_token)
+  (replacement_escape_token)
+  (sed_newline_escape_token)
+  (text_backslash_escape_token)
+  (translation_escape_token)
+] @string.escape
+
+[
+  (back_bar)
+  (back_plus)
+  (back_qm)
+  (left_anchor_token)
+  (negation_operator)
+  (right_anchor_token)
+  (zero_or_more_operator)
+] @operator
+
+[
+  (case_insensitive_flag)
+  (global_flag)
+  (print_flag)
+  (substitution_flag)
+] @keyword.modifier
+
+(function_verb) @keyword
+
+(comment_text) @comment
+
+(default_output_suppression) @keyword.directive
+
+[
+  (escaped_newline_token)
+  (text_introducer_token)
+  (text_escaped_newline_token)
+] @punctuation.special
+
+(label_token) @label
+
+(last_line_address) @constant.builtin
+
+[
+  (dup_count_token)
+  (line_number_address)
+  (occurrence_flag)
+] @number
+
+[
+  (backreference_token)
+  (matched_text_reference_token)
+  (replacement_backreference_token)
+] @string.special.symbol
+
+[
+  (rfile_token)
+  (wfile_token)
+] @string.special.path
+
+[
+  (back_close_brace)
+  (back_close_parenthesis_token)
+  (back_open_brace)
+  (back_open_parenthesis)
+  (close_bracket_token)
+  (closing_brace_token)
+  (colon_close)
+  (open_bracket)
+  (open_colon)
+] @punctuation.bracket
+
+[
+  (nonmatching_list_operator)
+  (range_operator)
+] @punctuation.special
+
+[
+  (range_end_hyphen)
+  (trailing_hyphen)
+] @string.regexp
+
+[
+  (class_name)
+  (coll_elem_multi)
+  (coll_elem_single)
+  (collating_element_token)
+  (dot_close)
+  (equal_close)
+  (meta_char)
+  (open_dot)
+  (open_equal)
+  (period_token)
+] @character.special
+
+[
+  (address_separator_token)
+  (delimiter_token)
+  (interval_separator)
+] @punctuation.delimiter
+
+((command_separator) @punctuation.delimiter
+  (#eq? @punctuation.delimiter ";"))
+
+(ordinary_character_token) @string.regexp
+
+[
+  (replacement_literal_token)
+  (text_literal_token)
+  (translation_literal_token)
+] @string
+
+(block_function
+  verb: (function_verb) @punctuation.bracket)
+
+(comment_function
+  verb: (function_verb) @comment)
+
+(comment_function
+  verb: (function_verb) @keyword.directive
+  comment: (comment
+    suppression: (default_output_suppression)))

package/{sed-ere → sed_ere}/grammar.js

@@ -1,8 +1,3 @@
-/**
- * @author konomanoasa
- * @license MIT
- */
-
 const defineGrammar = require("../common/grammar");
 
 module.exports = defineGrammar("sed_ere", "ere");

package/sed_ere/queries/highlights.scm

@@ -0,0 +1,122 @@
+[
+  (address_escape)
+  (escaped_delimiter_token)
+  (quoted_character_token)
+  (replacement_escape_token)
+  (sed_newline_escape_token)
+  (text_backslash_escape_token)
+  (translation_escape_token)
+] @string.escape
+
+[
+  (ere_alternation_operator_token)
+  (left_anchor_token)
+  (negation_operator)
+  (one_or_more_operator)
+  (repetition_modifier)
+  (right_anchor_token)
+  (zero_or_more_operator)
+  (zero_or_one_operator)
+] @operator
+
+[
+  (case_insensitive_flag)
+  (global_flag)
+  (print_flag)
+  (substitution_flag)
+] @keyword.modifier
+
+(function_verb) @keyword
+
+(comment_text) @comment
+
+(default_output_suppression) @keyword.directive
+
+[
+  (escaped_newline_token)
+  (text_introducer_token)
+  (text_escaped_newline_token)
+] @punctuation.special
+
+(label_token) @label
+
+(last_line_address) @constant.builtin
+
+[
+  (dup_count_token)
+  (line_number_address)
+  (occurrence_flag)
+] @number
+
+[
+  (matched_text_reference_token)
+  (replacement_backreference_token)
+] @string.special.symbol
+
+[
+  (rfile_token)
+  (wfile_token)
+] @string.special.path
+
+[
+  (close_brace)
+  (close_bracket_token)
+  (close_parenthesis_token)
+  (closing_brace_token)
+  (colon_close)
+  (open_brace)
+  (open_bracket)
+  (open_colon)
+  (open_parenthesis)
+] @punctuation.bracket
+
+[
+  (nonmatching_list_operator)
+  (range_operator)
+] @punctuation.special
+
+[
+  (range_end_hyphen)
+  (trailing_hyphen)
+] @string.regexp
+
+[
+  (class_name)
+  (coll_elem_multi)
+  (coll_elem_single)
+  (collating_element_token)
+  (dot_close)
+  (equal_close)
+  (meta_char)
+  (open_dot)
+  (open_equal)
+  (period_token)
+] @character.special
+
+[
+  (address_separator_token)
+  (delimiter_token)
+  (interval_separator)
+] @punctuation.delimiter
+
+((command_separator) @punctuation.delimiter
+  (#eq? @punctuation.delimiter ";"))
+
+(ordinary_character_token) @string.regexp
+
+[
+  (replacement_literal_token)
+  (text_literal_token)
+  (translation_literal_token)
+] @string
+
+(block_function
+  verb: (function_verb) @punctuation.bracket)
+
+(comment_function
+  verb: (function_verb) @comment)
+
+(comment_function
+  verb: (function_verb) @keyword.directive
+  comment: (comment
+    suppression: (default_output_suppression)))

package/{sed-ere → sed_ere}/src/parser.c

@@ -55863,7 +55863,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_sed_ere(void) {
     .max_reserved_word_set_size = 0,
     .metadata = {
       .major_version = 0,
-      .minor_version = 1,
+      .minor_version = 2,
       .patch_version = 0,
     },
   };

package/{sed/src → src}/parser.c

@@ -57899,7 +57899,7 @@ TS_PUBLIC const TSLanguage *tree_sitter_sed(void) {
     .max_reserved_word_set_size = 0,
     .metadata = {
       .major_version = 0,
-      .minor_version = 1,
+      .minor_version = 2,
       .patch_version = 0,
     },
   };

package/{sed/src → src}/scanner.c

@@ -1,5 +1,5 @@
 #define SED_REGEX_EXTENDED 0
-#include "../../common/scanner.h"
+#include "../common/scanner.h"
 
 void *tree_sitter_sed_external_scanner_create(void) {
   return sed_scanner_create();

package/tree-sitter.json

@@ -3,23 +3,25 @@
   "grammars": [
     {
       "name": "sed",
-      "title": "POSIX sed (BRE)",
+      "title": "POSIX sed",
       "scope": "source.sed",
-      "path": "sed",
+      "path": ".",
       "file-types": ["sed"],
       "injection-regex": "^sed$",
+      "highlights": "queries/highlights.scm",
       "external-files": ["common/scanner.h"]
     },
     {
       "name": "sed_ere",
       "title": "POSIX sed (ERE)",
       "scope": "source.sed.ere",
-      "path": "sed-ere",
+      "path": "sed_ere",
+      "highlights": "sed_ere/queries/highlights.scm",
       "external-files": ["common/scanner.h"]
     }
   ],
   "metadata": {
-    "version": "0.1.0",
+    "version": "0.2.0",
     "license": "MIT",
     "description": "Tree-sitter grammars for POSIX sed.",
     "authors": [

package/sed/grammar.js

@@ -1,8 +0,0 @@
-/**
- * @author konomanoasa
- * @license MIT
- */
-
-const defineGrammar = require("../common/grammar");
-
-module.exports = defineGrammar("sed", "bre");