Skip to content

Commit 2b14abc

Browse files
committed
refactor(napi/parser): shorten raw transfer deserializer for Comment (#14623)
Pure refactor. Shorten the raw transfer code for `Comment`, removing an unnecessary temp var. This also prepares the way for #14624, working around a bug in the codegen where preamble can get inserted after code that uses vars defined in that preamble.
1 parent 77c4aa0 commit 2b14abc

File tree

10 files changed

+19
-31
lines changed

10 files changed

+19
-31
lines changed

apps/oxlint/src-js/generated/deserialize.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5579,9 +5579,8 @@ function deserializeComment(pos) {
55795579
end,
55805580
range: [start, end],
55815581
parent,
5582-
},
5583-
endCut = type === 'Line' ? 0 : 2;
5584-
node.value = sourceText.slice(start + 2, end - endCut);
5582+
};
5583+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
55855584
parent = previousParent;
55865585
return node;
55875586
}

crates/oxc_ast/src/serialize/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,7 @@ fn get_ts_start_span(program: &Program<'_>) -> u32 {
235235
#[ast_meta]
236236
#[estree(
237237
ts_type = "string",
238-
raw_deser = "
239-
const endCut = THIS.type === 'Line' ? 0 : 2;
240-
SOURCE_TEXT.slice(THIS.start + 2, THIS.end - endCut)
241-
"
238+
raw_deser = "SOURCE_TEXT.slice(THIS.start + 2, THIS.end - (THIS.type === 'Line' ? 0 : 2))"
242239
)]
243240
pub struct CommentValue<'b>(#[expect(dead_code)] pub &'b Comment);
244241

napi/parser/generated/deserialize/js.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4187,9 +4187,8 @@ function deserializeComment(pos) {
41874187
value: null,
41884188
start,
41894189
end,
4190-
},
4191-
endCut = type === 'Line' ? 0 : 2;
4192-
node.value = sourceText.slice(start + 2, end - endCut);
4190+
};
4191+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
41934192
return node;
41944193
}
41954194

napi/parser/generated/deserialize/js_parent.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4914,9 +4914,8 @@ function deserializeComment(pos) {
49144914
start,
49154915
end,
49164916
parent,
4917-
},
4918-
endCut = type === 'Line' ? 0 : 2;
4919-
node.value = sourceText.slice(start + 2, end - endCut);
4917+
};
4918+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
49204919
parent = previousParent;
49214920
return node;
49224921
}

napi/parser/generated/deserialize/js_range.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4605,9 +4605,8 @@ function deserializeComment(pos) {
46054605
start,
46064606
end,
46074607
range: [start, end],
4608-
},
4609-
endCut = type === 'Line' ? 0 : 2;
4610-
node.value = sourceText.slice(start + 2, end - endCut);
4608+
};
4609+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
46114610
return node;
46124611
}
46134612

napi/parser/generated/deserialize/js_range_parent.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5128,9 +5128,8 @@ function deserializeComment(pos) {
51285128
end,
51295129
range: [start, end],
51305130
parent,
5131-
},
5132-
endCut = type === 'Line' ? 0 : 2;
5133-
node.value = sourceText.slice(start + 2, end - endCut);
5131+
};
5132+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
51345133
parent = previousParent;
51355134
return node;
51365135
}

napi/parser/generated/deserialize/ts.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4449,9 +4449,8 @@ function deserializeComment(pos) {
44494449
value: null,
44504450
start,
44514451
end,
4452-
},
4453-
endCut = type === 'Line' ? 0 : 2;
4454-
node.value = sourceText.slice(start + 2, end - endCut);
4452+
};
4453+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
44554454
return node;
44564455
}
44574456

napi/parser/generated/deserialize/ts_parent.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5180,9 +5180,8 @@ function deserializeComment(pos) {
51805180
start,
51815181
end,
51825182
parent,
5183-
},
5184-
endCut = type === 'Line' ? 0 : 2;
5185-
node.value = sourceText.slice(start + 2, end - endCut);
5183+
};
5184+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
51865185
parent = previousParent;
51875186
return node;
51885187
}

napi/parser/generated/deserialize/ts_range.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4865,9 +4865,8 @@ function deserializeComment(pos) {
48654865
start,
48664866
end,
48674867
range: [start, end],
4868-
},
4869-
endCut = type === 'Line' ? 0 : 2;
4870-
node.value = sourceText.slice(start + 2, end - endCut);
4868+
};
4869+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
48714870
return node;
48724871
}
48734872

napi/parser/generated/deserialize/ts_range_parent.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5401,9 +5401,8 @@ function deserializeComment(pos) {
54015401
end,
54025402
range: [start, end],
54035403
parent,
5404-
},
5405-
endCut = type === 'Line' ? 0 : 2;
5406-
node.value = sourceText.slice(start + 2, end - endCut);
5404+
};
5405+
node.value = sourceText.slice(start + 2, end - (type === 'Line' ? 0 : 2));
54075406
parent = previousParent;
54085407
return node;
54095408
}

0 commit comments

Comments
 (0)