@konomanoasa/tree-sitter-gitattributes 0.4.2 → 0.6.0

package/src/scanner.c

@@ -9,6 +9,7 @@ enum Token {
   RULE_START,
   MACRO_START,
   END_OF_FILE,
+  LINE_ENDING,
   LAYOUT,
   SEPARATOR,
   ATTRIBUTE_START,
@@ -648,6 +649,21 @@ static bool prepare_attribute(Scanner *s, TSLexer *lexer, const bool *valid) {
   return emit(lexer, valid, ATTRIBUTE_START);
 }
 
+static bool end_line(Scanner *s, TSLexer *lexer, const bool *valid) {
+  enum Token token = END_OF_FILE;
+  if (!lexer->eof(lexer)) {
+    if (!valid[LINE_ENDING]) return false;
+    if (lexer->lookahead == '\r') advance(s, lexer);
+    if (lexer->lookahead != '\n') return false;
+    advance(s, lexer);
+    token = LINE_ENDING;
+  }
+  lexer->mark_end(lexer);
+  if (!emit(lexer, valid, token)) return false;
+  *s = (Scanner){0};
+  return true;
+}
+
 static bool scan(Scanner *s, TSLexer *lexer, const bool *valid) {
   if (valid[ERROR_SENTINEL]) return false;
   if (valid[LINE_START]) return start_line(s, lexer, valid);
@@ -685,7 +701,10 @@ static bool scan(Scanner *s, TSLexer *lexer, const bool *valid) {
     return emit(lexer, valid, VALUE_START);
   if (valid[VALUE_END] && s->position == s->token_end)
     return emit(lexer, valid, VALUE_END);
-  if (valid[MISSING_ATTRIBUTE_NAME] && s->position == s->name_end)
+  if (
+    (valid[MISSING_ATTRIBUTE_NAME] || valid[INCOMPLETE_ATTRIBUTE_NAME]) &&
+    s->position == s->name_end
+  )
     return emit(
       lexer,
       valid,
@@ -707,7 +726,9 @@ static bool scan(Scanner *s, TSLexer *lexer, const bool *valid) {
   if (valid[ASSIGNMENT_OPERATOR] && lexer->lookahead == '=')
     return take(s, lexer, valid, ASSIGNMENT_OPERATOR);
   if (
-    (valid[QUOTE_CLOSE] || valid[MISSING_QUOTE_CLOSE]) &&
+    (valid[QUOTE_CLOSE] ||
+      valid[MISSING_QUOTE_CLOSE] ||
+      valid[INCOMPLETE_QUOTE_CLOSE]) &&
     s->quoted &&
     s->position == s->content_end
   ) {
@@ -720,8 +741,7 @@ static bool scan(Scanner *s, TSLexer *lexer, const bool *valid) {
   }
   if (valid[PATTERN_END] && s->position >= s->content_end)
     return emit(lexer, valid, PATTERN_END);
-  if (s->position >= s->line_end)
-    return lexer->eof(lexer) && emit(lexer, valid, END_OF_FILE);
+  if (s->position >= s->line_end) return end_line(s, lexer, valid);
   if (s->kind == COMMENT_START) {
     if (s->position == s->leading) return take(s, lexer, valid, COMMENT_MARKER);
     return text_run(s, lexer, valid, COMMENT_TEXT, s->line_end);
@@ -770,6 +790,7 @@ unsigned tree_sitter_gitattributes_external_scanner_serialize(
   void *payload,
   char *buffer
 ) {
+  if (payload == NULL) return 0;
   memcpy(buffer, payload, sizeof(Scanner));
   return sizeof(Scanner);
 }
@@ -779,6 +800,7 @@ void tree_sitter_gitattributes_external_scanner_deserialize(
   const char *buffer,
   unsigned length
 ) {
+  if (payload == NULL) return;
   memset(payload, 0, sizeof(Scanner));
   if (length == sizeof(Scanner)) memcpy(payload, buffer, length);
 }
@@ -788,6 +810,7 @@ bool tree_sitter_gitattributes_external_scanner_scan(
   TSLexer *lexer,
   const bool *valid
 ) {
+  if (payload == NULL) return false;
   Scanner next = *(Scanner *)payload;
   if (!scan(&next, lexer, valid)) return false;
   *(Scanner *)payload = next;

package/test/bindings.test.rs

@@ -1,5 +1,5 @@
 use konomanoasa_tree_sitter_gitattributes as grammar;
-use tree_sitter::{Parser, Query};
+use tree_sitter::{Parser, Query, QueryCursor, StreamingIterator};
 
 #[test]
 fn parses_valid_source() {
@@ -13,5 +13,26 @@ fn parses_valid_source() {
   assert_eq!(root.byte_range(), 0..source.len());
   assert!(!root.has_error());
   assert!(grammar::NODE_TYPES.contains("\"document\""));
-  Query::new(&language, grammar::HIGHLIGHTS_QUERY).unwrap();
+  let query = Query::new(&language, grammar::HIGHLIGHTS_QUERY).unwrap();
+  let mut cursor = QueryCursor::new();
+  let mut captures = cursor.captures(&query, root, source.as_bytes());
+  let mut actual = Vec::new();
+  while let Some((matched, index)) = captures.next() {
+    let capture = matched.captures()[*index];
+    actual.push((
+      query.capture_names()[capture.index as usize],
+      capture.node.utf8_text(source.as_bytes()).unwrap(),
+    ));
+  }
+  assert_eq!(
+    actual,
+    [
+      ("character.special", "*"),
+      ("string.special.path", ".txt"),
+      ("attribute", "text"),
+      ("attribute", "eol"),
+      ("operator", "="),
+      ("string", "lf")
+    ]
+  );
 }

package/tree-sitter.json

@@ -12,7 +12,7 @@
     }
   ],
   "metadata": {
-    "version": "0.4.2",
+    "version": "0.6.0",
     "license": "MIT",
     "description": "Tree-sitter grammar for gitattributes.",
     "links": {
@@ -23,7 +23,7 @@
     "c": false,
     "go": false,
     "node": false,
-    "python": false,
+    "python": true,
     "rust": true,
     "swift": false
   }