896254eea5
There was an error in the way that we calculate the reference scope sequences that are used as the basis for assertions about changed ranges in randomized tests. The error caused some characters' scopes to not be checked. This corrects the reference implementation and fixes a previously uncaught bug in the implementation of `tree_path_get_changed_ranges`. Previously, when iterating over the old and new trees, we would only perform comparisons of visible nodes. This resulted in a failure to do any comparison for portions of the text in which there were trailing invisible child nodes (e.g. trailing `_line_break` nodes inside `statement` nodes in the JavaScript grammar). Now, we additionally perform comparisons at invisible leaf nodes, based on their lowest visible ancestor.
59 lines
1.3 KiB
C
59 lines
1.3 KiB
C
#ifndef RUNTIME_LENGTH_H_
|
|
#define RUNTIME_LENGTH_H_
|
|
|
|
#include <stdlib.h>
|
|
#include <stdbool.h>
|
|
#include "runtime/point.h"
|
|
#include "tree_sitter/runtime.h"
|
|
|
|
typedef struct {
|
|
uint32_t bytes;
|
|
uint32_t chars;
|
|
TSPoint extent;
|
|
} Length;
|
|
|
|
static inline bool length_has_unknown_chars(Length self) {
|
|
return self.bytes > 0 && self.chars == 0;
|
|
}
|
|
|
|
static inline void length_set_unknown_chars(Length *self) {
|
|
self->chars = 0;
|
|
}
|
|
|
|
static inline Length length_min(Length len1, Length len2) {
|
|
return (len1.bytes < len2.bytes) ? len1 : len2;
|
|
}
|
|
|
|
static inline Length length_add(Length len1, Length len2) {
|
|
Length result;
|
|
result.bytes = len1.bytes + len2.bytes;
|
|
result.extent = point_add(len1.extent, len2.extent);
|
|
|
|
if (length_has_unknown_chars(len1) || length_has_unknown_chars(len2)) {
|
|
result.chars = 0;
|
|
} else {
|
|
result.chars = len1.chars + len2.chars;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
static inline Length length_sub(Length len1, Length len2) {
|
|
Length result;
|
|
result.bytes = len1.bytes - len2.bytes;
|
|
result.extent = point_sub(len1.extent, len2.extent);
|
|
|
|
if (length_has_unknown_chars(len1) || length_has_unknown_chars(len2)) {
|
|
result.chars = 0;
|
|
} else {
|
|
result.chars = len1.chars - len2.chars;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
static inline Length length_zero() {
|
|
return (Length){ 0, 0, {0, 0} };
|
|
}
|
|
|
|
#endif
|