[Parse/CodeCompletion] Cleanup code completion facilities in Parse #28182
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci Please smoke test |
|
This is a PR for #28014 (review) |
benlangmuir
reviewed
Nov 12, 2019
lib/Parse/Parser.cpp
Outdated
| auto EndLexerState = L->getStateForEndOfTokenLoc(info.BodyEnd); | ||
| auto range = SourceRange(info.BodyPos.Loc, info.BodyEnd); | ||
| llvm::errs().write_escaped( | ||
| L->getCharSourceRangeFromSourceRange(SourceMgr, range).str()); |
| // Expressions can't begin with a closure literal at statement position. This | ||
| // prevents potential ambiguities with trailing closure syntax. | ||
| if (Tok.is(tok::l_brace)) { | ||
| diagnose(Tok, diag::statement_begins_with_closure); |
There was a problem hiding this comment.
I see you removed this code - do we know why it was originally there? It seems odd to emit a diagnostic during code completion like this.
There was a problem hiding this comment.
I guess this was added when diag::statement_begins_with_closure was implemented (ad78204) without knowing how this code path was used.
| }; | ||
|
|
||
| enum class DelayedDeclKind { | ||
| enum class CodeCompletionSecondPassInfoKind { |
There was a problem hiding this comment.
How about CodeCompletionDelayedDeclKind?
| TopLevelCodeDecl, | ||
| Decl, | ||
| FunctionBody, | ||
| }; | ||
|
|
||
| class DelayedDeclState { | ||
| class CodeCompletionSecondPassInfoTy { |
There was a problem hiding this comment.
How about CodeCompletionDelayedDeclState?
FunctionBodyState is no longer used.
- delayParseFromBeginningToHere is useless. Use delayDecl() instead - Inline PersistentParserState::delayTopLevel() - Cleanup completion handling in parseDecl()
- Rename code completion related names in 'PersistentParserState' so it's clear when you are using. - Refactor 'performCodeCompletionSecondPass()': Inline and consolidate 'parse*Delayed()' because they used to share many code. rdar://problem/56926367
rintaro
force-pushed
the
ide-completion-rdar56926367
branch
from
20b7d0e to
cd8ebe4
Compare
|
@swift-ci Please smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FunctionBodyStatefromPersistentParserStatedelayParseFromBeginningToHere(). Use delayDecl() insteadPersistentParserState::delayTopLevel()parseDecl()PersistentParserStateso it's clear when you are usingperformCodeCompletionSecondPass(): Inline and consolidateparse*Delayed()functions because they used to share some coderdar://problem/56926367