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

[Refactoring] SR-6051 Expansion of switch statement missing cases (#12281)

Browse Source
This commit is contained in:
Kacper Harasim
2017-10-13 18:37:58 +02:00
committed by Xi Ge
parent e53ff51387
commit 8cd677eb1f
14 changed files with 263 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/IDE/SwiftSourceDocInfo.cpp
View File

@@ -80,7 +80,7 @@ bool CursorInfoResolver::tryResolve(ValueDecl *D, TypeDecl *CtorTyRef,
return false;
if (Loc == LocToResolve) {
CursorInfo = { D, CtorTyRef, ExtTyRef, Loc, IsRef, Ty, ContainerType };
CursorInfo = { D, CtorTyRef, ExtTyRef, &SrcFile, Loc, IsRef, Ty, ContainerType };
return true;
}
return false;
@@ -88,7 +88,7 @@ bool CursorInfoResolver::tryResolve(ValueDecl *D, TypeDecl *CtorTyRef,
bool CursorInfoResolver::tryResolve(ModuleEntity Mod, SourceLoc Loc) {
if (Loc == LocToResolve) {
CursorInfo = { Mod, Loc };
CursorInfo = { Mod, &SrcFile, Loc };
return true;
}
return false;
@@ -97,13 +97,13 @@ bool CursorInfoResolver::tryResolve(ModuleEntity Mod, SourceLoc Loc) {
bool CursorInfoResolver::tryResolve(Stmt *St) {
if (auto *LST = dyn_cast<LabeledStmt>(St)) {
if (LST->getStartLoc() == LocToResolve) {
CursorInfo = { St };
CursorInfo = { St, &SrcFile };
return true;
}
}
if (auto *CS = dyn_cast<CaseStmt>(St)) {
if (CS->getStartLoc() == LocToResolve) {
CursorInfo = { St };
CursorInfo = { St, &SrcFile };
return true;
}
}
@@ -211,7 +211,7 @@ bool CursorInfoResolver::walkToExprPost(Expr *E) {
return false;
if (!TrailingExprStack.empty() && TrailingExprStack.back() == E) {
// We return the outtermost expression in the token info.
CursorInfo = { TrailingExprStack.front() };
CursorInfo = { TrailingExprStack.front(), &SrcFile };
return false;
}
return true;