Merge pull request #203 from ahoppen/remove-symbol-provider-for-url-api

Revert "Allow retrieval of the symbol provider kind for a source file"

Author: ahoppen

Sources/IndexStoreDB/IndexStoreDB.swift

@@ -40,14 +40,12 @@ public enum SymbolProviderKind {
   case clang
   case swift
 
-  init?(_ cKind: indexstoredb_symbol_provider_kind_t) {
+  init(_ cKind: indexstoredb_symbol_provider_kind_t) {
     switch cKind {
     case INDEXSTOREDB_SYMBOL_PROVIDER_KIND_SWIFT:
       self = .swift
     case INDEXSTOREDB_SYMBOL_PROVIDER_KIND_CLANG:
       self = .clang
-    case INDEXSTOREDB_SYMBOL_PROVIDER_KIND_UNKNOWN:
-      return nil
     default:
       preconditionFailure("Unknown enum case in indexstoredb_symbol_provider_kind_t")
     }
@@ -313,32 +311,6 @@ public final class IndexStoreDB {
     }
     return result
   }
-    
-  public func symbolProvider(for sourceFilePath: String) -> SymbolProviderKind? {
-    var result: SymbolProviderKind? = nil
-    indexstoredb_index_units_containing_file(impl, sourceFilePath) { unit in
-      let providerKind = SymbolProviderKind(indexstoredb_unit_info_symbol_provider_kind(unit))
-
-      let mainFilePath = String(cString: indexstoredb_unit_info_main_file_path(unit))
-      if providerKind == .swift && mainFilePath != sourceFilePath {
-        // We have a unit that is "included" from Swift. This happens for header
-        // files that Swift files depend on. But Swift doesn't have includes and
-        // we shouldn't infer the header file's language to Swift based on this unit.
-        // Ignore it.
-        return true
-      }
-
-      if result == nil {
-        result = providerKind
-      } else if result != providerKind {
-        // Found two conflicting provider kinds. Return nil as we don't know the provider in this case.
-        result = nil
-        return false
-      }
-      return true
-    }
-    return result
-  }
 
   @discardableResult
   public func foreachFileIncludedByFile(path: String, body: (String) -> Bool) -> Bool {

Sources/IndexStoreDB/SymbolOccurrence.swift

@@ -74,8 +74,7 @@ extension SymbolOccurrence {
       symbol: Symbol(indexstoredb_symbol_occurrence_symbol(value)),
       location: SymbolLocation(indexstoredb_symbol_occurrence_location(value)),
       roles: SymbolRole(rawValue: indexstoredb_symbol_occurrence_roles(value)),
-      // Force unwrap is OK because `indexstoredb_symbol_occurrence_symbol_provider_kind` never returns `INDEXSTOREDB_SYMBOL_PROVIDER_KIND_UNKNOWN`
-      symbolProvider: SymbolProviderKind(indexstoredb_symbol_occurrence_symbol_provider_kind(value))!,
+      symbolProvider: SymbolProviderKind(indexstoredb_symbol_occurrence_symbol_provider_kind(value)),
       relations: relations)
   }
 }

include/CIndexStoreDB/CIndexStoreDB.h

@@ -498,9 +498,6 @@ indexstoredb_unit_info_main_file_path(_Nonnull indexstoredb_unit_info_t);
 INDEXSTOREDB_PUBLIC const char *_Nonnull
 indexstoredb_unit_info_unit_name(_Nonnull indexstoredb_unit_info_t);
 
-INDEXSTOREDB_PUBLIC indexstoredb_symbol_provider_kind_t
-indexstoredb_unit_info_symbol_provider_kind(_Nonnull indexstoredb_unit_info_t info);
-
 /// Iterates over the compilation units that contain \p path and return their units.
 ///
 /// This can be used to find information for units that include a given header.

include/IndexStoreDB/Index/StoreUnitInfo.h

@@ -13,7 +13,6 @@
 #ifndef INDEXSTOREDB_INDEX_STOREUNITINFO_H
 #define INDEXSTOREDB_INDEX_STOREUNITINFO_H
 
-#include "IndexStoreDB/Core/Symbol.h"
 #include "IndexStoreDB/Support/Path.h"
 #include "llvm/Support/Chrono.h"
 #include <string>
@@ -27,18 +26,16 @@ struct StoreUnitInfo {
   std::string OutFileIdentifier;
   bool HasTestSymbols = false;
   llvm::sys::TimePoint<> ModTime;
-  Optional<SymbolProviderKind> SymProviderKind;
 
   StoreUnitInfo() = default;
   StoreUnitInfo(std::string unitName, CanonicalFilePath mainFilePath,
                 StringRef outFileIdentifier, bool hasTestSymbols,
-                llvm::sys::TimePoint<> modTime,
-                Optional<SymbolProviderKind> SymProviderKind)
+                llvm::sys::TimePoint<> modTime)
       : UnitName(unitName),
         MainFilePath(mainFilePath),
         OutFileIdentifier(outFileIdentifier),
         HasTestSymbols(hasTestSymbols),
-        ModTime(modTime), SymProviderKind(SymProviderKind) {}
+        ModTime(modTime) {}
 };
 
 } // namespace index

lib/CIndexStoreDB/CIndexStoreDB.cpp

@@ -589,20 +589,6 @@ indexstoredb_unit_info_unit_name(indexstoredb_unit_info_t info) {
   return obj->UnitName.c_str();
 }
 
-indexstoredb_symbol_provider_kind_t
-indexstoredb_unit_info_symbol_provider_kind(_Nonnull indexstoredb_unit_info_t info) {
-  auto obj = (const StoreUnitInfo *)info;
-  if (!obj->SymProviderKind) {
-    return INDEXSTOREDB_SYMBOL_PROVIDER_KIND_UNKNOWN;
-  }
-  switch (*obj->SymProviderKind) {
-  case IndexStoreDB::SymbolProviderKind::Clang:
-    return INDEXSTOREDB_SYMBOL_PROVIDER_KIND_CLANG;
-  case IndexStoreDB::SymbolProviderKind::Swift:
-    return INDEXSTOREDB_SYMBOL_PROVIDER_KIND_SWIFT;
-  }
-}
-
 bool
 indexstoredb_index_units_containing_file(
   indexstoredb_index_t index,

lib/Index/FilePathIndex.cpp

@@ -166,7 +166,6 @@ bool FileIndexImpl::foreachMainUnitContainingFile(CanonicalFilePathRef filePath,
       currUnit.ModTime = unitInfo.ModTime;
       currUnit.MainFilePath = reader.getFullFilePathFromCode(unitInfo.MainFileCode);
       currUnit.OutFileIdentifier = reader.getUnitFileIdentifierFromCode(unitInfo.OutFileCode);
-      currUnit.SymProviderKind = unitInfo.SymProviderKind;
       return true;
     });
   }

lib/Index/IndexDatastore.cpp

@@ -474,7 +474,6 @@ void StoreUnitRepo::registerUnit(StringRef unitName, bool isInitialScan, std::sh
   bool needDatabaseUpdate;
   Optional<bool> optIsSystem;
   Optional<bool> PrevHasTestSymbols;
-  Optional<SymbolProviderKind> PrevSymProviderKind;
   IDCode PrevMainFileCode;
   IDCode PrevOutFileCode;
   Optional<StoreUnitInfo> StoreUnitInfoOpt;
@@ -494,7 +493,6 @@ void StoreUnitRepo::registerUnit(StringRef unitName, bool isInitialScan, std::sh
       PrevMainFileCode = unitImport.getPrevMainFileCode();
       PrevOutFileCode = unitImport.getPrevOutFileCode();
       PrevHasTestSymbols = unitImport.getHasTestSymbols();
-      PrevSymProviderKind = unitImport.getSymbolProviderKind();
       return false;
     }
 
@@ -592,14 +590,7 @@ void StoreUnitRepo::registerUnit(StringRef unitName, bool isInitialScan, std::sh
     }
 
     unitImport.commit();
-    StoreUnitInfoOpt = StoreUnitInfo{
-      unitName,
-      CanonMainFile,
-      OutFileIdentifier,
-      unitImport.getHasTestSymbols().getValue(),
-      unitModTime,
-      unitImport.getSymbolProviderKind()
-    };
+    StoreUnitInfoOpt = StoreUnitInfo{unitName, CanonMainFile, OutFileIdentifier, unitImport.getHasTestSymbols().getValue(), unitModTime};
     import.commit();
     return false;
   };
@@ -612,14 +603,7 @@ void StoreUnitRepo::registerUnit(StringRef unitName, bool isInitialScan, std::sh
       ReadTransaction reader(SymIndex->getDBase());
       CanonicalFilePath mainFile = reader.getFullFilePathFromCode(PrevMainFileCode);
       std::string outFileIdentifier = reader.getUnitFileIdentifierFromCode(PrevOutFileCode);
-      StoreUnitInfoOpt = StoreUnitInfo{
-        unitName,
-        mainFile,
-        outFileIdentifier,
-        PrevHasTestSymbols.getValue(),
-        unitModTime,
-        PrevSymProviderKind.getValue()
-      };
+      StoreUnitInfoOpt = StoreUnitInfo{unitName, mainFile, outFileIdentifier, PrevHasTestSymbols.getValue(), unitModTime};
     }
     Delegate->processedStoreUnit(StoreUnitInfoOpt.getValue());
   }
@@ -826,7 +810,6 @@ void StoreUnitRepo::onUnitOutOfDate(IDCode unitCode, StringRef unitName,
   CanonicalFilePath MainFilePath;
   std::string OutFileIdentifier;
   bool hasTestSymbols = false;
-  Optional<SymbolProviderKind> SymProviderKind;
   llvm::sys::TimePoint<> CurrModTime;
   SmallVector<IDCode, 8> dependentUnits;
   {
@@ -838,7 +821,6 @@ void StoreUnitRepo::onUnitOutOfDate(IDCode unitCode, StringRef unitName,
       }
       OutFileIdentifier = reader.getUnitFileIdentifierFromCode(unitInfo.OutFileCode);
       hasTestSymbols = unitInfo.HasTestSymbols;
-      SymProviderKind = unitInfo.SymProviderKind;
       CurrModTime = unitInfo.ModTime;
     }
     reader.getDirectDependentUnits(unitCode, dependentUnits);
@@ -850,8 +832,7 @@ void StoreUnitRepo::onUnitOutOfDate(IDCode unitCode, StringRef unitName,
       MainFilePath,
       OutFileIdentifier,
       hasTestSymbols,
-      CurrModTime,
-      SymProviderKind
+      CurrModTime
     };
     Delegate->unitIsOutOfDate(unitInfo, trigger, synchronous);
   }