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

[SourceKit] Explicitly specify frontend action type when creating compiler invocation

Browse Source 
Explicitly specify the frontend action to make sure we aren’t loading thes stdlib if the performed action is syntactic only.
This commit is contained in:
Alex Hoppen
2021-11-17 11:40:30 +01:00
parent 63c31033fc
commit 22f67e89a6
10 changed files with 93 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/SourceKit/lib/SwiftLang/SwiftEditorInterfaceGen.cpp
View File

@@ -634,8 +634,9 @@ void SwiftLangSupport::editorOpenTypeInterface(EditorConsumer &Consumer,
CompilerInvocation Invocation;
std::string Error;
if (getASTManager()->initCompilerInvocation(Invocation, Args, CI.getDiags(),
StringRef(), Error)) {
if (getASTManager()->initCompilerInvocation(
Invocation, Args, FrontendOptions::ActionType::Typecheck,
CI.getDiags(), StringRef(), Error)) {
Consumer.handleRequestError(Error.c_str());
return;
}
@@ -674,8 +675,9 @@ void SwiftLangSupport::editorOpenInterface(EditorConsumer &Consumer,
CompilerInvocation Invocation;
std::string Error;
if (getASTManager()->initCompilerInvocationNoInputs(Invocation, Args,
CI.getDiags(), Error)) {
if (getASTManager()->initCompilerInvocationNoInputs(
Invocation, Args, FrontendOptions::ActionType::Typecheck,
CI.getDiags(), Error)) {
Consumer.handleRequestError(Error.c_str());
return;
}
@@ -740,7 +742,7 @@ void SwiftLangSupport::editorOpenSwiftSourceInterface(
SourceKitCancellationToken CancellationToken,
std::shared_ptr<EditorConsumer> Consumer) {
std::string Error;
auto Invocation = ASTMgr->getInvocation(Args, SourceName, Error);
auto Invocation = ASTMgr->getTypecheckInvocation(Args, SourceName, Error);
if (!Invocation) {
Consumer->handleRequestError(Error.c_str());
return;
@@ -769,8 +771,9 @@ void SwiftLangSupport::editorOpenHeaderInterface(EditorConsumer &Consumer,
std::string Error;
ArrayRef<const char *> SwiftArgs = UsingSwiftArgs ? Args : llvm::None;
if (getASTManager()->initCompilerInvocationNoInputs(Invocation, SwiftArgs,
CI.getDiags(), Error)) {
if (getASTManager()->initCompilerInvocationNoInputs(
Invocation, SwiftArgs, FrontendOptions::ActionType::Typecheck,
CI.getDiags(), Error)) {
Consumer.handleRequestError(Error.c_str());
return;
}
@@ -819,8 +822,9 @@ void SwiftLangSupport::findInterfaceDocument(StringRef ModuleName,
CompilerInvocation Invocation;
std::string Error;
if (getASTManager()->initCompilerInvocation(Invocation, Args, CI.getDiags(),
StringRef(), Error)) {
if (getASTManager()->initCompilerInvocation(
Invocation, Args, FrontendOptions::ActionType::Typecheck,
CI.getDiags(), StringRef(), Error)) {
return Receiver(RequestResult<InterfaceDocInfo>::fromError(Error));
}