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

Merge pull request #12920 from davidungar/Move-input-conversion

Browse Source 
Move input conversion
This commit is contained in:
David Ungar
2017-11-27 17:13:48 -08:00
committed by GitHub
parent 7ae583fd93 0b39a883c2
commit 83ee8cb7f0
13 changed files with 283 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
View File

@@ -83,7 +83,8 @@ struct InvocationOptions {
// Assert invocation with a primary file. We want to avoid full typechecking
// for all files.
assert(!this->PrimaryFile.empty());
assert(this->Invok.getFrontendOptions().Inputs.hasPrimaryInput());
assert(this->Invok.getFrontendOptions().Inputs.haveUniquePrimaryInput() &&
"Must have exactly one primary input for code completion, etc.");
}
void applyTo(CompilerInvocation &CompInvok) const;
@@ -354,7 +355,7 @@ static void setModuleName(CompilerInvocation &Invocation) {
StringRef Filename = Invocation.getOutputFilename();
if (Filename.empty()) {
if (!Invocation.getFrontendOptions().Inputs.hasInputFilenames()) {
if (!Invocation.getFrontendOptions().Inputs.haveInputFilenames()) {
Invocation.setModuleName("__main__");
return;
}

2
tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
View File

@@ -144,7 +144,7 @@ static bool swiftCodeCompleteImpl(SwiftLangSupport &Lang,
if (Failed) {
return false;
}
if (!Invocation.getFrontendOptions().Inputs.hasInputFilenames()) {
if (!Invocation.getFrontendOptions().Inputs.haveInputFilenames()) {
Error = "no input filenames specified";
return false;
}

2
tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp
View File

@@ -279,7 +279,7 @@ void SwiftLangSupport::indexSource(StringRef InputFile,
return;
}
if (!Invocation.getFrontendOptions().Inputs.hasInputFilenames()) {
if (!Invocation.getFrontendOptions().Inputs.haveInputFilenames()) {
IdxConsumer.failed("no input filenames specified");
return;
}