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

Code completion for overrides: don't suggest to override members from outer

Browse Source 
nominals in inner nominals


Swift SVN r16890
This commit is contained in:
Dmitri Hrybenko
2014-04-26 20:08:11 +00:00
parent 6da5c57926
commit df60e7751e
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/IDE/CodeCompletion.cpp
View File

@@ -1852,9 +1852,7 @@ public:
}
}
void addDesignatedInitializers() {
Type CurrTy = CurrDeclContext->getInnermostTypeContext()
->getDeclaredTypeInContext();
void addDesignatedInitializers(Type CurrTy) {
if (!CurrTy)
return;
const auto *NTD = CurrTy->getAnyNominal();
@@ -1878,9 +1876,11 @@ public:
}
void getOverrideCompletions(SourceLoc Loc) {
lookupVisibleDecls(*this, CurrDeclContext, TypeResolver.get(),
/*IncludeTopLevel=*/false, Loc);
addDesignatedInitializers();
Type CurrTy =
CurrDeclContext->getInnermostTypeContext()->getDeclaredTypeInContext();
lookupVisibleMemberDecls(*this, CurrTy, CurrDeclContext,
TypeResolver.get());
addDesignatedInitializers(CurrTy);
}
};