[CodeCompletion] Workaround fast-completion issue in UnqualifiedLookup #29763
Conversation
|
@swift-ci Please smoke test |
|
@davidungar Based on our offline conversation, I just added a workaround code that only kicks in code completions. |
lib/AST/UnqualifiedLookup.cpp
Outdated
| // happen from the 'loc' that is in a different buffer from the 'decl'. | ||
| // In such cases, look for members because we know 'loc' is inside a | ||
| // function body in the 'decl'. | ||
| if (SM.getCodeCompletionBufferID() != 0U) { |
There was a problem hiding this comment.
I'd suggest a convenience API hasCodeCompletionBuffer() so that the caller doesn't have to remember what return value to check for.
There was a problem hiding this comment.
That's a great suggestion! I second it.
lib/AST/UnqualifiedLookup.cpp
Outdated
|
|
||
| // If a code completion happens inside a function body, some lookups may | ||
| // happen from the 'loc' that is in a different buffer from the 'decl'. | ||
| // In such cases, look for members because we know 'loc' is inside a |
There was a problem hiding this comment.
This comment would be slightly clearer to me by added the words "of the 'decl'" after "look for members".
In other words: "In such cases, look for members of the 'decl' because we know 'loc' is inside a function body in the 'decl'."
lib/AST/UnqualifiedLookup.cpp
Outdated
| // happen from the 'loc' that is in a different buffer from the 'decl'. | ||
| // In such cases, look for members because we know 'loc' is inside a | ||
| // function body in the 'decl'. | ||
| if (SM.getCodeCompletionBufferID() != 0U) { |
There was a problem hiding this comment.
That's a great suggestion! I second it.
In fast-completion, a function body can be replaced with another function body parsed from a new buffer. In such cases, during typechecking the expressions in the *new* function body, a source location range check in UnqualifiedLookup didn't work well because they are not from the same buffer. This patch workaround it by skipping the source range checks and returns 'success' in such cases. rdar://problem/58881999
rintaro
force-pushed
the
ide-unqualifiedlookup-rdar58881999
branch
from
72e1aba to
ff2ccd4
Compare
|
@swift-ci Please smoke test |
In fast-completion, a function body can be replaced with another function body parsed from a new buffer. In such cases, during typechecking the expressions in the new function body, a source location range check in UnqualifiedLookup didn't work well because they are not from the same
buffer.
This patch workaround it by skipping the source range checks and returns 'success' in such cases.
rdar://problem/58881999