[CodeCompletion] Escape declaration base name if needed #23372
Merged
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
rintaro
force-pushed
the
ide-completion-escapedident-16232627
branch
from
935ce76 to
e7cf5cc
Compare
|
@swift-ci Please smoke test |
benlangmuir
reviewed
Mar 19, 2019
lib/IDE/CodeCompletion.cpp
Outdated
| // e.g. 'func `init`()' should be 'expe.`init`()'. | ||
| (!ExprType || NameStr == "init") && | ||
| // 'self' and 'Self' are special | ||
| NameStr != "self" && NameStr != "Self"; |
There was a problem hiding this comment.
I didn't see any error writing x.Self as a property reference.
There was a problem hiding this comment.
foo.self, foo.Self, self and Self are all valid. We don't have to escape self and Self at use-site.
class C {
func foo() {
var `self` = 12
let `Self` = 42
self += Self
print(self)
}
}There was a problem hiding this comment.
Ah, I was wrong.
class C {
var `self` = 12
}
print(C().self) // C
print(C().`self`) // 12I will update this part to clarify the intent.
rintaro
force-pushed
the
ide-completion-escapedident-16232627
branch
from
e7cf5cc to
e8652bc
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test OS X platform |
2 similar comments
|
@swift-ci Please smoke test OS X platform |
|
@swift-ci Please smoke test OS X platform |
There should be escaped identifiers in code completion: - As primary expression: Any keyword name except for `self` and `Self`. - After dot: Something named `init`. rdar://problem/16232627
rintaro
force-pushed
the
ide-completion-escapedident-16232627
branch
from
e8652bc to
df473f6
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.
These should be escaped identifiers in code completion:
selfandSelf.`init`.rdar://problem/16232627