Skip to content

Commit e99a934

Browse files
llogickllogick
committed
Customize it!
1 parent 3226cec commit e99a934

File tree

2 files changed

+53
-9
lines changed

2 files changed

+53
-9
lines changed

‎src/stage2/Parse.zig‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ fn parseGlobalVarDecl(p: *Parse) !Node.Index {
873873

874874
p.nodes.items(.data)[var_decl].rhs = init_node;
875875

876-
try p.expectSemicolon(.expected_semi_after_decl, false);
876+
try p.expectSemicolon(.expected_semi_after_decl, true);
877877
return var_decl;
878878
}
879879

@@ -2432,6 +2432,11 @@ fn parseCurlySuffixExpr(p: *Parse) !Node.Index {
24322432
if (lhs == 0) return null_node;
24332433
const lbrace = p.eatToken(.l_brace) orelse return lhs;
24342434

2435+
if (p.token_tags[p.tok_i] == .period and p.token_tags[p.tok_i + 1] == .period) { // zls
2436+
try p.warn(.expected_initializer);
2437+
p.tok_i += 1;
2438+
}
2439+
24352440
// If there are 0 or 1 items, we can use ArrayInitOne/StructInitOne;
24362441
// otherwise we use the full ArrayInit/StructInit.
24372442

@@ -2451,6 +2456,12 @@ fn parseCurlySuffixExpr(p: *Parse) !Node.Index {
24512456
// Likely just a missing comma; give error but continue parsing.
24522457
else => try p.warn(.expected_comma_after_initializer),
24532458
}
2459+
if (p.token_tags[p.tok_i] == .period) { // zls
2460+
if (p.token_tags[p.tok_i + 1] == .period or p.token_tags[p.tok_i + 1] == .r_brace) {
2461+
try p.warn(.expected_initializer);
2462+
p.tok_i += 1;
2463+
}
2464+
}
24542465
if (p.eatToken(.r_brace)) |_| break;
24552466
const next = try p.expectFieldInit();
24562467
try p.scratch.append(p.gpa, next);
@@ -2479,6 +2490,10 @@ fn parseCurlySuffixExpr(p: *Parse) !Node.Index {
24792490
}
24802491

24812492
while (true) {
2493+
if (p.token_tags[p.tok_i] == .period and p.token_tags[p.tok_i + 1] == .r_brace) { // zls
2494+
try p.warn(.expected_expr);
2495+
p.tok_i += 1;
2496+
}
24822497
if (p.eatToken(.r_brace)) |_| break;
24832498
const elem_init = try p.expectExpr();
24842499
try p.scratch.append(p.gpa, elem_init);
@@ -2851,6 +2866,11 @@ fn parsePrimaryTypeExpr(p: *Parse) !Node.Index {
28512866
const lbrace = p.tok_i + 1;
28522867
p.tok_i = lbrace + 1;
28532868

2869+
if (p.token_tags[p.tok_i] == .period and p.token_tags[p.tok_i + 1] == .period) { // zls
2870+
try p.warn(.expected_initializer);
2871+
p.tok_i += 1;
2872+
}
2873+
28542874
// If there are 0, 1, or 2 items, we can use ArrayInitDotTwo/StructInitDotTwo;
28552875
// otherwise we use the full ArrayInitDot/StructInitDot.
28562876

@@ -2870,6 +2890,12 @@ fn parsePrimaryTypeExpr(p: *Parse) !Node.Index {
28702890
// Likely just a missing comma; give error but continue parsing.
28712891
else => try p.warn(.expected_comma_after_initializer),
28722892
}
2893+
if (p.token_tags[p.tok_i] == .period) { // zls
2894+
if (p.token_tags[p.tok_i + 1] == .period or p.token_tags[p.tok_i + 1] == .r_brace) {
2895+
try p.warn(.expected_initializer);
2896+
p.tok_i += 1;
2897+
}
2898+
}
28732899
if (p.eatToken(.r_brace)) |_| break;
28742900
const next = try p.expectFieldInit();
28752901
try p.scratch.append(p.gpa, next);
@@ -2909,6 +2935,10 @@ fn parsePrimaryTypeExpr(p: *Parse) !Node.Index {
29092935
}
29102936

29112937
while (true) {
2938+
if (p.token_tags[p.tok_i] == .period and p.token_tags[p.tok_i + 1] == .r_brace) { // zls
2939+
try p.warn(.expected_expr);
2940+
p.tok_i += 1;
2941+
}
29122942
if (p.eatToken(.r_brace)) |_| break;
29132943
const elem_init = try p.expectExpr();
29142944
try p.scratch.append(p.gpa, elem_init);
@@ -3130,6 +3160,10 @@ fn expectSwitchExpr(p: *Parse) !Node.Index {
31303160
_ = try p.expectToken(.l_brace);
31313161
const cases = try p.parseSwitchProngList();
31323162
const trailing_comma = p.token_tags[p.tok_i - 1] == .comma;
3163+
if (p.token_tags[p.tok_i] == .period and p.token_tags[p.tok_i + 1] == .r_brace) { // zls
3164+
try p.warn(.expected_expr);
3165+
p.tok_i += 1;
3166+
}
31333167
_ = try p.expectToken(.r_brace);
31343168

31353169
return p.addNode(.{
@@ -3439,6 +3473,10 @@ fn parseSwitchProng(p: *Parse) !Node.Index {
34393473

34403474
if (p.eatToken(.keyword_else) == null) {
34413475
while (true) {
3476+
if (p.token_tags[p.tok_i] == .period and p.token_tags[p.tok_i + 1] == .period) { // zls
3477+
try p.warn(.expected_expr);
3478+
p.tok_i += 1;
3479+
}
34423480
const item = try p.parseSwitchItem();
34433481
if (item == 0) break;
34443482
try p.scratch.append(p.gpa, item);

‎tests/lsp_features/completion.zig‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ test "completion - generic function" {
105105
try testCompletion(
106106
\\const S = struct { alpha: u32 };
107107
\\fn foo(comptime T: type) T {}
108-
\\const s = foo(S);
109-
\\const foo = s.<cursor>
108+
\\const S1 = foo(S);
109+
\\const S2 = S1.<cursor>
110110
, &.{
111111
.{ .label = "alpha", .kind = .Field, .detail = "alpha: u32" },
112112
});
113113
try testCompletion(
114114
\\const S = struct { alpha: u32 };
115115
\\fn foo(any: anytype, comptime T: type) T {}
116-
\\const s = foo(null, S);
117-
\\const foo = s.<cursor>
116+
\\const S1 = foo(null, S);
117+
\\const S2 = S1.<cursor>
118118
, &.{
119119
.{ .label = "alpha", .kind = .Field, .detail = "alpha: u32" },
120120
});
@@ -1157,7 +1157,9 @@ test "completion - struct init" {
11571157
\\ brefa: A,
11581158
\\ this_is_b: []const u8,
11591159
\\};
1160-
\\ref(.{ .arefb = .{ .brefa = .{.<cursor>} } });
1160+
\\test {
1161+
\\ ref(.{ .arefb = .{ .brefa = .{.<cursor>} } });
1162+
\\}
11611163
, &.{
11621164
.{ .label = "arefb", .kind = .Field, .detail = "arefb: B = 8" },
11631165
.{ .label = "this_is_a", .kind = .Field, .detail = "this_is_a: u32 = 9" },
@@ -1196,7 +1198,9 @@ test "completion - struct init" {
11961198
\\ const Self = @This();
11971199
\\ pub fn s3(self: *Self, p0: es, p1: S2) void {}
11981200
\\};
1199-
\\S3.s3(null, .{ .mye = .{} }, .{ .ref1 = .{ .ref3 = .{ .ref2 = .{ .ref1 = .{.<cursor>} } } } });
1201+
\\test {
1202+
\\ S3.s3(null, .{ .mye = .{} }, .{ .ref1 = .{ .ref3 = .{ .ref2 = .{ .ref1 = .{.<cursor>} } } } });
1203+
\\}
12001204
, &.{
12011205
.{ .label = "s1f1", .kind = .Field, .detail = "s1f1: u8" },
12021206
.{ .label = "s1f2", .kind = .Field, .detail = "s1f2: u32 = 1" },
@@ -1222,8 +1226,10 @@ test "completion - struct init" {
12221226
\\ const Self = @This();
12231227
\\ pub fn s3(self: Self, p0: es, p1: S1) void {}
12241228
\\};
1225-
\\const iofs3 = S3{};
1226-
\\iofs3.s3(.{.<cursor>});
1229+
\\test {
1230+
\\ const iofs3 = S3{};
1231+
\\ iofs3.s3(.{.<cursor>});
1232+
\\}
12271233
, &.{
12281234
.{ .label = "s1f1", .kind = .Field, .detail = "s1f1: u8" },
12291235
.{ .label = "s1f2", .kind = .Field, .detail = "s1f2: u32 = 1" },

0 commit comments

Comments
 (0)