mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-16 22:01:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dylan/printer-safety

Browse Source
This commit is contained in:
Dylan Conway
2025-09-19 17:30:31 -07:00
parent 691c5f2ff6 b2b1bc9ba8
commit 9ece7aa41e
117 changed files with 11255 additions and 9449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sourcemap/sourcemap.zig
View File

@@ -218,7 +218,7 @@ pub fn parseJSON(
const mapping, const source_index = switch (hint) {
.source_only => |index| .{ null, index },
.all => |loc| brk: {
const mapping = map.?.mappings.find(loc.line, loc.column) orelse
const mapping = map.?.mappings.find(.fromZeroBased(loc.line), .fromZeroBased(loc.column)) orelse
break :brk .{ null, null };
break :brk .{ mapping, std.math.cast(u32, mapping.source_index) };
},
@@ -315,14 +315,14 @@ pub const Mapping = struct {
this.impl = .{ .with_names = with_names };
}
fn findIndexFromGenerated(line_column_offsets: []const LineColumnOffset, line: i32, column: i32) ?usize {
fn findIndexFromGenerated(line_column_offsets: []const LineColumnOffset, line: bun.Ordinal, column: bun.Ordinal) ?usize {
var count = line_column_offsets.len;
var index: usize = 0;
while (count > 0) {
const step = count / 2;
const i: usize = index + step;
const mapping = line_column_offsets[i];
if (mapping.lines.zeroBased() < line or (mapping.lines.zeroBased() == line and mapping.columns.zeroBased() <= column)) {
if (mapping.lines.zeroBased() < line.zeroBased() or (mapping.lines.zeroBased() == line.zeroBased() and mapping.columns.zeroBased() <= column.zeroBased())) {
index = i + 1;
count -|= step + 1;
} else {
@@ -331,7 +331,7 @@ pub const Mapping = struct {
}
if (index > 0) {
if (line_column_offsets[index - 1].lines.zeroBased() == line) {
if (line_column_offsets[index - 1].lines.zeroBased() == line.zeroBased()) {
return index - 1;
}
}
@@ -339,7 +339,7 @@ pub const Mapping = struct {
return null;
}
pub fn findIndex(this: *const List, line: i32, column: i32) ?usize {
pub fn findIndex(this: *const List, line: bun.Ordinal, column: bun.Ordinal) ?usize {
switch (this.impl) {
inline else => |*list| {
if (findIndexFromGenerated(list.items(.generated), line, column)) |i| {
@@ -383,7 +383,7 @@ pub const Mapping = struct {
}
}
pub fn find(this: *const List, line: i32, column: i32) ?Mapping {
pub fn find(this: *const List, line: bun.Ordinal, column: bun.Ordinal) ?Mapping {
switch (this.impl) {
inline else => |*list, tag| {
if (findIndexFromGenerated(list.items(.generated), line, column)) |i| {
@@ -1356,8 +1356,8 @@ pub const SourceContent = struct {
pub fn find(
this: *const SourceMap,
line: i32,
column: i32,
line: bun.Ordinal,
column: bun.Ordinal,
) ?Mapping {
return this.mapping.find(line, column);
}