averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Diagnostics] Substring -> String fix-it should be anchored at semantic expressoin

Browse Source 
If contextual failure is detected in sub-expression (through
type-check call via CSDiag), let's make sure that fix-it
is always anchored at semantic expression otherwise it could be
attached to the paren representing whole argument list.
This commit is contained in:
Pavel Yaskevich
2019-08-08 09:43:57 -07:00
parent fd85bfe045
commit 290ec3c1cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Sema/CSDiagnostics.cpp
View File

@@ -2210,7 +2210,8 @@ bool ContextualFailure::trySequenceSubsequenceFixIts(
// Wrap in String.init
if (FromType->isEqual(Substring)) {
if (ToType->isEqual(String)) {
auto range = getAnchor()->getSourceRange();
auto *anchor = getAnchor()->getSemanticsProvidingExpr();
auto range = anchor->getSourceRange();
diagnostic.fixItInsert(range.Start, "String(");
diagnostic.fixItInsertAfter(range.End, ")");
return true;