sylv/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Completely overhaul offsets.zig (#643)

Browse Source 
* completely overhaul offsets.zig
This commit is contained in:
Techatrix
2022-09-16 00:33:49 +00:00
committed by GitHub
parent 5aff17afb0
commit e28549fa7d
14 changed files with 734 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/lsp_features/inlay_hints.zig
View File

@@ -5,6 +5,7 @@ const helper = @import("helper");
const Context = @import("context").Context;
const types = zls.types;
const offsets = zls.offsets;
const requests = zls.requests;
const allocator: std.mem.Allocator = std.testing.allocator;
@@ -89,7 +90,7 @@ fn testInlayHints(source: []const u8) !void {
const range = types.Range{
.start = types.Position{ .line = 0, .character = 0 },
.end = sourceIndexPosition(phr.source, phr.source.len),
.end = offsets.indexToPosition(phr.source, phr.source.len, .utf16),
};
const method = try std.json.stringifyAlloc(allocator, .{
@@ -130,7 +131,7 @@ fn testInlayHints(source: []const u8) !void {
outer: for (phr.placeholder_locations) |loc, i| {
const name = phr.placeholders[i].placeholderSlice(source);
const position = sourceIndexPosition(phr.source, loc);
const position = offsets.indexToPosition(phr.source, loc, .utf16);
for (hints) |hint| {
if (position.line != hint.position.line or position.character != hint.position.character) continue;
@@ -146,14 +147,3 @@ fn testInlayHints(source: []const u8) !void {
return error.PlaceholderNotFound;
}
}
fn sourceIndexPosition(source: []const u8, index: usize) types.Position {
const line = std.mem.count(u8, source[0..index], &.{'\n'});
const last_line_index = if (std.mem.lastIndexOfScalar(u8, source[0..index], '\n')) |idx| idx + 1 else 0;
const last_line_character = index - last_line_index;
return types.Position{
.line = @intCast(i64, line),
.character = @intCast(i64, last_line_character),
};
}