more fixes
This commit is contained in:
SuperAuguste
parent
ce841d1dc4
commit
20f440b3a0
|
|
@ -7,9 +7,9 @@ const offsets = @import("offsets.zig");
|
|||
/// Get a declaration's doc comment node
|
||||
fn getDocCommentNode(tree: *ast.Tree, node: *ast.Node) ?*ast.Node.DocComment {
|
||||
if (node.castTag(.FnProto)) |func| {
|
||||
return func.doc_comments;
|
||||
return func.getTrailer("doc_comments");
|
||||
} else if (node.castTag(.VarDecl)) |var_decl| {
|
||||
return var_decl.doc_comments;
|
||||
return var_decl.getTrailer("doc_comments");
|
||||
} else if (node.castTag(.ContainerField)) |field| {
|
||||
return field.doc_comments;
|
||||
} else if (node.castTag(.ErrorTag)) |tag| {
|
||||
|
|
@ -182,7 +182,7 @@ pub fn getDeclNameToken(tree: *ast.Tree, node: *ast.Node) ?ast.TokenIndex {
|
|||
},
|
||||
.FnProto => {
|
||||
const func = node.castTag(.FnProto).?;
|
||||
if (func.name_token == null) return null;
|
||||
if (func.getTrailer("name_token") == null) return null;
|
||||
return func.name_token.?;
|
||||
},
|
||||
.ContainerField => {
|
||||
|
|
@ -274,11 +274,10 @@ pub fn resolveVarDeclAlias(store: *DocumentStore, arena: *std.heap.ArenaAllocato
|
|||
const handle = decl_handle.handle;
|
||||
|
||||
if (decl.castTag(.VarDecl)) |var_decl| {
|
||||
if (var_decl.init_node == null) return null;
|
||||
if (!var_decl.trailer_flags.has("init_node")) return null;
|
||||
if (handle.tree.token_ids[var_decl.mut_token] != .Keyword_const) return null;
|
||||
if (var_decl.init_node == null) return null;
|
||||
|
||||
const base_expr = var_decl.init_node.?;
|
||||
const base_expr = var_decl.getTrailer("init_node").?;
|
||||
if (base_expr.castTag(.InfixOp)) |infix_op| {
|
||||
if (infix_op.op != .Period) return null;
|
||||
const name = handle.tree.tokenSlice(infix_op.rhs.firstToken());
|
||||
|
|
@ -970,7 +969,7 @@ pub fn collectImports(import_arr: *std.ArrayList([]const u8), tree: *ast.Tree) !
|
|||
for (tree.root_node.decls()) |decl| {
|
||||
if (decl.tag != .VarDecl) continue;
|
||||
const var_decl = decl.castTag(.VarDecl).?;
|
||||
if (var_decl.init_node == null) continue;
|
||||
if (!var_decl.trailer_flags.has("init_node")) continue;
|
||||
|
||||
switch (var_decl.init_node.?.tag) {
|
||||
.BuiltinCall => {
|
||||
|
|
@ -1131,11 +1130,11 @@ pub fn isNodePublic(tree: *ast.Tree, node: *ast.Node) bool {
|
|||
switch (node.tag) {
|
||||
.VarDecl => {
|
||||
const var_decl = node.castTag(.VarDecl).?;
|
||||
return var_decl.visib_token != null;
|
||||
return var_decl.trailer_flags.has("visib_token");
|
||||
},
|
||||
.FnProto => {
|
||||
const func = node.castTag(.FnProto).?;
|
||||
return func.visib_token != null;
|
||||
return func.trailer_flags.has("visib_token");
|
||||
},
|
||||
else => return true,
|
||||
}
|
||||
|
|
@ -1157,7 +1156,7 @@ pub fn nodeToString(tree: *ast.Tree, node: *ast.Node) ?[]const u8 {
|
|||
},
|
||||
.FnProto => {
|
||||
const func = node.castTag(.FnProto).?;
|
||||
if (func.name_token) |name_token| {
|
||||
if (func.getTrailer("name_token")) |name_token| {
|
||||
return tree.tokenSlice(name_token);
|
||||
}
|
||||
},
|
||||
|
|
@ -1351,7 +1350,61 @@ pub fn documentPositionContext(arena: *std.heap.ArenaAllocator, document: types.
|
|||
|
||||
fn addOutlineNodes(allocator: *std.mem.Allocator, tree: *ast.Tree, child: *ast.Node, context: *GetDocumentSymbolsContext) anyerror!void {
|
||||
switch (child.tag) {
|
||||
.StringLiteral, .IntegerLiteral, .BuiltinCall, .Call, .Identifier, .InfixOp, .PrefixOp, .SuffixOp, .ControlFlowExpression, .ArrayInitializerDot, .SwitchElse, .SwitchCase, .For, .EnumLiteral, .PointerIndexPayload, .StructInitializerDot, .PointerPayload, .While, .Switch, .Else, .BoolLiteral, .NullLiteral, .Defer, .StructInitializer, .FieldInitializer, .If, .MultilineStringLiteral, .UndefinedLiteral, .AnyType, .Block, .ErrorSetDecl => return,
|
||||
.StringLiteral, .IntegerLiteral, .BuiltinCall, .Call, .Identifier, .Add,
|
||||
.AddWrap,
|
||||
.ArrayCat,
|
||||
.ArrayMult,
|
||||
.Assign,
|
||||
.AssignBitAnd,
|
||||
.AssignBitOr,
|
||||
.AssignBitShiftLeft,
|
||||
.AssignBitShiftRight,
|
||||
.AssignBitXor,
|
||||
.AssignDiv,
|
||||
.AssignSub,
|
||||
.AssignSubWrap,
|
||||
.AssignMod,
|
||||
.AssignAdd,
|
||||
.AssignAddWrap,
|
||||
.AssignMul,
|
||||
.AssignMulWrap,
|
||||
.BangEqual,
|
||||
.BitAnd,
|
||||
.BitOr,
|
||||
.BitShiftLeft,
|
||||
.BitShiftRight,
|
||||
.BitXor,
|
||||
.BoolAnd,
|
||||
.BoolOr,
|
||||
.Div,
|
||||
.EqualEqual,
|
||||
.ErrorUnion,
|
||||
.GreaterOrEqual,
|
||||
.GreaterThan,
|
||||
.LessOrEqual,
|
||||
.LessThan,
|
||||
.MergeErrorSets,
|
||||
.Mod,
|
||||
.Mul,
|
||||
.MulWrap,
|
||||
.Period,
|
||||
.Range,
|
||||
.Sub,
|
||||
.SubWrap,
|
||||
.UnwrapOptional,
|
||||
.AddressOf,
|
||||
.Await,
|
||||
.BitNot,
|
||||
.BoolNot,
|
||||
.OptionalType,
|
||||
.Negation,
|
||||
.NegationWrap,
|
||||
.Resume,
|
||||
.Try,
|
||||
.ArrayType,
|
||||
.ArrayTypeSentinel,
|
||||
.PtrType,
|
||||
.SliceType, .SuffixOp, .ControlFlowExpression, .ArrayInitializerDot, .SwitchElse, .SwitchCase, .For, .EnumLiteral, .PointerIndexPayload, .StructInitializerDot, .PointerPayload, .While, .Switch, .Else, .BoolLiteral, .NullLiteral, .Defer, .StructInitializer, .FieldInitializer, .If, .MultilineStringLiteral, .UndefinedLiteral, .AnyType, .Block, .ErrorSetDecl => return,
|
||||
|
||||
.ContainerDecl => {
|
||||
const decl = child.castTag(.ContainerDecl).?;
|
||||
|
|
|
|||
82
src/main.zig
82
src/main.zig
|
|
@ -212,12 +212,12 @@ fn publishDiagnostics(arena: *std.heap.ArenaAllocator, handle: DocumentStore.Han
|
|||
switch (decl.tag) {
|
||||
.FnProto => blk: {
|
||||
const func = decl.cast(std.zig.ast.Node.FnProto).?;
|
||||
const is_extern = func.extern_export_inline_token != null;
|
||||
const is_extern = func.trailer_flags.has("extern_export_inline_token");
|
||||
if (is_extern)
|
||||
break :blk;
|
||||
|
||||
if (config.warn_style) {
|
||||
if (func.name_token) |name_token| {
|
||||
if (func.getTrailer("name_token")) |name_token| {
|
||||
const loc = tree.tokenLocation(0, name_token);
|
||||
|
||||
const is_type_function = analysis.isTypeFunction(tree, func);
|
||||
|
|
@ -335,7 +335,7 @@ fn nodeToCompletion(
|
|||
switch (node.tag) {
|
||||
.FnProto => {
|
||||
const func = node.cast(std.zig.ast.Node.FnProto).?;
|
||||
if (func.name_token) |name_token| {
|
||||
if (func.getTrailer("name_token")) |name_token| {
|
||||
const use_snippets = config.enable_snippets and client_capabilities.supports_snippets;
|
||||
|
||||
const insert_text = if (use_snippets) blk: {
|
||||
|
|
@ -418,54 +418,38 @@ fn nodeToCompletion(
|
|||
.detail = analysis.getContainerFieldSignature(handle.tree, field),
|
||||
});
|
||||
},
|
||||
.PrefixOp => {
|
||||
const prefix_op = node.cast(std.zig.ast.Node.PrefixOp).?;
|
||||
|
||||
switch (prefix_op.op) {
|
||||
.ArrayType, .SliceType => {},
|
||||
.PtrType => {
|
||||
if (config.operator_completions) {
|
||||
try list.append(.{
|
||||
.label = "*",
|
||||
.kind = .Operator,
|
||||
});
|
||||
}
|
||||
|
||||
if (prefix_op.rhs.cast(std.zig.ast.Node.PrefixOp)) |child_pop| {
|
||||
switch (child_pop.op) {
|
||||
.ArrayType => {
|
||||
try list.append(.{
|
||||
.label = "len",
|
||||
.kind = .Field,
|
||||
});
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
} else if (unwrapped) |actual_type| {
|
||||
try typeToCompletion(arena, list, .{ .original = actual_type }, orig_handle, config);
|
||||
}
|
||||
return;
|
||||
},
|
||||
.OptionalType => {
|
||||
if (config.operator_completions) {
|
||||
try list.append(.{
|
||||
.label = "?",
|
||||
.kind = .Operator,
|
||||
});
|
||||
}
|
||||
return;
|
||||
},
|
||||
else => return,
|
||||
.ArrayType, .SliceType => {},
|
||||
.PtrType => {
|
||||
if (config.operator_completions) {
|
||||
try list.append(.{
|
||||
.label = "*",
|
||||
.kind = .Operator,
|
||||
});
|
||||
}
|
||||
|
||||
try list.append(.{
|
||||
.label = "len",
|
||||
.kind = .Field,
|
||||
});
|
||||
try list.append(.{
|
||||
.label = "ptr",
|
||||
.kind = .Field,
|
||||
});
|
||||
if (prefix_op.rhs.cast(std.zig.ast.Node.PrefixOp)) |child_pop| {
|
||||
switch (child_pop.op) {
|
||||
.ArrayType => {
|
||||
try list.append(.{
|
||||
.label = "len",
|
||||
.kind = .Field,
|
||||
});
|
||||
},
|
||||
else => {},
|
||||
}
|
||||
} else if (unwrapped) |actual_type| {
|
||||
try typeToCompletion(arena, list, .{ .original = actual_type }, orig_handle, config);
|
||||
}
|
||||
return;
|
||||
},
|
||||
.OptionalType => {
|
||||
if (config.operator_completions) {
|
||||
try list.append(.{
|
||||
.label = "?",
|
||||
.kind = .Operator,
|
||||
});
|
||||
}
|
||||
return;
|
||||
},
|
||||
.StringLiteral => {
|
||||
try list.append(.{
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user