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

Fixed semantic token hihglighting issue when a regular comment was following a doc comment

Browse Source
This commit is contained in:
Alexandros Naskos 2021-01-12 14:05:08 +02:00
parent e7f8a8dcd9
commit 87b7954669
No known key found for this signature in database
GPG Key ID: 02BF2E72B0EA32D2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/semantic_tokens.zig
View File

@ -68,6 +68,10 @@ const Builder = struct {
self.handle.tree.token_locs[current_token].start self.handle.tree.token_locs[current_token].start
else else
0; 0;
if (start_idx > self.handle.tree.token_locs[token].start)
return;
const delta_loc = offsets.tokenRelativeLocation(self.handle.tree, start_idx, token, self.encoding) catch return; const delta_loc = offsets.tokenRelativeLocation(self.handle.tree, start_idx, token, self.encoding) catch return;
try self.arr.appendSlice(&[_]u32{ try self.arr.appendSlice(&[_]u32{
@truncate(u32, delta_loc.line), @truncate(u32, delta_loc.line),
@ -129,8 +133,8 @@ const GapHighlighter = struct {
const tok_id = self.builder.handle.tree.token_ids[tok]; const tok_id = self.builder.handle.tree.token_ids[tok];
if (tok_id == .LineComment) { if (tok_id == .LineComment) {
try writeToken(self.builder, tok, .comment); try writeToken(self.builder, tok, .comment);
} else if (tok_id == .ContainerDocComment) { } else if (tok_id == .ContainerDocComment or tok_id == .DocComment) {
try writeTokenMod(self.builder, tok, .comment, TokenModifiers{ .documentation = true }); try writeTokenMod(self.builder, tok, .comment, .{ .documentation = true });
} else if (@enumToInt(tok_id) >= @enumToInt(std.zig.Token.Id.Keyword_align) and } else if (@enumToInt(tok_id) >= @enumToInt(std.zig.Token.Id.Keyword_align) and
@enumToInt(tok_id) <= @enumToInt(std.zig.Token.Id.Keyword_while)) @enumToInt(tok_id) <= @enumToInt(std.zig.Token.Id.Keyword_while))
{ {