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

Merge pull request #334 from jedisct1/master-sync

Browse Source 
Update for -master
This commit is contained in:
Alexandros Naskos
2021-05-24 10:52:34 +03:00
committed by GitHub
parent b33cb8fc0d df9560db51
commit 4855a7b85d
3 changed files with 402 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

782
src/data/master.zig
View File

File diff suppressed because it is too large Load Diff

2
src/main.zig
View File

@@ -243,7 +243,7 @@ fn publishDiagnostics(arena: *std.heap.ArenaAllocator, handle: DocumentStore.Han
=> blk: { => blk: {
var buf: [1]std.zig.ast.Node.Index = undefined; var buf: [1]std.zig.ast.Node.Index = undefined;
const func = analysis.fnProto(tree, decl_idx, &buf).?; const func = analysis.fnProto(tree, decl_idx, &buf).?;
if (func.extern_export_token != null) break :blk; if (func.extern_export_inline_token != null) break :blk;
if (config.warn_style) { if (config.warn_style) {
if (func.name_token) |name_token| { if (func.name_token) |name_token| {

2
src/semantic_tokens.zig
View File

@@ -455,7 +455,7 @@ fn writeNodeTokens(
try writeDocComments(builder, tree, docs); try writeDocComments(builder, tree, docs);
try writeToken(builder, fn_proto.visib_token, .keyword); try writeToken(builder, fn_proto.visib_token, .keyword);
try writeToken(builder, fn_proto.extern_export_token, .keyword); try writeToken(builder, fn_proto.extern_export_inline_token, .keyword);
try writeToken(builder, fn_proto.lib_name, .string); try writeToken(builder, fn_proto.lib_name, .string);
try writeToken(builder, fn_proto.ast.fn_token, .keyword); try writeToken(builder, fn_proto.ast.fn_token, .keyword);