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

Added keywordLiteral token type for null, true, false, undefined, unreachable, fixed all pointer type semantic token generation

Browse Source
This commit is contained in:
Alexandros Naskos 2020-10-04 13:10:48 +03:00
parent bfb96d951b
commit a2265afce0
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.zig
View File

@ -92,7 +92,7 @@ var client_capabilities = ClientCapabilities{};
var offset_encoding = offsets.Encoding.utf16;
const initialize_capabilities =
\\"capabilities": {"signatureHelpProvider": {"triggerCharacters": ["(",","]},"textDocumentSync": 1,"renameProvider":true,"completionProvider": {"resolveProvider": false,"triggerCharacters": [".",":","@"]},"documentHighlightProvider": false,"hoverProvider": true,"codeActionProvider": false,"declarationProvider": true,"definitionProvider": true,"typeDefinitionProvider": true,"implementationProvider": false,"referencesProvider": true,"documentSymbolProvider": true,"colorProvider": false,"documentFormattingProvider": true,"documentRangeFormattingProvider": false,"foldingRangeProvider": false,"selectionRangeProvider": false,"workspaceSymbolProvider": false,"rangeProvider": false,"documentProvider": true,"workspace": {"workspaceFolders": {"supported": true,"changeNotifications": true}},"semanticTokensProvider": {"documentProvider": true,"legend": {"tokenTypes": ["namespace","type","struct","enum","union","parameter","variable","tagField","field","errorTag","function","keyword","comment","string","number","operator","builtin","label"],"tokenModifiers": ["definition","async","documentation", "generic"]}}}}}
\\"capabilities": {"signatureHelpProvider": {"triggerCharacters": ["(",","]},"textDocumentSync": 1,"renameProvider":true,"completionProvider": {"resolveProvider": false,"triggerCharacters": [".",":","@"]},"documentHighlightProvider": false,"hoverProvider": true,"codeActionProvider": false,"declarationProvider": true,"definitionProvider": true,"typeDefinitionProvider": true,"implementationProvider": false,"referencesProvider": true,"documentSymbolProvider": true,"colorProvider": false,"documentFormattingProvider": true,"documentRangeFormattingProvider": false,"foldingRangeProvider": false,"selectionRangeProvider": false,"workspaceSymbolProvider": false,"rangeProvider": false,"documentProvider": true,"workspace": {"workspaceFolders": {"supported": true,"changeNotifications": true}},"semanticTokensProvider": {"documentProvider": true,"legend": {"tokenTypes": ["namespace","type","struct","enum","union","parameter","variable","tagField","field","errorTag","function","keyword","comment","string","number","operator","builtin","label","keywordLiteral"],"tokenModifiers": ["definition","async","documentation", "generic"]}}}}}
;
const initialize_response = ",\"result\": {" ++ initialize_capabilities;

58
src/semantic_tokens.zig
View File

@ -23,6 +23,7 @@ const TokenType = enum(u32) {
operator,
builtin,
label,
keywordLiteral,
};
const TokenModifiers = packed struct {
@ -135,7 +136,17 @@ const GapHighlighter = struct {
} else if (@enumToInt(tok_id) >= @enumToInt(std.zig.Token.Id.Keyword_align) and
@enumToInt(tok_id) <= @enumToInt(std.zig.Token.Id.Keyword_while))
{
try writeToken(self.builder, tok, .keyword);
const tok_type: TokenType = switch (tok_id) {
.Keyword_true,
.Keyword_false,
.Keyword_null,
.Keyword_undefined,
.Keyword_unreachable,
=> .keywordLiteral,
else => .keyword,
};
try writeToken(self.builder, tok, tok_type);
} else if (@enumToInt(tok_id) >= @enumToInt(std.zig.Token.Id.Bang) and
@enumToInt(tok_id) <= @enumToInt(std.zig.Token.Id.Tilde) and
tok_id != .Period and tok_id != .Comma and tok_id != .RParen and
@ -614,7 +625,10 @@ fn writeNodeTokens(builder: *Builder, arena: *std.heap.ArenaAllocator, store: *D
const multi_line = node.cast(ast.Node.MultilineStringLiteral).?;
for (multi_line.linesConst()) |line| try writeToken(builder, line, .string);
},
.BoolLiteral, .NullLiteral, .UndefinedLiteral, .Unreachable, .ErrorType => {
.BoolLiteral, .NullLiteral, .UndefinedLiteral, .Unreachable => {
try writeToken(builder, node.firstToken(), .keywordLiteral);
},
.ErrorType => {
try writeToken(builder, node.firstToken(), .keyword);
},
.Asm => {
@ -715,16 +729,48 @@ fn writeNodeTokens(builder: *Builder, arena: *std.heap.ArenaAllocator, store: *D
},
.PtrType => {
const pointer_type = node.castTag(.PtrType).?;
try writeToken(builder, pointer_type.op_token, .operator);
const ptr_info = pointer_type.ptr_info;
const tok_ids = builder.handle.tree.token_ids;
const ptr_info = switch(tok_ids[pointer_type.op_token]) {
.AsteriskAsterisk => pointer_type.rhs.castTag(.PtrType).?.ptr_info,
else => pointer_type.ptr_info,
};
const rhs = switch(tok_ids[pointer_type.op_token]) {
.AsteriskAsterisk => pointer_type.rhs.castTag(.PtrType).?.rhs,
else => pointer_type.rhs,
};
const off = switch (tok_ids[pointer_type.op_token]) {
.Asterisk, .AsteriskAsterisk => blk: {
try writeToken(builder, pointer_type.op_token, .operator);
break :blk pointer_type.op_token + 1;
},
.LBracket => blk: {
try writeToken(builder, pointer_type.op_token + 1, .operator);
const is_c_ptr = tok_ids[pointer_type.op_token + 2] == .Identifier;
if (is_c_ptr) {
try writeToken(builder, pointer_type.op_token + 2, .operator);
}
if (ptr_info.sentinel) |sentinel| {
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, sentinel });
break :blk sentinel.lastToken() + 2;
}
break :blk pointer_type.op_token + 3 + @boolToInt(is_c_ptr);
},
else => 0,
};
if (ptr_info.align_info) |align_info| {
try writeToken(builder, pointer_type.op_token + 1, .keyword);
try writeToken(builder, off, .keyword);
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, align_info.node });
}
try writeToken(builder, ptr_info.const_token, .keyword);
try writeToken(builder, ptr_info.volatile_token, .keyword);
try writeToken(builder, ptr_info.allowzero_token, .keyword);
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, pointer_type.rhs });
try await @asyncCall(child_frame, {}, writeNodeTokens, .{ builder, arena, store, rhs });
},
.ArrayType => {
const array_type = node.castTag(.ArrayType).?;