Merge pull request swiftlang#28452 from nathawes/add-configuration-request-and-option-to-ignore-swiftsourceinfo

akyrtzi · web-flow · commit 31d567ee3332 · 2019-12-05T17:10:38.000-08:00
[SourceKit] Add global-configuration request to control SourceKit's behavior around .swiftsourceinfo files
diff --git a/lib/IDE/SwiftSourceDocInfo.cpp b/lib/IDE/SwiftSourceDocInfo.cpp
@@ -764,18 +764,21 @@ void swift::ide::getLocationInfo(const ValueDecl *VD,
   auto ClangNode = VD->getClangNode();
 
   if (VD->getLoc().isValid()) {
+    auto getSignatureRange = [&](const ValueDecl *VD) -> Optional<unsigned> {
+      if (auto FD = dyn_cast<AbstractFunctionDecl>(VD)) {
+        SourceRange R = FD->getSignatureSourceRange();
+        if (R.isValid())
+          return getCharLength(SM, R);
+      }
+      return None;
+    };
     unsigned NameLen;
-    if (auto FD = dyn_cast<AbstractFunctionDecl>(VD)) {
-      SourceRange R = FD->getSignatureSourceRange();
-      if (R.isInvalid())
-        return;
-      NameLen = getCharLength(SM, R);
+    if (auto SigLen = getSignatureRange(VD)) {
+      NameLen = SigLen.getValue();
+    } else if (VD->hasName()) {
+      NameLen = VD->getBaseName().userFacingName().size();
     } else {
-      if (VD->hasName()) {
-        NameLen = VD->getBaseName().userFacingName().size();
-      } else {
-        NameLen = getCharLength(SM, VD->getLoc());
-      }
+      NameLen = getCharLength(SM, VD->getLoc());
     }
 
     unsigned DeclBufID = SM.findBufferContainingLoc(VD->getLoc());
diff --git a/test/Serialization/comments-batch-mode.swift b/test/Serialization/comments-batch-mode.swift
@@ -1,10 +1,10 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -enable-batch-mode -emit-module -emit-module-doc -emit-module-path %t/Foo.swiftmodule %S/Inputs/comments-batch/File1.swift %S/Inputs/comments-batch/File2.swift %S/Inputs/comments-batch/File3.swift %S/Inputs/comments-batch/File4.swift %S/Inputs/comments-batch/File5.swift -module-name Foo -emit-module-source-info-path %t/Foo.swiftsourceinfo -emit-module-doc-path %t/Foo.swiftdoc
-// RUN: %target-swift-ide-test -print-module-comments -module-to-print=Foo -source-filename %s -I %t | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=Foo -enable-swiftsourceinfo -source-filename %s -I %t | %FileCheck %s
 
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -wmo -emit-module -emit-module-doc -emit-module-path %t/Foo.swiftmodule %S/Inputs/comments-batch/File1.swift %S/Inputs/comments-batch/File2.swift %S/Inputs/comments-batch/File3.swift %S/Inputs/comments-batch/File4.swift %S/Inputs/comments-batch/File5.swift -module-name Foo -emit-module-source-info-path %t/Foo.swiftsourceinfo -emit-module-doc-path %t/Foo.swiftdoc
-// RUN: %target-swift-ide-test -print-module-comments -module-to-print=Foo -source-filename %s -I %t | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=Foo -enable-swiftsourceinfo -source-filename %s -I %t | %FileCheck %s
 
 // CHECK: Inputs/comments-batch/File1.swift:2:13: Func/FuncFromFile1 RawComment=[/// Comment in File1\n]
 // CHECK: Inputs/comments-batch/File2.swift:2:13: Func/FuncFromFile2 RawComment=[/// Comment in File2\n]
diff --git a/test/Serialization/comments-framework.swift b/test/Serialization/comments-framework.swift
@@ -3,10 +3,10 @@
 // RUN: %empty-directory(%t/comments.framework/Modules/comments.swiftmodule/Project)
 
 // RUN: %target-swift-frontend -module-name comments -emit-module -emit-module-path %t/comments.framework/Modules/comments.swiftmodule/%target-swiftmodule-name -emit-module-doc-path %t/comments.framework/Modules/comments.swiftmodule/%target-swiftdoc-name -emit-module-source-info-path %t/comments.framework/Modules/comments.swiftmodule/Project/%target-swiftsourceinfo-name %s
-// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -F %t | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -enable-swiftsourceinfo -source-filename %s -F %t | %FileCheck %s
 
 // RUN: cp -r %t/comments.framework/Modules/comments.swiftmodule %t/comments.swiftmodule
-// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t | %FileCheck %s
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -enable-swiftsourceinfo -source-filename %s -I %t | %FileCheck %s
 
 /// first_decl_class_1 Aaa.
 public class first_decl_class_1 {
diff --git a/test/Serialization/comments-hidden.swift b/test/Serialization/comments-hidden.swift
@@ -18,7 +18,7 @@
 //
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -enable-testing -module-name comments -emit-module -emit-module-path %t/comments.swiftmodule -emit-module-doc -emit-module-doc-path %t/comments.swiftdoc -emit-module-source-info-path %t/comments.swiftsourceinfo %s
-// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t > %t.testing.txt
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -enable-swiftsourceinfo  -source-filename %s -I %t > %t.testing.txt
 // RUN: %FileCheck %s -check-prefix=SOURCE-LOC < %t.testing.txt
 
 /// PublicClass Documentation
diff --git a/test/Serialization/comments.swift b/test/Serialization/comments.swift
@@ -5,7 +5,7 @@
 // RUN: llvm-bcanalyzer %t/comments.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER
 // RUN: llvm-bcanalyzer %t/comments.swiftdoc | %FileCheck %s -check-prefix=BCANALYZER
 // RUN: llvm-bcanalyzer %t/comments.swiftsourceinfo | %FileCheck %s -check-prefix=BCANALYZER
-// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t | %FileCheck %s -check-prefix=FIRST
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -enable-swiftsourceinfo -source-filename %s -I %t | %FileCheck %s -check-prefix=FIRST
 
 // Test the case when we have a multiple files in a module.
 //
@@ -16,7 +16,7 @@
 // RUN: llvm-bcanalyzer %t/comments.swiftmodule | %FileCheck %s -check-prefix=BCANALYZER
 // RUN: llvm-bcanalyzer %t/comments.swiftdoc | %FileCheck %s -check-prefix=BCANALYZER
 // RUN: llvm-bcanalyzer %t/comments.swiftsourceinfo | %FileCheck %s -check-prefix=BCANALYZER
-// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -source-filename %s -I %t > %t.printed.txt
+// RUN: %target-swift-ide-test -print-module-comments -module-to-print=comments -enable-swiftsourceinfo -source-filename %s -I %t > %t.printed.txt
 // RUN: %FileCheck %s -check-prefix=FIRST < %t.printed.txt
 // RUN: %FileCheck %s -check-prefix=SECOND < %t.printed.txt
 
diff --git a/test/SourceKit/CompileNotifications/arg-parsing.swift b/test/SourceKit/CompileNotifications/arg-parsing.swift
@@ -3,7 +3,7 @@
 // ARG_PARSE_0: {
 // ARG_PARSE_0:  key.notification: source.notification.compile-will-start
 // ARG_PARSE_0:  key.compileid: [[CID1:".*"]]
-// ARG_PARSE_0:  key.compilerargs-string: "{{.*}}.swift -no-such-arg -Xfrontend -ignore-module-source-info"
+// ARG_PARSE_0:  key.compilerargs-string: "{{.*}}.swift -no-such-arg"
 // ARG_PARSE_0: }
 // ARG_PARSE_0: {
 // ARG_PARSE_0:   key.notification: source.notification.compile-did-finish
@@ -24,7 +24,7 @@
 // ARG_PARSE_1: {
 // ARG_PARSE_1:  key.notification: source.notification.compile-will-start
 // ARG_PARSE_1:  key.compileid: [[CID1:".*"]]
-// ARG_PARSE_1:  key.compilerargs-string: "{{.*}}.swift -no-such-arg -Xfrontend -ignore-module-source-info"
+// ARG_PARSE_1:  key.compilerargs-string: "{{.*}}.swift -no-such-arg"
 // ARG_PARSE_1: }
 // ARG_PARSE_1: {
 // ARG_PARSE_1:   key.notification: source.notification.compile-did-finish
diff --git a/test/SourceKit/CursorInfo/use-swift-source-info.swift b/test/SourceKit/CursorInfo/use-swift-source-info.swift
@@ -0,0 +1,29 @@
+import Foo
+func bar() {
+  foo()
+}
+
+// RUN: %empty-directory(%t)
+// RUN: echo "/// Some doc" >> %t/Foo.swift
+// RUN: echo "public func foo() { }" >> %t/Foo.swift
+// RUN: %target-swift-frontend -enable-batch-mode -emit-module -emit-module-doc -emit-module-path %t/Foo.swiftmodule %t/Foo.swift -module-name Foo -emit-module-source-info-path %t/Foo.swiftsourceinfo -emit-module-doc-path %t/Foo.swiftdoc
+//
+// Test setting optimize for ide to false
+// RUN: %sourcekitd-test -req=global-config -for-ide=0 == -req=cursor -pos=3:3 %s -- -I %t -target %target-triple %s | %FileCheck --check-prefixes=BOTH,WITH %s
+//
+// Test setting optimize for ide to true
+// RUN: %sourcekitd-test -req=global-config -for-ide=1 == -req=cursor -pos=3:3 %s -- -I %t -target %target-triple %s | %FileCheck --check-prefixes=BOTH,WITHOUT %s
+//
+// Test sourcekitd-test's default global configuration request (optimize for ide is true)
+// RUN: %sourcekitd-test -req=cursor -pos=3:3 %s -- -I %t -target %target-triple %s | %FileCheck --check-prefixes=BOTH,WITHOUT %s
+//
+// Test without sending any global configuration request to check the sevice's default settings (optimize for ide is false)
+// RUN: %sourcekitd-test -suppress-config-request -req=cursor -pos=3:3 %s -- -I %t -target %target-triple %s | %FileCheck --check-prefixes=BOTH,WITH %s
+
+// WITH: source.lang.swift.ref.function.free ({{.*}}/Foo.swift:2:13-2:16)
+// WITHOUT: source.lang.swift.ref.function.free ()
+// BOTH: foo()
+// BOTH: s:3Foo3fooyyF
+// BOTH: () -> ()
+// BOTH: $syycD
+// BOTH: Foo
diff --git a/test/SourceKit/Misc/stats.swift b/test/SourceKit/Misc/stats.swift
@@ -2,23 +2,23 @@ func foo() {}
 
 // RUN: %sourcekitd-test -req=syntax-map %s == -req=stats | %FileCheck %s -check-prefix=SYNTAX_1
 
-// SYNTAX_1: 2 {{.*}} source.statistic.num-requests
+// SYNTAX_1: 3 {{.*}} source.statistic.num-requests
 // SYNTAX_1: 0 {{.*}} source.statistic.num-semantic-requests
 // SYNTAX_1: 0 {{.*}} source.statistic.num-ast-builds
 // SYNTAX_1: 1 {{.*}} source.statistic.num-open-documents
 // SYNTAX_1: 1 {{.*}} source.statistic.max-open-documents
 
 // RUN: %sourcekitd-test -req=syntax-map %s == -req=close %s == -req=stats | %FileCheck %s -check-prefix=SYNTAX_2
 
-// SYNTAX_2: 3 {{.*}} source.statistic.num-requests
+// SYNTAX_2: 4 {{.*}} source.statistic.num-requests
 // SYNTAX_2: 0 {{.*}} source.statistic.num-semantic-requests
 // SYNTAX_2: 0 {{.*}} source.statistic.num-ast-builds
 // SYNTAX_2: 0 {{.*}} source.statistic.num-open-documents
 // SYNTAX_2: 1 {{.*}} source.statistic.max-open-documents
 
 // RUN: %sourcekitd-test -req=sema %s -- %s == -req=stats | %FileCheck %s -check-prefix=SEMA_1
 
-// SEMA_1: 3 {{.*}} source.statistic.num-requests
+// SEMA_1: 4 {{.*}} source.statistic.num-requests
 // SEMA_1: 0 {{.*}} source.statistic.num-semantic-requests
 // SEMA_1: 1 {{.*}} source.statistic.num-ast-builds
 // SEMA_1: 1 {{.*}} source.statistic.num-asts-in-memory
@@ -28,7 +28,7 @@ func foo() {}
 
 // RUN: %sourcekitd-test -req=sema %s -- %s == -req=edit -pos=1:1 -replace=" " %s == -req=stats | %FileCheck %s -check-prefix=SEMA_2
 
-// SEMA_2: 5 {{.*}} source.statistic.num-requests
+// SEMA_2: 6 {{.*}} source.statistic.num-requests
 // SEMA_2: 0 {{.*}} source.statistic.num-semantic-requests
 // SEMA_2: 2 {{.*}} source.statistic.num-ast-builds
 // NOTE: we cannot match num-asts-in-memory, or num-ast-cache-hits reliably when
@@ -40,7 +40,7 @@ func foo() {}
 
 // RUN: %sourcekitd-test -req=sema %s -- %s == -req=cursor -pos=1:6 %s -- %s == -req=stats | %FileCheck %s -check-prefix=SEMA_3
 
-// SEMA_3: 4 {{.*}} source.statistic.num-requests
+// SEMA_3: 5 {{.*}} source.statistic.num-requests
 // SEMA_3: 1 {{.*}} source.statistic.num-semantic-requests
 // SEMA_3: 1 {{.*}} source.statistic.num-ast-builds
 // SEMA_3: 1 {{.*}} source.statistic.num-asts-in-memory
@@ -50,7 +50,7 @@ func foo() {}
 
 // RUN: %sourcekitd-test -req=sema %s -- %s == -req=related-idents -pos=1:6 %s -- %s == -req=stats | %FileCheck %s -check-prefix=SEMA_4
 
-// SEMA_4: 4 {{.*}} source.statistic.num-requests
+// SEMA_4: 5 {{.*}} source.statistic.num-requests
 // SEMA_4: 1 {{.*}} source.statistic.num-semantic-requests
 // SEMA_4: 1 {{.*}} source.statistic.num-ast-builds
 // SEMA_4: 1 {{.*}} source.statistic.num-asts-in-memory
diff --git a/tools/SourceKit/include/SourceKit/Core/Context.h b/tools/SourceKit/include/SourceKit/Core/Context.h
@@ -16,6 +16,7 @@
 #include "SourceKit/Core/LLVM.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Mutex.h"
 #include <memory>
 #include <string>
 
@@ -27,10 +28,30 @@ namespace SourceKit {
   class LangSupport;
   class NotificationCenter;
 
+class GlobalConfig {
+public:
+  struct Settings {
+    /// When true, the default compiler options and other configuration flags will be chosen to optimize for
+    /// usage from an IDE.
+    ///
+    /// At the time of writing this just means ignoring .swiftsourceinfo files.
+    bool OptimizeForIDE = false;
+  };
+
+private:
+  Settings State;
+  mutable llvm::sys::Mutex Mtx;
+
+public:
+  Settings update(Optional<bool> OptimizeForIDE);
+  bool shouldOptimizeForIDE() const;
+};
+
 class Context {
   std::string RuntimeLibPath;
   std::unique_ptr<LangSupport> SwiftLang;
   std::shared_ptr<NotificationCenter> NotificationCtr;
+  std::shared_ptr<GlobalConfig> Config;
 
 public:
   Context(StringRef RuntimeLibPath,
@@ -44,6 +65,8 @@ class Context {
   LangSupport &getSwiftLangSupport() { return *SwiftLang; }
 
   std::shared_ptr<NotificationCenter> getNotificationCenter() { return NotificationCtr; }
+
+  std::shared_ptr<GlobalConfig> getGlobalConfiguration() { return Config; }
 };
 
 } // namespace SourceKit
diff --git a/tools/SourceKit/lib/Core/Context.cpp b/tools/SourceKit/lib/Core/Context.cpp
@@ -16,11 +16,25 @@
 
 using namespace SourceKit;
 
+GlobalConfig::Settings
+GlobalConfig::update(Optional<bool> OptimizeForIDE) {
+  llvm::sys::ScopedLock L(Mtx);
+  if (OptimizeForIDE.hasValue())
+    State.OptimizeForIDE = *OptimizeForIDE;
+  return State;
+};
+
+bool GlobalConfig::shouldOptimizeForIDE() const {
+  llvm::sys::ScopedLock L(Mtx);
+  return State.OptimizeForIDE;
+}
+
 SourceKit::Context::Context(StringRef RuntimeLibPath,
     llvm::function_ref<std::unique_ptr<LangSupport>(Context &)>
     LangSupportFactoryFn,
     bool shouldDispatchNotificationsOnMain) : RuntimeLibPath(RuntimeLibPath),
-    NotificationCtr(new NotificationCenter(shouldDispatchNotificationsOnMain)) {
+    NotificationCtr(new NotificationCenter(shouldDispatchNotificationsOnMain)),
+    Config(new GlobalConfig()) {
   // Should be called last after everything is initialized.
   SwiftLang = LangSupportFactoryFn(*this);
 }
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp b/tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
@@ -371,11 +371,13 @@ struct CacheKeyHashInfo<ASTKey> {
 struct SwiftASTManager::Implementation {
   explicit Implementation(
       std::shared_ptr<SwiftEditorDocumentFileMap> EditorDocs,
+      std::shared_ptr<GlobalConfig> Config,
       std::shared_ptr<SwiftStatistics> Stats, StringRef RuntimeResourcePath)
-      : EditorDocs(EditorDocs), Stats(Stats),
+      : EditorDocs(EditorDocs), Config(Config), Stats(Stats),
         RuntimeResourcePath(RuntimeResourcePath) {}
 
   std::shared_ptr<SwiftEditorDocumentFileMap> EditorDocs;
+  std::shared_ptr<GlobalConfig> Config;
   std::shared_ptr<SwiftStatistics> Stats;
   std::string RuntimeResourcePath;
   SourceManager SourceMgr;
@@ -401,8 +403,10 @@ struct SwiftASTManager::Implementation {
 
 SwiftASTManager::SwiftASTManager(
     std::shared_ptr<SwiftEditorDocumentFileMap> EditorDocs,
+    std::shared_ptr<GlobalConfig> Config,
     std::shared_ptr<SwiftStatistics> Stats, StringRef RuntimeResourcePath)
-    : Impl(*new Implementation(EditorDocs, Stats, RuntimeResourcePath)) {}
+    : Impl(*new Implementation(EditorDocs, Config, Stats,
+                               RuntimeResourcePath)) {}
 
 SwiftASTManager::~SwiftASTManager() {
   delete &Impl;
@@ -535,6 +539,15 @@ bool SwiftASTManager::initCompilerInvocation(
   // We don't care about LLVMArgs
   FrontendOpts.LLVMArgs.clear();
 
+  // SwiftSourceInfo files provide source location information for decls coming
+  // from loaded modules. For most IDE use cases it either has an undesirable
+  // impact on performance with no benefit (code completion), results in stale
+  // locations being used instead of more up-to-date indexer locations (cursor
+  // info), or has no observable effect (diagnostics, which are filtered to just
+  // those with a location in the primary file, and everything else).
+  if (Impl.Config->shouldOptimizeForIDE())
+    FrontendOpts.IgnoreSwiftSourceInfo = true;
+
   // Disable expensive SIL options to reduce time spent in SILGen.
   disableExpensiveSILOptions(Invocation.getSILOptions());
 
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftASTManager.h b/tools/SourceKit/lib/SwiftLang/SwiftASTManager.h
@@ -43,6 +43,7 @@ namespace SourceKit {
   class SwiftLangSupport;
   class SwiftInvocation;
   struct SwiftStatistics;
+  class GlobalConfig;
   typedef RefPtr<SwiftInvocation> SwiftInvocationRef;
   class EditorDiagConsumer;
 
@@ -89,6 +90,7 @@ typedef std::shared_ptr<SwiftASTConsumer> SwiftASTConsumerRef;
 class SwiftASTManager : public std::enable_shared_from_this<SwiftASTManager> {
 public:
   explicit SwiftASTManager(std::shared_ptr<SwiftEditorDocumentFileMap>,
+                           std::shared_ptr<GlobalConfig> Config,
                            std::shared_ptr<SwiftStatistics> Stats,
                            StringRef RuntimeResourcePath);
   ~SwiftASTManager();
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp b/tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
@@ -172,8 +172,8 @@ static bool swiftCodeCompleteImpl(
     return false;
   }
 
-  // Disable source location resolutions from .swiftsourceinfo file because
-  // they are somewhat heavy operations and are not needed for completions.
+  // Always disable source location resolutions from .swiftsourceinfo file
+  // because they're somewhat heavy operations and aren't needed for completion.
   Invocation.getFrontendOptions().IgnoreSwiftSourceInfo = true;
 
   const char *Position = InputFile->getBufferStart() + CodeCompletionOffset;
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp b/tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
@@ -67,8 +67,8 @@ static bool swiftConformingMethodListImpl(
     return false;
   }
 
-  // Disable source location resolutions from .swiftsourceinfo file because
-  // they are somewhat heavy operations and are not needed for completions.
+  // Always disable source location resolutions from .swiftsourceinfo file
+  // because they're somewhat heavy operations and aren't needed for completion.
   Invocation.getFrontendOptions().IgnoreSwiftSourceInfo = true;
 
   Invocation.setCodeCompletionPoint(newBuffer.get(), Offset);
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
@@ -263,8 +263,9 @@ SwiftLangSupport::SwiftLangSupport(SourceKit::Context &SKCtx)
 
   Stats = std::make_shared<SwiftStatistics>();
   EditorDocuments = std::make_shared<SwiftEditorDocumentFileMap>();
-  ASTMgr = std::make_shared<SwiftASTManager>(EditorDocuments, Stats,
-                                             RuntimeResourcePath);
+  ASTMgr = std::make_shared<SwiftASTManager>(EditorDocuments,
+                                             SKCtx.getGlobalConfiguration(),
+                                             Stats, RuntimeResourcePath);
   // By default, just use the in-memory cache.
   CCCache->inMemory = llvm::make_unique<ide::CodeCompletionCache>();
 
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
@@ -67,8 +67,8 @@ static bool swiftTypeContextInfoImpl(SwiftLangSupport &Lang,
     return false;
   }
 
-  // Disable source location resolutions from .swiftsourceinfo file because
-  // they are somewhat heavy operations and are not needed for completions.
+  // Always disable source location resolutions from .swiftsourceinfo file
+  // because they're somewhat heavy operations and aren't needed for completion.
   Invocation.getFrontendOptions().IgnoreSwiftSourceInfo = true;
 
   Invocation.setCodeCompletionPoint(newBuffer.get(), Offset);
diff --git a/tools/SourceKit/tools/sourcekitd-test/Options.td b/tools/SourceKit/tools/sourcekitd-test/Options.td
@@ -140,6 +140,12 @@ def vfs_files : CommaJoined<["-"], "vfs-files=">,
 def vfs_name : Separate<["-"], "vfs-name">,
   HelpText<"Specify a virtual filesystem name">;
 
+def optimize_for_ide : Joined<["-"], "for-ide=">,
+  HelpText<"Value for the OptimizeForIde global configuration setting">;
+
+def suppress_config_request : Flag<["-"], "suppress-config-request">,
+  HelpText<"Suppress the default global configuration request, that is otherwise sent before any other request (except for the global-config request itself)">;
+
 def help : Flag<["-", "--"], "help">,
   HelpText<"Display available options">;
 
diff --git a/tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp b/tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp
diff --git a/tools/SourceKit/tools/sourcekitd-test/TestOptions.h b/tools/SourceKit/tools/sourcekitd-test/TestOptions.h
diff --git a/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp b/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
diff --git a/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp b/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
diff --git a/utils/gyb_sourcekit_support/UIDs.py b/utils/gyb_sourcekit_support/UIDs.py
