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

simplify formatting handler (#916)

Browse Source
This commit is contained in:
Techatrix 2023-01-16 19:47:55 +01:00 committed by GitHub
parent 4e4761b34c
commit af85a9550d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Server.zig
View File

@ -2263,27 +2263,16 @@ fn formattingHandler(server: *Server, request: types.DocumentFormattingParams) E
if (std.mem.eql(u8, handle.text, formatted)) return null;
// avoid computing diffs if the output is small
const maybe_edits = if (formatted.len <= 512) null else diff.edits(allocator, handle.text, formatted) catch null;
const edits = maybe_edits orelse {
// if edits have been computed we replace the entire file with the formatted text
return &[1]types.TextEdit{.{
if (formatted.len <= 512) {
var text_edits = try allocator.alloc(types.TextEdit, 1);
text_edits[0] = .{
.range = offsets.locToRange(handle.text, .{ .start = 0, .end = handle.text.len }, server.offset_encoding),
.newText = formatted,
}};
};
// Convert from `[]diff.Edit` to `[]types.TextEdit`
var text_edits = try std.ArrayListUnmanaged(types.TextEdit).initCapacity(allocator, edits.items.len);
for (edits.items) |edit| {
text_edits.appendAssumeCapacity(.{
.range = edit.range,
.newText = edit.newText.items,
});
};
return text_edits;
}
return text_edits.items;
return if (diff.edits(allocator, handle.text, formatted)) |text_edits| text_edits.items else |_| null;
}
fn didChangeConfigurationHandler(server: *Server, request: configuration.DidChangeConfigurationParams) Error!void {

25
src/diff.zig
View File

@ -4,13 +4,6 @@ const offsets = @import("offsets.zig");
pub const Error = error{ OutOfMemory, InvalidRange };
// This is essentially the same as `types.TextEdit`, but we use an
// ArrayList(u8) here to be able to clean up the memory later on
pub const Edit = struct {
range: types.Range,
newText: std.ArrayListUnmanaged(u8),
};
// Whether the `Change` is an addition, deletion, or no change from the
// original string to the new string
const Operation = enum { Deletion, Addition, Nothing };
@ -28,7 +21,7 @@ pub fn edits(
allocator: std.mem.Allocator,
a: []const u8,
b: []const u8,
) Error!std.ArrayListUnmanaged(Edit) {
) Error!std.ArrayListUnmanaged(types.TextEdit) {
// Given the input strings A and B, we skip over the first N characters
// where A[0..N] == B[0..N]. We want to trim the start (and end) of the
// strings that have the same text. This decreases the size of the LCS
@ -186,7 +179,7 @@ pub fn get_changes(
a_trim: []const u8,
b_trim: []const u8,
allocator: std.mem.Allocator,
) Error!std.ArrayListUnmanaged(Edit) {
) Error!std.ArrayListUnmanaged(types.TextEdit) {
// First we get a list of changes between strings at the character level:
// "addition", "deletion", and "no change" for each character
var changes = try std.ArrayListUnmanaged(Change).initCapacity(allocator, a_trim.len);
@ -235,14 +228,20 @@ pub fn get_changes(
std.mem.reverse([]Change, groups.items);
for (groups.items) |group| std.mem.reverse(Change, group);
var edit_results = std.ArrayListUnmanaged(Edit){};
errdefer edit_results.deinit(allocator);
var edit_results = try std.ArrayListUnmanaged(types.TextEdit).initCapacity(allocator, groups.items.len);
errdefer {
for (edit_results.items) |edit| {
allocator.free(edit.newText);
}
edit_results.deinit(allocator);
}
// Convert our grouped changes into `Edit`s
for (groups.items) |group| {
var range_start = group[0].pos;
var range_len: usize = 0;
var newText = std.ArrayListUnmanaged(u8){};
errdefer newText.deinit(allocator);
for (group) |ch| {
switch (ch.operation) {
.Addition => try newText.append(allocator, ch.value.?),
@ -256,9 +255,9 @@ pub fn get_changes(
a_trim_offset + range_start + range_len,
);
a_lines.reset();
try edit_results.append(allocator, Edit{
edit_results.appendAssumeCapacity(.{
.range = range,
.newText = newText,
.newText = try newText.toOwnedSlice(allocator),
});
}