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

Fixed incremental document updates

Browse Source
This commit is contained in:
Alexandros Naskos 2020-11-06 12:32:21 +02:00
parent d877019abe
commit 8e0dc3da19
No known key found for this signature in database
GPG Key ID: 02BF2E72B0EA32D2
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/document_store.zig
View File

@ -410,12 +410,15 @@ pub fn applyChanges(
self: *DocumentStore, self: *DocumentStore,
handle: *Handle, handle: *Handle,
content_changes: std.json.Array, content_changes: std.json.Array,
offset_encoding: offsets.Encoding,
zig_lib_path: ?[]const u8, zig_lib_path: ?[]const u8,
) !void { ) !void {
const document = &handle.document; const document = &handle.document;
for (content_changes.items) |change| { for (content_changes.items) |change| {
if (change.Object.get("range")) |range| { if (change.Object.get("range")) |range| {
std.debug.assert(document.text.ptr == document.mem.ptr);
const start_pos = types.Position{ const start_pos = types.Position{
.line = range.Object.get("start").?.Object.get("line").?.Integer, .line = range.Object.get("start").?.Object.get("line").?.Integer,
.character = range.Object.get("start").?.Object.get("character").?.Integer, .character = range.Object.get("start").?.Object.get("character").?.Integer,
@ -425,13 +428,13 @@ pub fn applyChanges(
.character = range.Object.get("end").?.Object.get("character").?.Integer, .character = range.Object.get("end").?.Object.get("character").?.Integer,
}; };
const change_text = change.Object.get("text").?.String;
const start_index = (try offsets.documentPosition(document.*, start_pos, .utf16)).absolute_index; const change_text = change.Object.get("text").?.String;
const end_index = (try offsets.documentPosition(document.*, end_pos, .utf16)).absolute_index; const start_index = (try offsets.documentPosition(document.*, start_pos, offset_encoding)).absolute_index;
const end_index = (try offsets.documentPosition(document.*, end_pos, offset_encoding)).absolute_index;
const old_len = document.text.len; const old_len = document.text.len;
const new_len = old_len + change_text.len; const new_len = old_len - (end_index - start_index) + change_text.len;
if (new_len > document.mem.len) { if (new_len > document.mem.len) {
// We need to reallocate memory. // We need to reallocate memory.
// We reallocate twice the current filesize or the new length, if it's more than that // We reallocate twice the current filesize or the new length, if it's more than that
@ -444,7 +447,11 @@ pub fn applyChanges(
// The first part of the string, [0 .. start_index] need not be changed. // The first part of the string, [0 .. start_index] need not be changed.
// We then copy the last part of the string, [end_index ..] to its // We then copy the last part of the string, [end_index ..] to its
// new position, [start_index + change_len .. ] // new position, [start_index + change_len .. ]
std.mem.copy(u8, document.mem[start_index + change_text.len ..][0 .. old_len - end_index], document.mem[end_index..old_len]); if (new_len < old_len) {
std.mem.copy(u8, document.mem[start_index + change_text.len ..][0 .. old_len - end_index], document.mem[end_index..old_len]);
} else {
std.mem.copyBackwards(u8, document.mem[start_index + change_text.len ..][0 .. old_len - end_index], document.mem[end_index..old_len]);
}
// Finally, we copy the changes over. // Finally, we copy the changes over.
std.mem.copy(u8, document.mem[start_index..][0..change_text.len], change_text); std.mem.copy(u8, document.mem[start_index..][0..change_text.len], change_text);

4
src/main.zig
View File

@ -1131,7 +1131,7 @@ fn initializeHandler(arena: *std.heap.ArenaAllocator, id: types.RequestId, req:
.signatureHelpProvider = .{ .signatureHelpProvider = .{
.triggerCharacters = &[_][]const u8{ "(", "," }, .triggerCharacters = &[_][]const u8{ "(", "," },
}, },
.textDocumentSync = .Full, .textDocumentSync = .Incremental,
.renameProvider = true, .renameProvider = true,
.completionProvider = .{ .completionProvider = .{
.resolveProvider = false, .resolveProvider = false,
@ -1237,7 +1237,7 @@ fn changeDocumentHandler(arena: *std.heap.ArenaAllocator, id: types.RequestId, r
}; };
const local_config = configFromUriOr(req.params.textDocument.uri, config); const local_config = configFromUriOr(req.params.textDocument.uri, config);
try document_store.applyChanges(handle, req.params.contentChanges.Array, local_config.zig_lib_path); try document_store.applyChanges(handle, req.params.contentChanges.Array, offset_encoding, local_config.zig_lib_path);
try publishDiagnostics(arena, handle.*, local_config); try publishDiagnostics(arena, handle.*, local_config);
} }