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 remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
Joe Groff
2019-12-10 12:46:41 -08:00
parent f67b9cbbdd 73098687b0
commit fb34044408
642 changed files with 27717 additions and 11572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/swift-ide-test/swift-ide-test.cpp
View File

@@ -47,8 +47,6 @@
#include "swift/Sema/IDETypeChecking.h"
#include "swift/Markup/Markup.h"
#include "swift/Config.h"
#include "clang/APINotes/APINotesReader.h"
#include "clang/APINotes/APINotesWriter.h"
#include "clang/Rewrite/Core/RewriteBuffer.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/Statistic.h"
@@ -696,6 +694,13 @@ GraphVisPath("output-request-graphviz",
static llvm::cl::opt<bool>
CanonicalizeType("canonicalize-type", llvm::cl::Hidden,
llvm::cl::cat(Category), llvm::cl::init(false));
static llvm::cl::opt<bool>
EnableSwiftSourceInfo("enable-swiftsourceinfo",
llvm::cl::desc("Whether to consume .swiftsourceinfo files"),
llvm::cl::cat(Category),
llvm::cl::init(false));
} // namespace options
static std::unique_ptr<llvm::MemoryBuffer>
@@ -745,6 +750,10 @@ static int doTypeContextInfo(const CompilerInvocation &InitInvok,
// they are somewhat heavy operations and are not needed for completions.
Invocation.getFrontendOptions().IgnoreSwiftSourceInfo = true;
// Disable to build syntax tree because code-completion skips some portion of
// source text. That breaks an invariant of syntax tree building.
Invocation.getLangOptions().BuildSyntaxTree = false;
Invocation.setCodeCompletionPoint(CleanFile.get(), Offset);
// Create a CodeCompletionConsumer.
@@ -810,6 +819,10 @@ doConformingMethodList(const CompilerInvocation &InitInvok,
// they are somewhat heavy operations and are not needed for completions.
Invocation.getFrontendOptions().IgnoreSwiftSourceInfo = true;
// Disable to build syntax tree because code-completion skips some portion of
// source text. That breaks an invariant of syntax tree building.
Invocation.getLangOptions().BuildSyntaxTree = false;
Invocation.setCodeCompletionPoint(CleanFile.get(), Offset);
SmallVector<const char *, 4> typeNames;
@@ -3319,6 +3332,12 @@ int main(int argc, char *argv[]) {
InitInvok.getLangOptions().EnableObjCInterop =
llvm::Triple(options::Triple).isOSDarwin();
}
// We disable source location resolutions from .swiftsourceinfo files by
// default to match sourcekitd-test's and ide clients' expected behavior
// (passing optimize-for-ide in the global configuration request).
if (!options::EnableSwiftSourceInfo)
InitInvok.getFrontendOptions().IgnoreSwiftSourceInfo = true;
if (!options::Triple.empty())
InitInvok.setTargetTriple(options::Triple);
if (!options::SwiftVersion.empty()) {