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: don't assert if module loading failed

Browse Source 
Swift SVN r14867
This commit is contained in:
Dmitri Hrybenko
2014-03-10 12:14:00 +00:00
parent ef78e2811a
commit 5659f8a78c
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/IDE/CodeCompletion.cpp
View File

@@ -1874,13 +1874,16 @@ void CodeCompletionCallbacksImpl::doneParsing() {
// FIXME: actually check imports.
StringRef ModuleFilename = Request.TheModule->getModuleFilename();
assert(!ModuleFilename.empty() && "should have a filename");
CodeCompletionCacheImpl::Key K{ModuleFilename,
Request.TheModule->Name.str(),
{}, Request.NeedLeadingDot};
CompletionContext.Cache.Impl->getResults(
K, CompletionContext.getResultSink(), Request.OnlyTypes,
FillCacheCallback);
// ModuleFilename can be empty if something strange happened during
// module loading, for example, the module file is corrupted.
if (!ModuleFilename.empty()) {
CodeCompletionCacheImpl::Key K{ModuleFilename,
Request.TheModule->Name.str(),
{}, Request.NeedLeadingDot};
CompletionContext.Cache.Impl->getResults(
K, CompletionContext.getResultSink(), Request.OnlyTypes,
FillCacheCallback);
}
} else {
// Add results from current module.
Lookup.getToplevelCompletions(Request.OnlyTypes);
@@ -1907,13 +1910,16 @@ void CodeCompletionCallbacksImpl::doneParsing() {
}
Module *TheModule = Imported.first.second;
StringRef ModuleFilename = TheModule->getModuleFilename();
assert(!ModuleFilename.empty() && "should have a filename");
CodeCompletionCacheImpl::Key K{ModuleFilename,
TheModule->Name.str(),
AccessPath, false};
CompletionContext.Cache.Impl->getResults(
K, CompletionContext.getResultSink(), Request.OnlyTypes,
FillCacheCallback);
// ModuleFilename can be empty if something strange happened during
// module loading, for example, the module file is corrupted.
if (!ModuleFilename.empty()) {
CodeCompletionCacheImpl::Key K{ModuleFilename,
TheModule->Name.str(),
AccessPath, false};
CompletionContext.Cache.Impl->getResults(
K, CompletionContext.getResultSink(), Request.OnlyTypes,
FillCacheCallback);
}
}
}
Lookup.RequestedCachedResults.reset();