[SourceKit] Factor out some more bridging code to run the NameMatcher from swift-syntax

Author: ahoppen

include/swift/IDE/IDEBridging.h

@@ -164,8 +164,10 @@ class BridgedResolvedLocVector {
 extern "C" {
 #endif
 
-/// Entry point to run the NameMatcher written in swift-syntax.
-/// 
+/// Low-level entry point to run the NameMatcher written in swift-syntax.
+///
+/// - Warning: The only caller of this should be `swift::ide::runNameMatcher`.
+///
 /// - Parameters:
 ///   - sourceFilePtr: A pointer to an `ExportedSourceFile`, used to access the
 ///     syntax tree

include/swift/IDE/Utils.h

@@ -715,6 +715,19 @@ bool isDynamicRef(Expr *Base, ValueDecl *D, llvm::function_ref<Type(Expr *)> get
 void getReceiverType(Expr *Base,
                      SmallVectorImpl<NominalTypeDecl *> &Types);
 
+#if SWIFT_BUILD_SWIFT_SYNTAX
+/// Entry point to run the NameMatcher written in swift-syntax.
+///
+/// - Parameters:
+///   - sourceFile: The source file from which to load the SwiftSyntax tree
+///   - locations: The locations to resolve
+/// - Returns: A list of `ResolvedLoc` that have been resolved. This list might
+///   be shorteder than `locations` if some locations could not be resolved and
+///   the resolved locations might be in a different order than `locations`.
+std::vector<ResolvedLoc> runNameMatcher(const SourceFile &sourceFile,
+                                        ArrayRef<SourceLoc> locations);
+#endif
+
 } // namespace ide
 } // namespace swift
 

lib/IDE/CMakeLists.txt

@@ -46,4 +46,14 @@ target_link_libraries(swiftIDE PRIVATE
   swiftParse
   swiftSema)
 
+if (SWIFT_BUILD_SWIFT_SYNTAX)
+  target_compile_definitions(swiftIDE
+    PRIVATE
+    SWIFT_BUILD_SWIFT_SYNTAX
+  )
+  target_link_libraries(swiftIDE PRIVATE
+    swiftIDEUtilsBridging
+  )
+endif()
+
 set_swift_llvm_is_available(swiftIDE)

lib/IDE/Utils.cpp

@@ -1094,3 +1094,21 @@ void swift::ide::getReceiverType(Expr *Base,
     Types.push_back(TyD);
   }
 }
+
+#if SWIFT_BUILD_SWIFT_SYNTAX
+std::vector<ResolvedLoc>
+swift::ide::runNameMatcher(const SourceFile &sourceFile,
+                           ArrayRef<SourceLoc> locations) {
+  std::vector<BridgedSourceLoc> bridgedUnresolvedLocs;
+  bridgedUnresolvedLocs.reserve(locations.size());
+  for (SourceLoc loc : locations) {
+    bridgedUnresolvedLocs.push_back(BridgedSourceLoc(loc));
+  }
+
+  BridgedResolvedLocVector bridgedResolvedLocs =
+      swift_SwiftIDEUtilsBridging_runNameMatcher(
+          sourceFile.getExportedSourceFile(), bridgedUnresolvedLocs.data(),
+          bridgedUnresolvedLocs.size());
+  return bridgedResolvedLocs.takeUnbridged();
+}
+#endif // SWIFT_BUILD_SWIFT_SYNTAX

lib/Refactoring/LocalRename.cpp

@@ -57,11 +57,8 @@ isReferenceWithoutArguments(const llvm::Optional<RenameRefInfo> &refInfo) {
   if (refInfo->IsArgLabel) {
     return false;
   }
-  BridgedSourceLoc Loc(refInfo->Loc);
-  BridgedResolvedLocVector bridgedResolvedLocs =
-      swift_SwiftIDEUtilsBridging_runNameMatcher(
-          refInfo->SF->getExportedSourceFile(), &Loc, 1);
-  std::vector<ResolvedLoc> resolvedLocs = bridgedResolvedLocs.takeUnbridged();
+  std::vector<ResolvedLoc> resolvedLocs =
+      runNameMatcher(*refInfo->SF, refInfo->Loc);
   if (!resolvedLocs.empty()) {
     ResolvedLoc resolvedLoc = resolvedLocs.front();
     return resolvedLoc.labelRanges.empty();

lib/Refactoring/SyntacticRename.cpp

@@ -74,18 +74,8 @@ swift::ide::resolveRenameLocations(ArrayRef<RenameLoc> RenameLocs,
 
   assert(UnresolvedLocs.size() == RenameLocs.size());
 
-  std::vector<BridgedSourceLoc> BridgedUnresolvedLocs;
-  BridgedUnresolvedLocs.reserve(UnresolvedLocs.size());
-  for (SourceLoc Loc : UnresolvedLocs) {
-    BridgedUnresolvedLocs.push_back(BridgedSourceLoc(Loc));
-  }
-
-  BridgedResolvedLocVector bridgedResolvedLocs =
-      swift_SwiftIDEUtilsBridging_runNameMatcher(SF.getExportedSourceFile(),
-                                                 BridgedUnresolvedLocs.data(),
-                                                 BridgedUnresolvedLocs.size());
   std::vector<ResolvedLoc> resolvedLocsInSourceOrder =
-      bridgedResolvedLocs.takeUnbridged();
+      runNameMatcher(SF, UnresolvedLocs);
 
   // Callers need to corrolate the `ResolvedLoc` with the `RenameLoc` that they
   // originated from. Match them.