Skip to content

Commit f103405

Browse files
committed
Use the new InputFile Constructor
1 parent c7f0f24 commit f103405

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

lib/IDE/Refactoring.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ getNotableRegions(StringRef SourceText, unsigned NameOffset, StringRef Name,
11721172
CompilerInvocation Invocation{};
11731173

11741174
Invocation.getFrontendOptions().InputsAndOutputs.addInput(
1175-
InputFile("<extract>", true, InputBuffer.get()));
1175+
InputFile("<extract>", true, InputBuffer.get(), file_types::TY_Swift));
11761176
Invocation.getFrontendOptions().ModuleName = "extract";
11771177
Invocation.getLangOptions().DisablePoundIfEvaluation = true;
11781178

lib/Migrator/Migrator.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ Migrator::performAFixItMigration(version::Version SwiftLanguageVersion) {
142142
"Migration must have a primary");
143143
for (const auto &input : OrigFrontendOpts.InputsAndOutputs.getAllInputs()) {
144144
Invocation.getFrontendOptions().InputsAndOutputs.addInput(
145-
InputFile(input.file(), input.isPrimary(),
146-
input.isPrimary() ? InputBuffer.get() : input.buffer()));
145+
InputFile(input.getFileName(), input.isPrimary(),
146+
input.isPrimary() ? InputBuffer.get() : input.getBuffer(),
147+
input.getType()));
147148
}
148149

149150
auto Instance = std::make_unique<swift::CompilerInstance>();

tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,8 @@ static bool makeParserAST(CompilerInstance &CI, StringRef Text,
856856
std::unique_ptr<llvm::MemoryBuffer> Buf;
857857
Buf = llvm::MemoryBuffer::getMemBuffer(Text, "<module-interface>");
858858
Invocation.getFrontendOptions().InputsAndOutputs.addInput(
859-
InputFile(Buf.get()->getBufferIdentifier(), false, Buf.get()));
859+
InputFile(Buf.get()->getBufferIdentifier(), /*isPrimary*/false, Buf.get(),
860+
file_types::TY_Swift));
860861
return CI.setup(Invocation);
861862
}
862863

@@ -1441,7 +1442,8 @@ SourceFile *SwiftLangSupport::getSyntacticSourceFile(
14411442
}
14421443
Invocation.setInputKind(InputFileKind::Swift);
14431444
Invocation.getFrontendOptions().InputsAndOutputs.addInput(
1444-
InputFile(InputBuf->getBufferIdentifier(), false, InputBuf));
1445+
InputFile(InputBuf->getBufferIdentifier(), /*isPrimary*/false, InputBuf,
1446+
file_types::TY_Swift));
14451447

14461448
if (ParseCI.setup(Invocation)) {
14471449
Error = "Compiler invocation set up failed";

tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,8 @@ static bool makeParserAST(CompilerInstance &CI, StringRef Text,
224224
std::unique_ptr<llvm::MemoryBuffer> Buf;
225225
Buf = llvm::MemoryBuffer::getMemBuffer(Text, "<module-interface>");
226226
Invocation.getFrontendOptions().InputsAndOutputs.addInput(
227-
InputFile(Buf.get()->getBufferIdentifier(), false, Buf.get()));
227+
InputFile(Buf.get()->getBufferIdentifier(), /*isPrimary*/false, Buf.get(),
228+
file_types::TY_Swift));
228229
return CI.setup(Invocation);
229230
}
230231

0 commit comments

Comments
 (0)