[SourceKit] Remove IsNonProtocolType parameter from rename locations

The parameter was never checked anywhere.

Author: ahoppen

Diff for: include/swift/Refactoring/Refactoring.h

@@ -73,7 +73,6 @@ struct RenameLoc {
   NameUsage Usage;
   StringRef OldName;
   const bool IsFunctionLike;
-  const bool IsNonProtocolType;
 };
 
 /// An array of \c RenameLoc that also keeps the underlying string storage of

Diff for: lib/Refactoring/ExtractFunction.cpp

@@ -78,9 +78,10 @@ static SourceLoc getNewFuncInsertLoc(DeclContext *DC,
   return SourceLoc();
 }
 
-static std::vector<NoteRegion>
-getNotableRegions(StringRef SourceText, unsigned NameOffset, StringRef Name,
-                  bool IsFunctionLike = false, bool IsNonProtocolType = false) {
+static std::vector<NoteRegion> getNotableRegions(StringRef SourceText,
+                                                 unsigned NameOffset,
+                                                 StringRef Name,
+                                                 bool IsFunctionLike = false) {
   auto InputBuffer =
       llvm::MemoryBuffer::getMemBufferCopy(SourceText, "<extract>");
 
@@ -108,9 +109,9 @@ getNotableRegions(StringRef SourceText, unsigned NameOffset, StringRef Name,
       Matcher.resolve(llvm::makeArrayRef(UnresoledName), llvm::None);
   assert(!Resolved.empty() && "Failed to resolve generated func name loc");
 
-  RenameLoc RenameConfig = {LineAndCol.first,      LineAndCol.second,
+  RenameLoc RenameConfig = {LineAndCol.first, LineAndCol.second,
                             NameUsage::Definition, /*OldName=*/Name,
-                            IsFunctionLike,        IsNonProtocolType};
+                            IsFunctionLike};
   RenameRangeDetailCollector Renamer(SM, Name);
   Renamer.addSyntacticRenameRanges(Resolved.back(), RenameConfig);
   auto Ranges = Renamer.Ranges;

Diff for: lib/Refactoring/LocalRename.cpp

@@ -219,7 +219,6 @@ class RenameRangeCollector : public IndexDataConsumer {
         } else {
           assert(existingLoc->OldName == loc->OldName &&
                  existingLoc->IsFunctionLike == loc->IsFunctionLike &&
-                 existingLoc->IsNonProtocolType == loc->IsNonProtocolType &&
                  "Asked to do a different rename for the same location?");
         }
       }
@@ -253,7 +252,6 @@ RenameRangeCollector::indexSymbolToRenameLoc(const index::IndexSymbol &symbol) {
   }
 
   bool isFunctionLike = false;
-  bool isNonProtocolType = false;
 
   switch (symbol.symInfo.Kind) {
   case index::SymbolKind::EnumConstant:
@@ -268,14 +266,11 @@ RenameRangeCollector::indexSymbolToRenameLoc(const index::IndexSymbol &symbol) {
   case index::SymbolKind::Class:
   case index::SymbolKind::Enum:
   case index::SymbolKind::Struct:
-    isNonProtocolType = true;
-    break;
   default:
     break;
   }
   StringRef oldName = stringStorage->copyString(symbol.name);
-  return RenameLoc{symbol.line, symbol.column,  usage,
-                   oldName,     isFunctionLike, isNonProtocolType};
+  return RenameLoc{symbol.line, symbol.column, usage, oldName, isFunctionLike};
 }
 
 bool RefactoringActionLocalRename::isApplicable(

Diff for: tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -907,7 +907,6 @@ struct RenameLocation {
 struct RenameLocations {
   StringRef OldName;
   const bool IsFunctionLike;
-  const bool IsNonProtocolType;
   std::vector<RenameLocation> LineColumnLocs;
 };
 

Diff for: tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

@@ -1506,8 +1506,7 @@ getSyntacticRenameLocs(ArrayRef<RenameLocations> RenameLocations) {
     for(const auto &Location: Locations.LineColumnLocs) {
       RenameLocs.push_back({Location.Line, Location.Column,
                             getNameUsage(Location.Type), Locations.OldName,
-                            Locations.IsFunctionLike,
-                            Locations.IsNonProtocolType});
+                            Locations.IsFunctionLike});
     }
   }
   return RenameLocs;

Diff for: tools/SourceKit/tools/sourcekitd/lib/Service/Requests.cpp

@@ -4005,22 +4005,14 @@ buildRenameLocationsFromDict(const RequestDict &Req,
       return true;
     }
 
-    int64_t IsNonProtocolType = false;
-    if (RenameLocation.getInt64(KeyIsNonProtocolType, IsNonProtocolType, false)) {
-      Error = "missing key.is_non_protocol_type";
-      return true;
-    }
-
     Optional<StringRef> OldName = RenameLocation.getString(KeyName);
     if (!OldName.has_value()) {
       Error = "missing key.name";
       return true;
     }
 
-    RenameLocations.push_back({*OldName,
-                               static_cast<bool>(IsFunctionLike),
-                               static_cast<bool>(IsNonProtocolType),
-                               {}});
+    RenameLocations.push_back(
+        {*OldName, static_cast<bool>(IsFunctionLike), {}});
     auto &LineCols = RenameLocations.back().LineColumnLocs;
     bool Failed = RenameLocation.dictionaryArrayApply(KeyLocations,
                                                       [&](RequestDict LineAndCol) {

Diff for: tools/swift-refactor/swift-refactor.cpp

@@ -243,14 +243,13 @@ std::vector<RefactorLoc> getLocsByLabelOrPosition(StringRef LabelOrLineCol,
 std::vector<RenameLoc> getRenameLocs(unsigned BufferID, SourceManager &SM,
                                      ArrayRef<RefactorLoc> Locs,
                                      StringRef OldName, StringRef NewName,
-                                     bool IsFunctionLike,
-                                     bool IsNonProtocolType) {
+                                     bool IsFunctionLike) {
   std::vector<RenameLoc> Renames;
-  llvm::transform(Locs, std::back_inserter(Renames),
-                  [&](const RefactorLoc &Loc) -> RenameLoc {
-                    return {Loc.Line, Loc.Column,     Loc.Usage,
-                            OldName,  IsFunctionLike, IsNonProtocolType};
-                  });
+  llvm::transform(
+      Locs, std::back_inserter(Renames),
+      [&](const RefactorLoc &Loc) -> RenameLoc {
+        return {Loc.Line, Loc.Column, Loc.Usage, OldName, IsFunctionLike};
+      });
   return Renames;
 }
 
@@ -392,10 +391,9 @@ int main(int argc, char *argv[]) {
       NewName = "";
     }
 
-    std::vector<RenameLoc>
-    RenameLocs = getRenameLocs(BufferID, SM, Start, options::OldName, NewName,
-                               options::IsFunctionLike.getNumOccurrences(),
-                               options::IsNonProtocolType.getNumOccurrences());
+    std::vector<RenameLoc> RenameLocs =
+        getRenameLocs(BufferID, SM, Start, options::OldName, NewName,
+                      options::IsFunctionLike.getNumOccurrences());
 
     switch (options::Action) {
     case RefactoringKind::GlobalRename: {