Skip to content

Commit 024e2c9

Browse files
ahoppenahoppen
committed
[Parse] Add curly braces
Maybe this makes VSCode happy and resolves a Windows-only compilation failure `error C2059: syntax error: ')'`
1 parent 8a2cd86 commit 024e2c9

File tree

6 files changed

+48
-24
lines changed

6 files changed

+48
-24
lines changed

‎lib/Parse/ParseDecl.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5175,8 +5175,9 @@ Parser::parseDecl(ParseDeclOptions Flags,
51755175
peekToken().is(tok::code_complete) &&
51765176
Tok.getLoc().getAdvancedLoc(1) == peekToken().getLoc()) {
51775177
consumeToken();
5178-
if (CodeCompletionCallbacks)
5178+
if (CodeCompletionCallbacks) {
51795179
CodeCompletionCallbacks->completeAfterPoundDirective();
5180+
}
51805181
consumeToken(tok::code_complete);
51815182
DeclResult = makeParserCodeCompletionResult<Decl>();
51825183
break;
@@ -9380,8 +9381,9 @@ Parser::parseDeclPrecedenceGroup(ParseDeclOptions flags,
93809381
auto checkCodeCompletion =
93819382
[&](CodeCompletionCallbacks::PrecedenceGroupCompletionKind SK) -> bool {
93829383
if (Tok.is(tok::code_complete)) {
9383-
if (CodeCompletionCallbacks)
9384+
if (CodeCompletionCallbacks) {
93849385
CodeCompletionCallbacks->completeInPrecedenceGroup(SK);
9386+
}
93859387
consumeToken();
93869388
return true;
93879389
}

‎lib/Parse/ParseExpr.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,9 @@ ParserResult<Expr> Parser::parseExprKeyPath() {
699699
CodeCompletionExpr(pathResult.getPtrOrNull(), Tok.getLoc());
700700
auto *keypath = KeyPathExpr::createParsed(
701701
Context, backslashLoc, rootResult.getPtrOrNull(), CC, hasLeadingDot);
702-
if (CodeCompletionCallbacks)
702+
if (CodeCompletionCallbacks) {
703703
CodeCompletionCallbacks->completeExprKeyPath(keypath, DotLoc);
704+
}
704705
consumeToken(tok::code_complete);
705706
return makeParserCodeCompletionResult(keypath);
706707
}
@@ -734,8 +735,9 @@ ParserResult<Expr> Parser::parseExprKeyPathObjC() {
734735
Context, keywordLoc, lParenLoc, components, Tok.getLoc());
735736
}
736737

737-
if (CodeCompletionCallbacks)
738+
if (CodeCompletionCallbacks) {
738739
CodeCompletionCallbacks->completeExprKeyPath(expr, DotLoc);
740+
}
739741

740742
// Eat the code completion token because we handled it.
741743
consumeToken(tok::code_complete);
@@ -2565,8 +2567,9 @@ ParserStatus Parser::parseClosureSignatureIfPresent(
25652567
initializer = initializerResult.get();
25662568
} else {
25672569
auto CCE = new (Context) CodeCompletionExpr(Tok.getLoc());
2568-
if (CodeCompletionCallbacks)
2570+
if (CodeCompletionCallbacks) {
25692571
CodeCompletionCallbacks->completePostfixExprBeginning(CCE);
2572+
}
25702573
name = Identifier();
25712574
initializer = CCE;
25722575
consumeToken();
@@ -3135,9 +3138,10 @@ ParserStatus Parser::parseExprList(tok leftTok, tok rightTok,
31353138
} else if (isArgumentList && Tok.is(tok::code_complete)) {
31363139
// Handle call arguments specially because it may need argument labels.
31373140
auto CCExpr = new (Context) CodeCompletionExpr(Tok.getLoc());
3138-
if (CodeCompletionCallbacks)
3141+
if (CodeCompletionCallbacks) {
31393142
CodeCompletionCallbacks->completeCallArg(CCExpr,
31403143
PreviousLoc == leftLoc);
3144+
}
31413145
consumeIf(tok::code_complete);
31423146
SubExpr = CCExpr;
31433147
Status.setHasCodeCompletionAndIsError();
@@ -3243,9 +3247,10 @@ Parser::parseTrailingClosures(bool isExprBasic, SourceRange calleeRange,
32433247

32443248
// foo() {} <token>
32453249
auto CCExpr = new (Context) CodeCompletionExpr(Tok.getLoc());
3246-
if (CodeCompletionCallbacks)
3250+
if (CodeCompletionCallbacks) {
32473251
CodeCompletionCallbacks->completeLabeledTrailingClosure(
32483252
CCExpr, Tok.isAtStartOfLine());
3253+
}
32493254
consumeToken(tok::code_complete);
32503255
result.setHasCodeCompletionAndIsError();
32513256
closures.emplace_back(SourceLoc(), Identifier(), CCExpr);
@@ -3323,8 +3328,9 @@ Parser::parseExprPoundCodeCompletion(Optional<StmtKind> ParentKind) {
33233328
consumeToken(); // '#' token.
33243329
auto CodeCompletionPos = consumeToken();
33253330
auto Expr = new (Context) CodeCompletionExpr(CodeCompletionPos);
3326-
if (CodeCompletionCallbacks)
3331+
if (CodeCompletionCallbacks) {
33273332
CodeCompletionCallbacks->completeAfterPoundExpr(Expr, ParentKind);
3333+
}
33283334
return makeParserCodeCompletionResult(Expr);
33293335
}
33303336

‎lib/Parse/ParseGeneric.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,9 @@ ParserStatus Parser::parseGenericWhereClause(
280280
bool HasNextReq;
281281
do {
282282
if (Tok.is(tok::code_complete)) {
283-
if (CodeCompletionCallbacks)
283+
if (CodeCompletionCallbacks) {
284284
CodeCompletionCallbacks->completeGenericRequirement();
285+
}
285286
EndLoc = consumeToken(tok::code_complete);
286287
Status.setHasCodeCompletionAndIsError();
287288
break;

‎lib/Parse/ParsePattern.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,9 @@ Parser::parseParameterClause(SourceLoc &leftParenLoc,
245245
if (paramContext != ParameterContextKind::EnumElement) {
246246
auto AttrStatus = parseDeclAttributeList(param.Attrs);
247247
if (AttrStatus.hasCodeCompletion()) {
248-
if (CodeCompletionCallbacks)
248+
if (CodeCompletionCallbacks) {
249249
CodeCompletionCallbacks->setAttrTargetDeclKind(DeclKind::Param);
250+
}
250251
status.setHasCodeCompletionAndIsError();
251252
}
252253
}
@@ -987,9 +988,10 @@ ParserStatus Parser::parseEffectsSpecifiers(SourceLoc existingArrowLoc,
987988
// Code completion.
988989
if (Tok.is(tok::code_complete) && !Tok.isAtStartOfLine() &&
989990
!existingArrowLoc.isValid()) {
990-
if (CodeCompletionCallbacks)
991+
if (CodeCompletionCallbacks) {
991992
CodeCompletionCallbacks->completeEffectsSpecifier(asyncLoc.isValid(),
992993
throwsLoc.isValid());
994+
}
993995
consumeToken(tok::code_complete);
994996
status.setHasCodeCompletionAndIsError();
995997
continue;

‎lib/Parse/ParseStmt.cpp‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,9 @@ ParserStatus Parser::parseExprOrStmt(ASTNode &Result) {
140140
if (Tok.is(tok::pound) && Tok.isAtStartOfLine() &&
141141
peekToken().is(tok::code_complete)) {
142142
consumeToken();
143-
if (CodeCompletionCallbacks)
143+
if (CodeCompletionCallbacks) {
144144
CodeCompletionCallbacks->completeAfterPoundDirective();
145+
}
145146
consumeToken(tok::code_complete);
146147
return makeParserCodeCompletionStatus();
147148
}
@@ -175,14 +176,16 @@ ParserStatus Parser::parseExprOrStmt(ASTNode &Result) {
175176
StructureMarkerRAII ParsingStmt(*this, Tok.getLoc(),
176177
StructureMarkerKind::Statement);
177178

178-
if (CodeCompletionCallbacks)
179+
if (CodeCompletionCallbacks) {
179180
CodeCompletionCallbacks->setExprBeginning(getParserPosition());
181+
}
180182

181183
if (Tok.is(tok::code_complete)) {
182184
auto *CCE = new (Context) CodeCompletionExpr(Tok.getLoc());
183185
Result = CCE;
184-
if (CodeCompletionCallbacks)
186+
if (CodeCompletionCallbacks) {
185187
CodeCompletionCallbacks->completeStmtOrExpr(CCE);
188+
}
186189
consumeToken(tok::code_complete);
187190
return makeParserCodeCompletionStatus();
188191
}
@@ -1896,8 +1899,9 @@ ParserResult<Stmt> Parser::parseStmtIf(LabeledStmtInfo LabelInfo,
18961899
}
18971900
ElseBody = parseStmtIf(LabeledStmtInfo(), implicitlyInsertIf);
18981901
} else if (Tok.is(tok::code_complete)) {
1899-
if (CodeCompletionCallbacks)
1902+
if (CodeCompletionCallbacks) {
19001903
CodeCompletionCallbacks->completeAfterIfStmtElse();
1904+
}
19011905
Status.setHasCodeCompletionAndIsError();
19021906
consumeToken(tok::code_complete);
19031907
} else {
@@ -2336,18 +2340,20 @@ ParserResult<Stmt> Parser::parseStmtForEach(LabeledStmtInfo LabelInfo) {
23362340
// If there is no "in" keyword, suggest it. Otherwise, complete the
23372341
// sequence.
23382342
if (InLoc.isInvalid()) {
2339-
if (CodeCompletionCallbacks)
2343+
if (CodeCompletionCallbacks) {
23402344
CodeCompletionCallbacks->completeForEachInKeyword();
2345+
}
23412346
consumeToken(tok::code_complete);
23422347
return makeParserCodeCompletionStatus();
23432348
} else {
23442349
Container =
23452350
makeParserResult(new (Context) CodeCompletionExpr(Tok.getLoc()));
23462351
Container.setHasCodeCompletionAndIsError();
23472352
Status |= Container;
2348-
if (CodeCompletionCallbacks)
2353+
if (CodeCompletionCallbacks) {
23492354
CodeCompletionCallbacks->completeForEachSequenceBeginning(
23502355
cast<CodeCompletionExpr>(Container.get()));
2356+
}
23512357
consumeToken(tok::code_complete);
23522358
}
23532359
} else {
@@ -2491,8 +2497,9 @@ Parser::parseStmtCases(SmallVectorImpl<ASTNode> &cases, bool IsActive) {
24912497
cases.emplace_back(PDD);
24922498
}
24932499
} else if (Tok.is(tok::code_complete)) {
2494-
if (CodeCompletionCallbacks)
2500+
if (CodeCompletionCallbacks) {
24952501
CodeCompletionCallbacks->completeCaseStmtKeyword();
2502+
}
24962503
consumeToken(tok::code_complete);
24972504
return makeParserCodeCompletionStatus();
24982505
} else {

‎lib/Parse/ParseType.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ ParserResult<TypeRepr> Parser::parseTypeSimple(
199199
ty = parseTypeIdentifier();
200200
if (auto *ITR = cast_or_null<IdentTypeRepr>(ty.getPtrOrNull())) {
201201
if (Tok.is(tok::code_complete) && !Tok.isAtStartOfLine()) {
202-
if (CodeCompletionCallbacks)
202+
if (CodeCompletionCallbacks) {
203203
CodeCompletionCallbacks->completeTypeSimpleWithoutDot(ITR);
204+
}
204205

205206
ty.setHasCodeCompletionAndIsError();
206207
consumeToken(tok::code_complete);
@@ -216,8 +217,9 @@ ParserResult<TypeRepr> Parser::parseTypeSimple(
216217
ty = parseTypeTupleBody();
217218
break;
218219
case tok::code_complete:
219-
if (CodeCompletionCallbacks)
220+
if (CodeCompletionCallbacks) {
220221
CodeCompletionCallbacks->completeTypeSimpleBeginning();
222+
}
221223
return makeParserCodeCompletionResult<TypeRepr>(
222224
new (Context) ErrorTypeRepr(consumeToken(tok::code_complete)));
223225
case tok::l_square: {
@@ -630,8 +632,9 @@ ParserResult<TypeRepr> Parser::parseTypeWithOpaqueParams(Diag<> MessageID) {
630632

631633
ParserResult<TypeRepr> Parser::parseDeclResultType(Diag<> MessageID) {
632634
if (Tok.is(tok::code_complete)) {
633-
if (CodeCompletionCallbacks)
635+
if (CodeCompletionCallbacks) {
634636
CodeCompletionCallbacks->completeTypeDeclResultBeginning();
637+
}
635638
consumeToken(tok::code_complete);
636639
return makeParserCodeCompletionStatus();
637640
}
@@ -721,8 +724,9 @@ ParserResult<TypeRepr> Parser::parseQualifiedDeclNameBaseType() {
721724
if (Tok.is(tok::kw_Any)) {
722725
return parseAnyType();
723726
} else if (Tok.is(tok::code_complete)) {
724-
if (CodeCompletionCallbacks)
727+
if (CodeCompletionCallbacks) {
725728
CodeCompletionCallbacks->completeTypeSimpleBeginning();
729+
}
726730
// Eat the code completion token because we handled it.
727731
consumeToken(tok::code_complete);
728732
return makeParserCodeCompletionResult<DeclRefTypeRepr>();
@@ -788,11 +792,13 @@ ParserResult<TypeRepr> Parser::parseQualifiedDeclNameBaseType() {
788792
if (Tok.isNot(tok::code_complete)) {
789793
// We have a dot.
790794
consumeToken();
791-
if (CodeCompletionCallbacks)
795+
if (CodeCompletionCallbacks) {
792796
CodeCompletionCallbacks->completeTypeSimpleWithDot(DeclRefTR);
797+
}
793798
} else {
794-
if (CodeCompletionCallbacks)
799+
if (CodeCompletionCallbacks) {
795800
CodeCompletionCallbacks->completeTypeSimpleWithoutDot(DeclRefTR);
801+
}
796802
}
797803
// Eat the code completion token because we handled it.
798804
consumeToken(tok::code_complete);

0 commit comments

Comments
 (0)