averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[SourceKit] Avoid the 'error: no input files' diagnostic notification for syntactic-only requests

Browse Source 
rdar://44989868
This commit is contained in:
Argyrios Kyrtzidis
2018-10-13 09:48:00 -07:00
parent feffd2c5d4
commit f913a239f8
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View File

@@ -1625,7 +1625,8 @@ SwiftEditorDocument::~SwiftEditorDocument()
}
ImmutableTextSnapshotRef SwiftEditorDocument::initializeText(
llvm::MemoryBuffer *Buf, ArrayRef<const char *> Args) {
llvm::MemoryBuffer *Buf, ArrayRef<const char *> Args,
bool ProvideSemanticInfo) {
llvm::sys::ScopedLock L(Impl.AccessMtx);
@@ -1637,9 +1638,13 @@ ImmutableTextSnapshotRef SwiftEditorDocument::initializeText(
Impl.SyntaxMap.Tokens.clear();
Impl.AffectedRange = {0, static_cast<unsigned>(Buf->getBufferSize())};
Impl.SemanticInfo = new SwiftDocumentSemanticInfo(Impl.FilePath, Impl.ASTMgr,
Impl.NotificationCtr);
Impl.SemanticInfo->setCompilerArgs(Args);
// Try to create a compiler invocation object if needing semantic info
// or it's syntactic-only but with passed-in compiler arguments.
if (ProvideSemanticInfo || !Args.empty()) {
Impl.SemanticInfo = new SwiftDocumentSemanticInfo(Impl.FilePath, Impl.ASTMgr,
Impl.NotificationCtr);
Impl.SemanticInfo->setCompilerArgs(Args);
}
return Impl.EditableBuffer->getSnapshot();
}
@@ -2038,7 +2043,7 @@ void SwiftLangSupport::editorOpen(StringRef Name, llvm::MemoryBuffer *Buf,
auto EditorDoc = EditorDocuments->getByUnresolvedName(Name);
if (!EditorDoc) {
EditorDoc = new SwiftEditorDocument(Name, *this);
Snapshot = EditorDoc->initializeText(Buf, Args);
Snapshot = EditorDoc->initializeText(Buf, Args, Consumer.needsSemanticInfo());
EditorDoc->parse(Snapshot, *this, Consumer.syntaxTreeEnabled());
if (EditorDocuments->getOrUpdate(Name, *this, EditorDoc)) {
// Document already exists, re-initialize it. This should only happen
@@ -2051,7 +2056,7 @@ void SwiftLangSupport::editorOpen(StringRef Name, llvm::MemoryBuffer *Buf,
}
if (!Snapshot) {
Snapshot = EditorDoc->initializeText(Buf, Args);
Snapshot = EditorDoc->initializeText(Buf, Args, Consumer.needsSemanticInfo());
EditorDoc->parse(Snapshot, *this, Consumer.syntaxTreeEnabled());
}