merge receivers and tests

Author: woshiccm

Tests/IndexStoreDBTests/IndexTests.swift

@@ -300,31 +300,20 @@ final class IndexTests: XCTestCase {
     ])
   }
 
-  func testFilesIncludedByFile() throws {
+  func testFilesIncludes() throws {
     guard let ws = try staticTibsTestWorkspace(name: "MainFiles") else { return }
     try ws.buildAndIndex()
     let index = ws.index
 
     let main1 = ws.testLoc("main1").url.path
+    let main2 = ws.testLoc("main2").url.path
     let uniq1 = ws.testLoc("uniq1").url.path
     let shared = ws.testLoc("shared").url.path
 
     let includedFiles = index.filesIncludedByFile(path: main1)
-    XCTAssertEqual(includedFiles.count, 2)
     XCTAssertEqual(includedFiles, [shared, uniq1])
-  }
 
-  func testFilesIncludingFile() throws {
-    guard let ws = try staticTibsTestWorkspace(name: "MainFiles") else { return }
-    try ws.buildAndIndex()
-    let index = ws.index
-        
-    let shared = ws.testLoc("shared").url.path
-    let main1 = ws.testLoc("main1").url.path
-    let main2 = ws.testLoc("main2").url.path
-        
     let includingFiles = index.filesIncludingFile(path: shared)
-    XCTAssertEqual(includingFiles.count, 2)
     XCTAssertEqual(includingFiles, [main1, main2])
   }
 

include/CIndexStoreDB/CIndexStoreDB.h

@@ -139,10 +139,7 @@ typedef void(^indexstoredb_delegate_event_receiver_t)(_Nonnull indexstoredb_dele
 typedef bool(^indexstoredb_unit_info_receiver)(_Nonnull indexstoredb_unit_info_t);
 
 /// Returns true to continue.
-typedef bool(^indexstoredb_files_included_receiver)(const char *_Nonnull targetPath, size_t line);
-
-/// Returns true to continue.
-typedef bool(^indexstoredb_files_including_receiver)(const char *_Nonnull sourcePath, size_t line);
+typedef bool(^indexstoredb_file_includes_receiver)(const char *_Nonnull sourcePath, size_t line);
 
 /// Returns true to continue.
 typedef bool(^indexstoredb_unit_includes_receiver)(const char *_Nonnull sourcePath, const char *_Nonnull targetPath, size_t line);
@@ -401,7 +398,7 @@ INDEXSTOREDB_PUBLIC bool
 indexstoredb_index_files_included_by_file(
   _Nonnull indexstoredb_index_t index,
   const char *_Nonnull path,
-  _Nonnull indexstoredb_files_included_receiver receiver);
+  _Nonnull indexstoredb_file_includes_receiver receiver);
 
 /// Return the file path which including a given header.
 ///
@@ -413,7 +410,7 @@ INDEXSTOREDB_PUBLIC bool
 indexstoredb_index_files_including_file(
   _Nonnull indexstoredb_index_t index,
   const char *_Nonnull path,
-  _Nonnull indexstoredb_files_including_receiver receiver);
+  _Nonnull indexstoredb_file_includes_receiver receiver);
 
 /// Iterates over recorded `#include`s of a unit.
 ///

lib/CIndexStoreDB/CIndexStoreDB.cpp

@@ -435,19 +435,19 @@ bool
 indexstoredb_index_files_included_by_file(
   indexstoredb_index_t index,
   const char *path,
-  indexstoredb_files_included_receiver receiver)
+  indexstoredb_file_includes_receiver receiver)
 {
   auto obj = (Object<std::shared_ptr<IndexSystem>> *)index;
-  return obj->value->foreachFileIncludedByFile(path, [&](const CanonicalFilePathRef &targetPath, unsigned line) -> bool {
-    return receiver(targetPath.getPath().str().c_str(), line);
+  return obj->value->foreachFileIncludedByFile(path, [&](const CanonicalFilePathRef &sourcePath, unsigned line) -> bool {
+    return receiver(sourcePath.getPath().str().c_str(), line);
   });
 }
 
 bool
 indexstoredb_index_files_including_file(
   indexstoredb_index_t index,
   const char *path,
-  indexstoredb_files_including_receiver receiver)
+  indexstoredb_file_includes_receiver receiver)
 {
   auto obj = (Object<std::shared_ptr<IndexSystem>> *)index;
   return obj->value->foreachFileIncludingFile(path, [&](const CanonicalFilePathRef &sourcePath, unsigned line) -> bool {