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

Fixed highlighting of comments before the first token and after the last token of the last valid AST node

Browse Source
This commit is contained in:
Alexandros Naskos 2021-05-03 15:14:11 +03:00
parent d73d7fc748
commit ab8c65eeda
No known key found for this signature in database
GPG Key ID: 02BF2E72B0EA32D2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/semantic_tokens.zig
View File

@ -88,14 +88,24 @@ const Builder = struct {
} }
} }
self.previous_token = token; self.previous_token = token;
if (token > 0) { try self.handleComments(if (token > 0) starts[token - 1] else 0, next_start);
try handleComments(self, starts[token - 1], next_start);
}
const length = offsets.tokenLength(tree, token, self.encoding); const length = offsets.tokenLength(tree, token, self.encoding);
try self.addDirect(token_type, token_modifiers, next_start, length); try self.addDirect(token_type, token_modifiers, next_start, length);
} }
fn finish(self: *Builder) !void {
const starts = self.handle.tree.tokens.items(.start);
const last_token = self.previous_token orelse 0;
var i = last_token + 1;
while (i < starts.len) : (i += 1) {
try handleComments(self, starts[i - 1], starts[i]);
try handleToken(self, i);
}
try self.handleComments(starts[starts.len - 1], self.handle.tree.source.len);
}
/// Highlight a token without semantic context. /// Highlight a token without semantic context.
fn handleToken(self: *Builder, tok: ast.TokenIndex) !void { fn handleToken(self: *Builder, tok: ast.TokenIndex) !void {
const tree = self.handle.tree; const tree = self.handle.tree;
@ -138,7 +148,7 @@ const Builder = struct {
if (i + 2 < to and (source[i + 2] == '!' or source[i + 2] == '/')) if (i + 2 < to and (source[i + 2] == '!' or source[i + 2] == '/'))
mods.documentation = true; mods.documentation = true;
while (i < to and source[i] != '\n') : (i += 1) {} while (i < to - 1 and source[i] != '\n') : (i += 1) {}
const length = try offsets.lineSectionLength(self.handle.tree, comment_start, i, self.encoding); const length = try offsets.lineSectionLength(self.handle.tree, comment_start, i, self.encoding);
try self.addDirect(TokenType.comment, mods, comment_start, length); try self.addDirect(TokenType.comment, mods, comment_start, length);
@ -1039,6 +1049,6 @@ pub fn writeAllSemanticTokens(
for (declMembers(handle.tree, 0, &buf)) |child| { for (declMembers(handle.tree, 0, &buf)) |child| {
try writeNodeTokens(&builder, arena, store, child); try writeNodeTokens(&builder, arena, store, child);
} }
try builder.finish();
return builder.toOwnedSlice(); return builder.toOwnedSlice();
} }