NFC: Rename shouldCollectToken -> shouldCollectTokens

And fix the name of the underlying vector.

Author: hamishknight

include/swift/AST/SourceFile.h

@@ -573,9 +573,13 @@ class SourceFile final : public FileUnit {
 
   std::vector<Token> &getTokenVector();
 
+  /// If this source file has been told to collect its parsed tokens, retrieve
+  /// those tokens.
   ArrayRef<Token> getAllTokens() const;
 
-  bool shouldCollectToken() const;
+  /// Whether the parsed tokens of this source file should be saved, allowing
+  /// them to be accessed from \c getAllTokens.
+  bool shouldCollectTokens() const;
 
   bool shouldBuildSyntaxTree() const;
 
@@ -602,8 +606,9 @@ class SourceFile final : public FileUnit {
 
 private:
 
-  /// If not None, the underlying vector should contain tokens of this source file.
-  Optional<std::vector<Token>> AllCorrectedTokens;
+  /// If not \c None, the underlying vector contains the parsed tokens of this
+  /// source file.
+  Optional<std::vector<Token>> AllCollectedTokens;
 
   std::unique_ptr<SourceFileSyntaxInfo> SyntaxInfo;
 };

lib/AST/Module.cpp

@@ -2232,26 +2232,26 @@ SourceFile::SourceFile(ModuleDecl &M, SourceFileKind K,
     (void)problem;
   }
   if (KeepParsedTokens) {
-    AllCorrectedTokens = std::vector<Token>();
+    AllCollectedTokens = std::vector<Token>();
   }
 }
 
 std::vector<Token> &SourceFile::getTokenVector() {
-  assert(shouldCollectToken() && "Disabled");
-  return *AllCorrectedTokens;
+  assert(shouldCollectTokens() && "Disabled");
+  return *AllCollectedTokens;
 }
 
 ArrayRef<Token> SourceFile::getAllTokens() const {
-  assert(shouldCollectToken() && "Disabled");
-  return *AllCorrectedTokens;
+  assert(shouldCollectTokens() && "Disabled");
+  return *AllCollectedTokens;
 }
 
-bool SourceFile::shouldCollectToken() const {
+bool SourceFile::shouldCollectTokens() const {
   switch (Kind) {
   case SourceFileKind::Library:
   case SourceFileKind::Main:
   case SourceFileKind::Interface:
-    return (bool)AllCorrectedTokens;
+    return (bool)AllCollectedTokens;
   case SourceFileKind::SIL:
     return false;
   }
@@ -2283,7 +2283,7 @@ bool SourceFile::hasDelayedBodyParsing() const {
     return false;
   if (hasInterfaceHash())
     return false;
-  if (shouldCollectToken())
+  if (shouldCollectTokens())
     return false;
   if (shouldBuildSyntaxTree())
     return false;

lib/Parse/Parser.cpp

@@ -531,7 +531,7 @@ Parser::Parser(std::unique_ptr<Lexer> Lex, SourceFile &SF,
     CurDeclContext(&SF),
     Context(SF.getASTContext()),
     CurrentTokenHash(SF.getInterfaceHashPtr()),
-    TokReceiver(SF.shouldCollectToken() ?
+    TokReceiver(SF.shouldCollectTokens() ?
                 new TokenRecorder(SF, L->getBufferID()) :
                 new ConsumeTokenReceiver()),
     SyntaxContext(new SyntaxParsingContext(SyntaxContext, SF,