textbringer-tree-sitter 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49bbd134f0163af928c442de2eae8804655ca7acf9a86d13b29e3b4335857bf
-  data.tar.gz: fcb3bdd6fd34d0b199e27e647174c1b432aa5fdd7cbde79319d747e33ef13be4
+  metadata.gz: 28756ea2a173ddd14d86a892280b4bb9aef8b18c092fc2f406a447bf45d409da
+  data.tar.gz: e81b17e1b08b48f2ce5220d750d0431311a7ecd6463c37007f928fd515258c0d
 SHA512:
-  metadata.gz: a4ff22e0d8c167cd96b019815411ac1f91b0f8687d8de5559d652269531316f3bc465a7851c964fc252ec2895aabe45af0e163b732976f767ec3f5618240748d
-  data.tar.gz: 9c29a6c31361c69b29212dfc52731c51889eebea551c6e14a8a30a48a8ff98e6edeca29a68a4b2588879506c8cf7dcd7d9176b90b69aba7a48fca204fbea71a9
+  metadata.gz: 75175a3f5529504d9318c2667c5bfbc0cfa368dc723da8b3ef3384b51db0d65b56eb6308d761ec4461df3caef9e89465af28d29fd622c94d6fa011206d98c8e4
+  data.tar.gz: 58e279671e32eba8b409daf1c7def3662de72abe3dadf5ecf39333d71679a6ac41b4e757ecb1fa93e60e7cfad236e5facb8591203a1514a34bfd8360fb222976

data/CLAUDE.md

@@ -150,6 +150,14 @@ c++ -shared -fPIC -O2 -std=c++14 -Isrc src/parser.c src/scanner.cc -o libtree-si
 cp libtree-sitter-hcl.dylib ~/.textbringer/parsers/darwin-arm64/
 ```
 
+## リリース手順
+
+1. `lib/textbringer/tree_sitter/version.rb` のバージョンを更新
+2. PR を作成してマージ
+3. main でタグを打つ（`git tag vX.Y.Z && git push origin vX.Y.Z`）
+4. **gem push は GitHub Actions が自動で行う**（手動で `gem push` する必要はない）
+5. GitHub Release のリリースノートを整備する（CI が自動作成するが、内容は手動で書き換える）
+
 ## 参考実装
 
 - [textbringer-rouge](https://github.com/yancya/textbringer-rouge) - Window モンキーパッチの実装パターン

data/lib/textbringer/tree_sitter/node_maps/ruby.rb

@@ -8,10 +8,7 @@ module Textbringer
       RUBY_FEATURES = {
         comment: %i[comment],
         string: %i[
-          string
           string_content
-          string_array
-          symbol_array
           heredoc_content
           heredoc_body
           heredoc_beginning
@@ -23,10 +20,7 @@ module Textbringer
           bare_string
           escape_sequence
           character
-          subshell
           regex
-          chained_string
-          interpolation
           uninterpreted
         ],
         keyword: %i[
@@ -74,87 +68,18 @@ module Textbringer
           file
           line
         ],
-        function_name: %i[
-          method
-          singleton_method
-          call
-        ],
+        function_name: %i[],
         variable: %i[
           identifier
           instance_variable
           class_variable
           global_variable
         ],
-        type: %i[singleton_class],
-        operator: %i[
-          binary
-          unary
-          assignment
-          operator
-          operator_assignment
-        ],
+        type: %i[],
+        operator: %i[],
         punctuation: %i[],
         builtin: %i[nil true false],
-        property: %i[
-          hash
-          array
-          block
-          hash_pattern
-          array_pattern
-          find_pattern
-          hash_splat_argument
-          hash_splat_nil
-          hash_splat_parameter
-          splat_argument
-          splat_parameter
-          rest_assignment
-          pair
-          argument_list
-          block_argument
-          block_body
-          block_parameter
-          block_parameters
-          keyword_parameter
-          keyword_pattern
-          optional_parameter
-          forward_argument
-          forward_parameter
-          destructured_parameter
-          left_assignment_list
-          right_assignment_list
-          destructured_left_assignment
-          lambda_parameters
-          method_parameters
-          parenthesized_pattern
-          pattern
-          alternative_pattern
-          expression_reference_pattern
-          variable_reference_pattern
-          test_pattern
-          body_statement
-          parenthesized_statements
-          program
-          scope_resolution
-          element_reference
-          setter
-          conditional
-          if_modifier
-          unless_modifier
-          while_modifier
-          until_modifier
-          rescue_modifier
-          case_match
-          in_clause
-          match_pattern
-          if_guard
-          unless_guard
-          do_block
-          begin_block
-          end_block
-          empty_statement
-          exception_variable
-          exceptions
-        ]
+        property: %i[]
       }.freeze
 
       # Feature → Face の展開

data/lib/textbringer/tree_sitter/node_maps/sql.rb

@@ -6,44 +6,37 @@ module Textbringer
       SQL_FEATURES = {
         keyword: %i[
           SELECT FROM WHERE JOIN LEFT RIGHT INNER OUTER FULL NATURAL CROSS
-          ON AND OR NOT IN IS NULL BETWEEN LIKE ILIKE
+          ON AND OR NOT IN IS NULL BETWEEN
           INSERT INTO VALUES UPDATE SET DELETE
           CREATE DROP ALTER TABLE INDEX VIEW SCHEMA DATABASE
-          PRIMARY_KEY FOREIGN_KEY UNIQUE CHECK CONSTRAINT REFERENCES
+          PRIMARY_KEY UNIQUE CHECK CONSTRAINT REFERENCES
           GROUP_BY ORDER_BY HAVING LIMIT OFFSET FETCH
           UNION INTERSECT EXCEPT ALL DISTINCT
           AS ASC DESC NULLS FIRST LAST
           CASE WHEN THEN ELSE END
           BEGIN COMMIT ROLLBACK TRANSACTION
-          IF EXISTS IF_EXISTS IF_NOT_EXISTS
+          IF EXISTS
           TRUE FALSE DEFAULT
           WITH RECURSIVE
           GRANT REVOKE PRIVILEGES
           RETURNS RETURN FUNCTION PROCEDURE
           FOR EACH ROW TRIGGER
-          CASCADE RESTRICT SET_NULL SET_DEFAULT
+          CASCADE RESTRICT
           VOLATILE STABLE IMMUTABLE
           DECLARE EXECUTE
+          like
         ],
         comment: %i[comment line_comment block_comment],
-        string: %i[string],
+        string: %i[content],
         number: %i[number],
-        type: %i[
-          type_cast constrained_type array_type
-          INTEGER INT SMALLINT BIGINT
-          REAL FLOAT DOUBLE DECIMAL NUMERIC
-          VARCHAR CHAR TEXT
-          BOOLEAN BOOL
-          DATE TIME TIMESTAMP TIMESTAMPTZ
-          JSON JSONB XML
-          UUID BYTEA
-          SERIAL BIGSERIAL
-        ],
-        function_name: %i[function_call],
-        variable: %i[identifier dotted_name],
-        operator: %i[binary_operator comparison_operator],
-        punctuation: %i[delimiter],
-        constant: %i[boolean_expression],
+        type: %i[],
+        function_name: %i[],
+        variable: %i[identifier],
+        operator: %i[],
+        punctuation: %i[],
+        constant: %i[],
+        builtin: %i[],
+        property: %i[],
       }.freeze
 
       SQL = SQL_FEATURES.flat_map { |face, nodes|

data/lib/textbringer/tree_sitter/version.rb

@@ -2,6 +2,6 @@
 
 module Textbringer
   module TreeSitter
-    VERSION = "1.2.0"
+    VERSION = "1.2.2"
   end
 end

data/lib/textbringer/tree_sitter_adapter.rb

@@ -166,11 +166,13 @@ module Textbringer
       end
 
       def visit_node(node, &block)
-        block.call(node, node.start_byte, node.end_byte)
-
-        node.child_count.times do |i|
-          child = node.child(i)
-          visit_node(child, &block) if child
+        if node.child_count == 0
+          block.call(node, node.start_byte, node.end_byte)
+        else
+          node.child_count.times do |i|
+            child = node.child(i)
+            visit_node(child, &block) if child
+          end
         end
       end
 

data/samples/Sample.java

@@ -0,0 +1,289 @@
+// Line comment
+/* Block comment */
+/**
+ * Javadoc comment
+ * @author Sample
+ */
+
+package com.example.sample;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+// --- Enum ---
+enum Color {
+    RED("red"),
+    GREEN("green"),
+    BLUE("blue");
+
+    private final String name;
+
+    Color(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
+
+// --- Interface ---
+interface Greeter {
+    String greet(String name);
+
+    default String farewell(String name) {
+        return "Goodbye, " + name + "!";
+    }
+
+    static Greeter create() {
+        return name -> "Hello, " + name + "!";
+    }
+}
+
+// --- Abstract class ---
+abstract class Animal {
+    protected String name;
+
+    public Animal(String name) {
+        this.name = name;
+    }
+
+    public abstract String speak();
+
+    @Override
+    public String toString() {
+        return name + " says " + speak();
+    }
+}
+
+// --- Record (Java 16+) ---
+record Point(double x, double y) {
+    double distanceTo(Point other) {
+        return Math.sqrt(Math.pow(x - other.x, 2) + Math.pow(y - other.y, 2));
+    }
+}
+
+// --- Sealed class (Java 17+) ---
+sealed class Shape permits Circle, Rectangle {
+    public double area() { return 0; }
+}
+
+final class Circle extends Shape {
+    private final double radius;
+
+    Circle(double radius) {
+        this.radius = radius;
+    }
+
+    @Override
+    public double area() {
+        return Math.PI * radius * radius;
+    }
+}
+
+final class Rectangle extends Shape {
+    private final double width, height;
+
+    Rectangle(double width, double height) {
+        this.width = width;
+        this.height = height;
+    }
+
+    @Override
+    public double area() {
+        return width * height;
+    }
+}
+
+// --- Generic class ---
+class Container<T extends Comparable<T>> {
+    private final List<T> items = new ArrayList<>();
+
+    public void add(T item) {
+        items.add(item);
+    }
+
+    public Optional<T> max() {
+        return items.stream().max(T::compareTo);
+    }
+}
+
+// --- Main class ---
+public class Sample {
+    // --- Constants ---
+    public static final int MAX_SIZE = 100;
+    private static final String GREETING = "Hello";
+
+    // --- Instance fields ---
+    private final String name;
+    private int count;
+    private volatile boolean running;
+    private transient String temp;
+
+    // --- Constructor ---
+    public Sample(String name) {
+        this.name = name;
+        this.count = 0;
+        this.running = true;
+    }
+
+    // --- Methods ---
+    public synchronized void increment() {
+        count++;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    // --- Varargs ---
+    public static int sum(int... numbers) {
+        int total = 0;
+        for (int n : numbers) {
+            total += n;
+        }
+        return total;
+    }
+
+    // --- Generics method ---
+    public static <T> List<T> repeat(T item, int times) {
+        List<T> list = new ArrayList<>();
+        for (int i = 0; i < times; i++) {
+            list.add(item);
+        }
+        return list;
+    }
+
+    public static void main(String[] args) {
+        // --- Strings ---
+        String simple = "Hello, World!";
+        String escaped = "tab\tnewline\nnull\0";
+        String textBlock = """
+                This is a text block
+                with "quotes" inside
+                and interpolation-like: %s
+                """.formatted("value");
+        char ch = 'A';
+
+        // --- Numbers ---
+        int dec = 42;
+        long big = 1_234_567_890L;
+        float f = 3.14f;
+        double d = 2.71828;
+        int hex = 0xFF;
+        int oct = 077;
+        int bin = 0b1010;
+
+        // --- Booleans & Null ---
+        boolean flag = true;
+        boolean nope = false;
+        Object nothing = null;
+
+        // --- Type inference ---
+        var inferred = "inferred";
+        var list = new ArrayList<String>();
+
+        // --- Control flow ---
+        if (dec > 0) {
+            System.out.println("positive");
+        } else if (dec < 0) {
+            System.out.println("negative");
+        } else {
+            System.out.println("zero");
+        }
+
+        // --- Switch expression (Java 14+) ---
+        String result = switch (dec) {
+            case 1, 2, 3 -> "small";
+            case 42 -> "answer";
+            default -> {
+                yield "other";
+            }
+        };
+
+        // --- Loops ---
+        for (int i = 0; i < 10; i++) {
+            if (i == 5) break;
+            if (i == 3) continue;
+        }
+
+        for (String arg : args) {
+            System.out.println(arg);
+        }
+
+        int j = 10;
+        while (j > 0) {
+            j--;
+        }
+
+        do {
+            j++;
+        } while (j < 5);
+
+        // --- Operators ---
+        int sum = 1 + 2;
+        int diff = 5 - 3;
+        int prod = 4 * 2;
+        int quot = 10 / 3;
+        int mod = 10 % 3;
+        boolean logic = true && false || !true;
+        int bitAnd = 0xFF & 0x0F;
+        int ternary = sum > 0 ? sum : -sum;
+
+        // --- Instanceof pattern matching (Java 16+) ---
+        Object obj = "test";
+        if (obj instanceof String s) {
+            System.out.println(s.length());
+        }
+
+        // --- Exception handling ---
+        try {
+            throw new RuntimeException("oops");
+        } catch (RuntimeException e) {
+            System.out.println(e.getMessage());
+        } finally {
+            System.out.println("cleanup");
+        }
+
+        // --- Try with resources ---
+        try (var resource = new java.io.StringReader("test")) {
+            resource.read();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        // --- Lambda & Streams ---
+        List<Integer> numbers = List.of(1, 2, 3, 4, 5);
+        List<Integer> evens = numbers.stream()
+            .filter(n -> n % 2 == 0)
+            .map(n -> n * 2)
+            .collect(Collectors.toList());
+
+        // --- Method reference ---
+        numbers.forEach(System.out::println);
+
+        // --- Map ---
+        Map<String, Integer> scores = new HashMap<>();
+        scores.put("Alice", 95);
+        scores.put("Bob", 87);
+        scores.getOrDefault("Charlie", 0);
+
+        // --- Optional ---
+        Optional<String> opt = Optional.of("value");
+        opt.ifPresent(System.out::println);
+        String val = opt.orElse("default");
+
+        // --- Assert ---
+        assert dec == 42 : "Expected 42";
+
+        // --- Synchronized block ---
+        Object lock = new Object();
+        synchronized (lock) {
+            System.out.println("synchronized");
+        }
+    }
+}

data/samples/sample.c

@@ -0,0 +1,176 @@
+/* Block comment */
+// Line comment
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdbool.h>
+
+/* --- Preprocessor --- */
+#define MAX_SIZE 100
+#define SQUARE(x) ((x) * (x))
+
+#ifdef DEBUG
+#define LOG(msg) printf("DEBUG: %s\n", msg)
+#else
+#define LOG(msg)
+#endif
+
+#ifndef HEADER_GUARD
+#define HEADER_GUARD
+#endif
+
+/* --- Types --- */
+typedef unsigned long ulong;
+
+typedef struct {
+    char name[MAX_SIZE];
+    int age;
+    float score;
+} Person;
+
+typedef union {
+    int i;
+    float f;
+    char c;
+} Value;
+
+typedef enum {
+    RED = 0,
+    GREEN = 1,
+    BLUE = 2
+} Color;
+
+/* --- Constants --- */
+static const int ZERO = 0;
+const char *NULL_STR = NULL;
+
+/* --- Function declarations --- */
+int add(int a, int b);
+void greet(const char *name);
+static inline int max(int a, int b);
+Person *create_person(const char *name, int age);
+
+/* --- Function definitions --- */
+int add(int a, int b) {
+    return a + b;
+}
+
+void greet(const char *name) {
+    printf("Hello, %s!\n", name);
+}
+
+static inline int max(int a, int b) {
+    return (a > b) ? a : b;
+}
+
+Person *create_person(const char *name, int age) {
+    Person *p = (Person *)malloc(sizeof(Person));
+    if (p == NULL) {
+        return NULL;
+    }
+    strncpy(p->name, name, MAX_SIZE - 1);
+    p->name[MAX_SIZE - 1] = '\0';
+    p->age = age;
+    p->score = 0.0f;
+    return p;
+}
+
+/* --- Main --- */
+int main(int argc, char *argv[]) {
+    /* Strings */
+    char *str = "Hello, World!";
+    char ch = 'A';
+    char escaped[] = "tab\tnewline\nnull\0";
+
+    /* Numbers */
+    int dec = 42;
+    int hex = 0xFF;
+    int oct = 077;
+    int bin = 0b1010;
+    long big = 1234567890L;
+    float f = 3.14f;
+    double d = 2.71828;
+
+    /* Booleans (C99) */
+    bool flag = true;
+    bool nope = false;
+
+    /* Pointers */
+    int *ptr = &dec;
+    int **dbl_ptr = &ptr;
+    void *void_ptr = NULL;
+
+    /* Arrays */
+    int arr[5] = {1, 2, 3, 4, 5};
+    int matrix[2][3] = {{1, 2, 3}, {4, 5, 6}};
+
+    /* Control flow */
+    if (dec > 0) {
+        printf("positive\n");
+    } else if (dec < 0) {
+        printf("negative\n");
+    } else {
+        printf("zero\n");
+    }
+
+    switch (arr[0]) {
+        case 1:
+            printf("one\n");
+            break;
+        case 2:
+            printf("two\n");
+            break;
+        default:
+            printf("other\n");
+            break;
+    }
+
+    /* Loops */
+    for (int i = 0; i < 5; i++) {
+        if (i == 3) continue;
+        printf("%d\n", arr[i]);
+    }
+
+    int j = 0;
+    while (j < 10) {
+        j++;
+    }
+
+    do {
+        j--;
+    } while (j > 0);
+
+    /* Operators */
+    int sum = 1 + 2;
+    int diff = 5 - 3;
+    int prod = 4 * 2;
+    int quot = 10 / 3;
+    int mod = 10 % 3;
+    int neg = -sum;
+    int bit_and = 0xFF & 0x0F;
+    int bit_or = 0x10 | 0x01;
+    int bit_xor = 0xFF ^ 0x0F;
+    int bit_not = ~0;
+    int lshift = 1 << 4;
+    int rshift = 16 >> 2;
+    bool logic = (1 > 0) && (2 > 1) || !(3 > 4);
+    int ternary = (sum > 0) ? sum : -sum;
+    int size = sizeof(Person);
+
+    /* Struct usage */
+    Person *alice = create_person("Alice", 30);
+    printf("Name: %s, Age: %d\n", alice->name, alice->age);
+    free(alice);
+
+    /* Enum usage */
+    Color c = RED;
+    if (c == GREEN) {
+        printf("green\n");
+    }
+
+    /* Goto (rare but valid) */
+    goto end;
+end:
+    return 0;
+}