---

yaml
---
r: 345566
b: refs/heads/master
c: 401b876
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 14fb887eb9cb54211efd0e221e03250fba341f75
+refs/heads/master: 401b876f4bd302f744f7cad0a21ad5e597a5922c
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/SourceKit/CompileNotifications/diagnostics.swift

@@ -68,15 +68,22 @@
 // FIXME: invalid arguments cause us to early-exit and not send the notifications
 // RUN_DISABLED: %sourcekitd-test -req=track-compiles == -req=sema %s -- %s -invalid-arg | %FileCheck %s -check-prefix=INVALID_ARG
 
-// RUN: %sourcekitd-test -req=track-compiles == -req=sema %s -- %s -Xcc -invalid-arg | %FileCheck %s -check-prefix=INVALID_ARG_CLANG
-// INVALID_ARG_CLANG: key.notification: source.notification.compile-did-finish,
-// INVALID_ARG_CLANG-NEXT: key.diagnostics: [
-// INVALID_ARG_CLANG-NEXT:   {
-// INVALID_ARG_CLANG-NEXT:     key.filepath: "<unknown>"
-// INVALID_ARG_CLANG-NEXT:     key.severity: source.diagnostic.severity.error,
-// INVALID_ARG_CLANG-NEXT:     key.offset: 0
-// INVALID_ARG_CLANG-NEXT:     key.description: "unknown argument
+// RUN: %sourcekitd-test -req=track-compiles == -req=sema %s -- %s -Xcc -invalid-arg | %FileCheck %s -check-prefix=INVALID_ARG
+// INVALID_ARG: key.notification: source.notification.compile-did-finish,
+// INVALID_ARG-NEXT: key.diagnostics: [
+// INVALID_ARG-NEXT:   {
+// INVALID_ARG-NEXT:     key.filepath: "<unknown>"
+// INVALID_ARG-NEXT:     key.severity: source.diagnostic.severity.error,
+// INVALID_ARG-NEXT:     key.offset: 0
+// INVALID_ARG-NEXT:     key.description: "unknown argument
 
 // Ignore the spurious -wmo + -enable-batch-mode warning.
 // RUN: %sourcekitd-test -req=track-compiles == -req=sema %s -- %s -enable-batch-mode | %FileCheck %s -check-prefix=NODIAGS
 // RUN: %sourcekitd-test -req=track-compiles == -req=complete -offset=0 %s -- %s -enable-batch-mode | %FileCheck %s -check-prefix=NODIAGS
+
+// Report syntactic-only requests that have arguments.
+// RUN: %sourcekitd-test -req=track-compiles == -req=syntax-map %s -- %s -invalid-arg | %FileCheck %s -check-prefix=INVALID_ARG
+// But ignore syntactic-only requests with no arguments.
+// RUN: %sourcekitd-test -req=track-compiles == -req=syntax-map %s | %FileCheck %s -check-prefix=SYNTACTIC
+// SYNTACTIC: key.syntaxmap:
+// SYNTACTIC_NOT: key.notification: source.notification.compile-did-finish

trunk/tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -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());
   }
 

trunk/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h

@@ -82,7 +82,8 @@ class SwiftEditorDocument :
   ~SwiftEditorDocument();
 
   ImmutableTextSnapshotRef initializeText(llvm::MemoryBuffer *Buf,
-                                          ArrayRef<const char *> Args);
+                                          ArrayRef<const char *> Args,
+                                          bool ProvideSemanticInfo);
   ImmutableTextSnapshotRef replaceText(unsigned Offset, unsigned Length,
                                        llvm::MemoryBuffer *Buf,
                                        bool ProvideSemanticInfo,