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

Fix semantic token generation for container fields with a byte alignment

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

10
src/semantic_tokens.zig
View File

@ -1017,20 +1017,20 @@ fn writeContainerField(
if (field_token_type) |tok_type| try writeToken(builder, container_field.ast.name_token, tok_type); if (field_token_type) |tok_type| try writeToken(builder, container_field.ast.name_token, tok_type);
if (container_field.ast.type_expr != 0) { if (container_field.ast.type_expr != 0) {
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, container_field.ast.type_expr });
if (container_field.ast.align_expr != 0) { if (container_field.ast.align_expr != 0) {
try writeToken(builder, tree.firstToken(container_field.ast.align_expr) - 2, .keyword); try writeToken(builder, tree.firstToken(container_field.ast.align_expr) - 2, .keyword);
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, container_field.ast.align_expr }); try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, container_field.ast.align_expr });
} }
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, container_field.ast.type_expr });
} }
if (container_field.ast.value_expr != 0) block: { if (container_field.ast.value_expr != 0) block: {
const eq_tok: ast.TokenIndex = if (container_field.ast.type_expr != 0) const eq_tok: ast.TokenIndex = if (container_field.ast.align_expr != 0)
lastToken(tree, container_field.ast.align_expr) + 2
else if (container_field.ast.type_expr != 0)
lastToken(tree, container_field.ast.type_expr) + 1 lastToken(tree, container_field.ast.type_expr) + 1
else if (container_field.ast.align_expr != 0)
lastToken(tree, container_field.ast.align_expr) + 1
else else
break :block; // Check this, I believe it is correct. break :block;
try writeToken(builder, eq_tok, .operator); try writeToken(builder, eq_tok, .operator);
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, container_field.ast.value_expr }); try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, container_field.ast.value_expr });