Skip to content

refactor: Node #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eu-ge-ne merged 1 commit into from
Aug 19, 2025
Merged

refactor: Node #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ export interface Node {
right: Node;
total_len: number;
total_eols_len: number;
buf_index: number;
buf: number;
slice_start: number;
slice_len: number;
eols_start: number;
eols_len: number;
}

export function create_node(
buf_index: number,
buf: number,
slice_start: number,
slice_len: number,
eols_start: number,
Expand All @@ -42,7 +42,7 @@ export function create_node(
right: NIL,
total_len: slice_len,
total_eols_len: eols_len,
buf_index,
buf,
slice_start,
slice_len,
eols_start,
Expand Down
21 changes: 11 additions & 10 deletions src/text-buf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,9 @@ export class TextBuf {
i += x.left.total_len;

if (eol_index < x.eols_len) {
return i +
this.#bufs[x.buf_index]!.eols[(x.eols_start + eol_index) * 2 + 1]! -
x.slice_start;
const eol_end = this.#bufs[x.buf]!
.eols[(x.eols_start + eol_index) * 2 + 1]!;
return i + eol_end - x.slice_start;
}

eol_index -= x.eols_len;
Expand All @@ -454,7 +454,7 @@ export class TextBuf {
while (!x.nil && (n > 0)) {
const count = Math.min(x.slice_len - offset, n);

yield this.#bufs[x.buf_index]!.text.slice(
yield this.#bufs[x.buf]!.text.slice(
x.slice_start + offset,
x.slice_start + offset + count,
);
Expand Down Expand Up @@ -714,7 +714,7 @@ export class TextBuf {
}

#split_node(x: Node, index: number, gap: number): Node {
const buf = this.#bufs[x.buf_index]!;
const buf = this.#bufs[x.buf]!;

const start = x.slice_start + index + gap;
const len = x.slice_len - index - gap;
Expand All @@ -726,26 +726,26 @@ export class TextBuf {
const eols_end = buf.find_eol_index(start + len, eols_start);
const eols_len = eols_end - eols_start;

const node = create_node(x.buf_index, start, len, eols_start, eols_len);
const node = create_node(x.buf, start, len, eols_start, eols_len);
this.#insert_after(x, node);

return node;
}

#node_growable(x: Node): boolean {
const buf = this.#bufs[x.buf_index]!;
const buf = this.#bufs[x.buf]!;

return (buf.len < 100) && (x.slice_start + x.slice_len === buf.len);
}

#grow_node(x: Node, text: string): void {
this.#bufs[x.buf_index]!.append(text);
this.#bufs[x.buf]!.append(text);

this.#resize_node(x, x.slice_len + text.length);
}

#trim_node_start(x: Node, n: number): void {
const buf = this.#bufs[x.buf_index]!;
const buf = this.#bufs[x.buf]!;

x.slice_start += n;
x.slice_len -= n;
Expand All @@ -765,14 +765,15 @@ export class TextBuf {
}

#resize_node(x: Node, len: number): void {
const buf = this.#bufs[x.buf_index]!;
const buf = this.#bufs[x.buf]!;

x.slice_len = len;

const eols_end = buf.find_eol_index(
x.slice_start + x.slice_len,
x.eols_start,
);

x.eols_len = eols_end - x.eols_start;
}
}