Skip to content

Commit f5e81fd

Browse files
committed
refactor: remove addOrigRange
1 parent da8dfac commit f5e81fd

File tree

3 files changed

+13
-62
lines changed

3 files changed

+13
-62
lines changed

src/parse.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ import { removeCstBlankLine } from "./preprocess.js";
66
import Context from "./transforms/context.js";
77
import { transformError } from "./transforms/error.js";
88
import { type Root } from "./types.js";
9-
import { addOrigRange } from "./utils/add-orig-range.js";
109
import { removeFakeNodes } from "./utils/remove-fake-nodes.js";
1110
import { updatePositions } from "./utils/update-positions.js";
1211

1312
export function parse(text: string): Root {
1413
const cst = parseCST(text);
15-
16-
addOrigRange(cst);
14+
const context = new Context(cst, text);
15+
context.setOrigRanges();
1716

1817
const documents = cst.map(cstDocument =>
1918
new Document({
@@ -22,8 +21,6 @@ export function parse(text: string): Root {
2221
}).parse(cstDocument),
2322
);
2423

25-
const context = new Context(cst, text);
26-
2724
for (const document of documents) {
2825
for (const error of document.errors) {
2926
if (
@@ -39,7 +36,7 @@ export function parse(text: string): Root {
3936
documents.forEach(document => removeCstBlankLine(document.cstNode!));
4037

4138
const root = createRoot(
42-
context.transformRange({ origStart: 0, origEnd: context.text.length }),
39+
context.transformRange({ origStart: 0, origEnd: text.length }),
4340
documents.map(document => context.transformNode(document)),
4441
context.comments,
4542
);

src/transforms/context.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@ class Context {
3737
this.#cst = cst;
3838
}
3939

40+
setOrigRanges() {
41+
if (this.#cst.setOrigRanges()) {
42+
return;
43+
}
44+
45+
for (const document of this.#cst) {
46+
document.setOrigRanges([], 0);
47+
}
48+
}
49+
4050
#getRangePosition(range: Range): { start: Point; end: Point } {
4151
if (!rangeAsLinePosGetter) {
4252
const [document] = this.#cst;

src/utils/add-orig-range.ts

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)