[SourceKit] Use req options instead of compiler arguments for controlling index-to-store behavior

Author: skrtks

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -881,6 +881,10 @@ struct RenameLocations {
 struct IndexStoreOptions {
   std::string IndexStorePath;
   std::string IndexUnitOutputPath;
+  bool IgnoreClangModules = false;
+  bool IncludeSystemModules = false;
+  bool IgnoreStdlib = false;
+  bool DisableImplicitModules = false;
   bool IncludeLocals = false;
 };
 

tools/SourceKit/lib/SwiftLang/SwiftIndexing.cpp

@@ -370,12 +370,11 @@ void SwiftLangSupport::indexSource(StringRef InputFile,
 }
 
 static void emitIndexDataForSourceFile(SourceFile &PrimarySourceFile,
-                                       StringRef IndexStorePath,
-                                       StringRef IndexUnitOutputPath,
-                                       bool IncludeLocals,
+                                       IndexStoreOptions IndexOpts,
                                        const CompilerInstance &Instance) {
   const auto &Invocation = Instance.getInvocation();
-  const auto &Opts = Invocation.getFrontendOptions();
+//  FIXME: Compiler arguments should be the default for setting options, but this is currently broken (see PR #69076)
+//  const auto &Opts = Invocation.getFrontendOptions();
 
   bool isDebugCompilation;
   switch (Invocation.getSILOptions().OptMode) {
@@ -389,14 +388,15 @@ static void emitIndexDataForSourceFile(SourceFile &PrimarySourceFile,
       break;
   }
 
-  (void) index::indexAndRecord(&PrimarySourceFile, IndexUnitOutputPath,
-                               IndexStorePath,
-                               !Opts.IndexIgnoreClangModules,
-                               Opts.IndexSystemModules,
-                               Opts.IndexIgnoreStdlib,
-                               IncludeLocals,
+  (void) index::indexAndRecord(&PrimarySourceFile,
+                               IndexOpts.IndexUnitOutputPath,
+                               IndexOpts.IndexStorePath,
+                               !IndexOpts.IgnoreClangModules,
+                               IndexOpts.IncludeSystemModules,
+                               IndexOpts.IgnoreStdlib,
+                               IndexOpts.IncludeLocals,
                                isDebugCompilation,
-                               Opts.DisableImplicitModules,
+                               IndexOpts.DisableImplicitModules,
                                Invocation.getTargetTriple(),
                                *Instance.getDependencyTracker(),
                                Invocation.getIRGenOptions().FilePrefixMap);
@@ -426,9 +426,7 @@ void SwiftLangSupport::indexToStore(
     void handlePrimaryAST(ASTUnitRef AstUnit) override {
       auto &SF = AstUnit->getPrimarySourceFile();
       auto &CI = AstUnit->getCompilerInstance();
-      emitIndexDataForSourceFile(SF, Opts.IndexStorePath,
-                                 Opts.IndexUnitOutputPath, Opts.IncludeLocals,
-                                 CI);
+      emitIndexDataForSourceFile(SF, Opts, CI);
       Receiver(RequestResult<IndexStoreInfo>::fromResult(IndexStoreInfo{}));
     }
 

tools/SourceKit/tools/sourcekitd/lib/Service/Requests.cpp

@@ -1421,6 +1421,48 @@ static void handleRequestIndex(const RequestDict &Req,
   });
 }
 
+static std::optional<IndexStoreOptions>
+getIndexStoreOpts(const RequestDict &Req, ResponseReceiver Rec) {
+  IndexStoreOptions Opts;
+  if (auto IndexStorePath = Req.getString(KeyIndexStorePath))
+    Opts.IndexStorePath = IndexStorePath->str();
+  else {
+    Rec(createErrorRequestInvalid("'key.index_store_path' is required"));
+    return std::nullopt;
+  }
+
+  if (auto IndexUnitOutputPath = Req.getString(KeyIndexUnitOutputPath))
+    Opts.IndexUnitOutputPath = IndexUnitOutputPath->str();
+  else {
+    Rec(createErrorRequestInvalid("'key.index_unit_output_path' is required"));
+    return std::nullopt;
+  }
+
+  if (auto IncludeLocals = Req.getOptionalInt64(KeyIncludeLocals)) {
+    Opts.IncludeLocals = IncludeLocals.value() > 0;
+  }
+
+  if (auto IgnoreClangModules = Req.getOptionalInt64(KeyIgnoreClangModules)) {
+    Opts.IgnoreClangModules = IgnoreClangModules.value() > 0;
+  }
+
+  if (auto IncludeSystemModules =
+          Req.getOptionalInt64(KeyIncludeSystemModules)) {
+    Opts.IncludeSystemModules = IncludeSystemModules.value() > 0;
+  }
+
+  if (auto IgnoreStdlib = Req.getOptionalInt64(KeyIgnoreStdlib)) {
+    Opts.IgnoreStdlib = IgnoreStdlib.value() > 0;
+  }
+
+  if (auto DisableImplicitModules =
+          Req.getOptionalInt64(KeyDisableImplicitModules)) {
+    Opts.DisableImplicitModules = DisableImplicitModules.value() > 0;
+  }
+
+  return Opts;
+}
+
 static void handleRequestIndexToStore(
     const RequestDict &Req, SourceKitCancellationToken CancellationToken,
     ResponseReceiver Rec) {
@@ -1433,26 +1475,15 @@ static void handleRequestIndexToStore(
     if (!PrimaryFilePath)
       return;
 
-    IndexStoreOptions Opts;
-    if (auto IndexStorePath = Req.getString(KeyIndexStorePath))
-      Opts.IndexStorePath = IndexStorePath->str();
-    else
-      return Rec(createErrorRequestInvalid("'key.index_store_path' is required"));
-
-    if (auto IndexUnitOutputPath = Req.getString(KeyIndexUnitOutputPath))
-      Opts.IndexUnitOutputPath = IndexUnitOutputPath->str();
-    else
-      return Rec(createErrorRequestInvalid("'key.index_unit_output_path' is required"));
-
-    if (auto IncludeLocals = Req.getOptionalInt64(KeyIncludeLocals)) {
-      Opts.IncludeLocals = IncludeLocals.value() > 0;
-    }
+    std::optional<IndexStoreOptions> Opts = getIndexStoreOpts(Req, Rec);
+    if (!Opts)
+      return;
 
     SmallVector<const char *, 0> Args;
     if (getCompilerArgumentsForRequestOrEmitError(Req, Args, Rec))
       return;
     LangSupport &Lang = getGlobalContext().getSwiftLangSupport();
-    Lang.indexToStore(*PrimaryFilePath, Args, std::move(Opts),
+    Lang.indexToStore(*PrimaryFilePath, Args, std::move(*Opts),
       CancellationToken,
       [Rec](const RequestResult<IndexStoreInfo> &Result) {
         if (Result.isCancelled())

utils/gyb_sourcekit_support/UIDs.py

@@ -215,6 +215,10 @@ def __init__(self, internal_name, external_name):
     KEY('IndexStorePath', 'key.index_store_path'),
     KEY('IndexUnitOutputPath', 'key.index_unit_output_path'),
     KEY('IncludeLocals', 'key.include_locals'),
+    KEY('IgnoreClangModules', 'key.ignore_clang_modules'),
+    KEY('IncludeSystemModules', 'key.include_system_modules'),
+    KEY('IgnoreStdlib', 'key.ignore_stdlib'),
+    KEY('DisableImplicitModules', 'key.disable_implicit_modules'),
 ]