Merge pull request #62522 from ahoppen/ahoppen/rename-completion

[IDE] Rename CodeCompletion to IDEInspection in cases where the code path no longer exclusively applies to code completion

Author: ahoppen

include/swift/AST/ASTTypeIDZone.def

@@ -44,8 +44,8 @@ SWIFT_TYPEID(Witness)
 SWIFT_TYPEID_NAMED(AbstractFunctionDecl *, AbstractFunctionDecl)
 SWIFT_TYPEID_NAMED(ApplyExpr *, ApplyExpr)
 SWIFT_TYPEID_NAMED(ClosureExpr *, ClosureExpr)
-SWIFT_TYPEID_NAMED(CodeCompletionCallbacksFactory *,
-                   CodeCompletionCallbacksFactory)
+SWIFT_TYPEID_NAMED(IDEInspectionCallbacksFactory *,
+                                 IDEInspectionCallbacksFactory)
 SWIFT_TYPEID_NAMED(ConstructorDecl *, ConstructorDecl)
 SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
 SWIFT_TYPEID_NAMED(ConstValueTypeInfo *, ConstValueTypeInfo)

include/swift/AST/ASTTypeIDs.h

@@ -29,7 +29,7 @@ enum class BodyInitKind;
 struct BodyInitKindAndExpr;
 class BraceStmt;
 class ClosureExpr;
-class CodeCompletionCallbacksFactory;
+class IDEInspectionCallbacksFactory;
 class ConstructorDecl;
 class CustomAttr;
 class Decl;

include/swift/AST/ParseRequests.h

@@ -136,11 +136,11 @@ class ParseTopLevelDeclsRequest
 };
 
 void simple_display(llvm::raw_ostream &out,
-                    const CodeCompletionCallbacksFactory *factory);
+                    const IDEInspectionCallbacksFactory *factory);
 
-class CodeCompletionSecondPassRequest
-    : public SimpleRequest<CodeCompletionSecondPassRequest,
-                           bool(SourceFile *, CodeCompletionCallbacksFactory *),
+class IDEInspectionSecondPassRequest
+    : public SimpleRequest<IDEInspectionSecondPassRequest,
+                           bool(SourceFile *, IDEInspectionCallbacksFactory *),
                            RequestFlags::Uncached|RequestFlags::DependencySource> {
 public:
   using SimpleRequest::SimpleRequest;
@@ -150,7 +150,7 @@ class CodeCompletionSecondPassRequest
 
   // Evaluation.
   bool evaluate(Evaluator &evaluator, SourceFile *SF,
-                CodeCompletionCallbacksFactory *Factory) const;
+                IDEInspectionCallbacksFactory *Factory) const;
 
 public:
   evaluator::DependencySource

include/swift/AST/ParseTypeIDZone.def

@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-SWIFT_REQUEST(Parse, CodeCompletionSecondPassRequest,
-              bool (SourceFile *, CodeCompletionCallbacksFactory *),
+SWIFT_REQUEST(Parse, IDEInspectionSecondPassRequest,
+              bool (SourceFile *, IDEInspectionCallbacksFactory *),
               Uncached, NoLocationInfo)
 SWIFT_REQUEST(Parse, ParseMembersRequest,
               FingerprintAndMembers(IterableDeclContext *), Cached, NoLocationInfo)

include/swift/AST/TypeCheckRequests.h

@@ -3340,8 +3340,8 @@ class PrimarySourceFilesRequest
 /// Retrieve the file being used for code completion in the main module.
 // FIXME: This isn't really a type-checking request, if we ever split off a
 // zone for more basic AST requests, this should be moved there.
-class CodeCompletionFileRequest
-    : public SimpleRequest<CodeCompletionFileRequest,
+class IDEInspectionFileRequest
+    : public SimpleRequest<IDEInspectionFileRequest,
                            SourceFile *(ModuleDecl *), RequestFlags::Cached> {
 public:
   using SimpleRequest::SimpleRequest;

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -42,7 +42,7 @@ SWIFT_REQUEST(TypeChecker, CheckRedeclarationRequest,
               Uncached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ClassAncestryFlagsRequest,
               AncestryFlags(ClassDecl *), Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, CodeCompletionFileRequest,
+SWIFT_REQUEST(TypeChecker, IDEInspectionFileRequest,
               SourceFile *(ModuleDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, CompareDeclSpecializationRequest,
               bool (DeclContext *, ValueDecl *, ValueDecl *, bool), Cached,

include/swift/Basic/SourceManager.h

@@ -39,8 +39,8 @@ class SourceManager {
 private:
   llvm::SourceMgr LLVMSourceMgr;
   llvm::IntrusiveRefCntPtr<llvm::vfs::FileSystem> FileSystem;
-  unsigned CodeCompletionBufferID = 0U;
-  unsigned CodeCompletionOffset;
+  unsigned IDEInspectionTargetBufferID = 0U;
+  unsigned IDEInspectionTargetOffset;
 
   /// Associates buffer identifiers to buffer IDs.
   llvm::DenseMap<StringRef, unsigned> BufIdentIDMap;
@@ -84,26 +84,26 @@ class SourceManager {
     return FileSystem;
   }
 
-  void setCodeCompletionPoint(unsigned BufferID, unsigned Offset) {
+  void setIDEInspectionTarget(unsigned BufferID, unsigned Offset) {
     assert(BufferID != 0U && "Buffer should be valid");
 
-    CodeCompletionBufferID = BufferID;
-    CodeCompletionOffset = Offset;
+    IDEInspectionTargetBufferID = BufferID;
+    IDEInspectionTargetOffset = Offset;
   }
 
-  bool hasCodeCompletionBuffer() const {
-    return CodeCompletionBufferID != 0U;
+  bool hasIDEInspectionTargetBuffer() const {
+    return IDEInspectionTargetBufferID != 0U;
   }
 
-  unsigned getCodeCompletionBufferID() const {
-    return CodeCompletionBufferID;
+  unsigned getIDEInspectionTargetBufferID() const {
+    return IDEInspectionTargetBufferID;
   }
 
-  unsigned getCodeCompletionOffset() const {
-    return CodeCompletionOffset;
+  unsigned getIDEInspectionTargetOffset() const {
+    return IDEInspectionTargetOffset;
   }
 
-  SourceLoc getCodeCompletionLoc() const;
+  SourceLoc getIDEInspectionTargetLoc() const;
 
   const llvm::DenseMap<SourceRange, SourceRange> &getReplacedRanges() const {
     return ReplacedRanges;
@@ -142,9 +142,9 @@ class SourceManager {
   }
 
   /// Returns true if range \p R contains the code-completion location, if any.
-  bool rangeContainsCodeCompletionLoc(SourceRange R) const {
-    return CodeCompletionBufferID
-               ? rangeContainsTokenLoc(R, getCodeCompletionLoc())
+  bool rangeContainsIDEInspectionTarget(SourceRange R) const {
+    return IDEInspectionTargetBufferID
+               ? rangeContainsTokenLoc(R, getIDEInspectionTargetLoc())
                : false;
   }
 

include/swift/Frontend/Frontend.h

@@ -35,7 +35,7 @@
 #include "swift/Frontend/ModuleInterfaceSupport.h"
 #include "swift/IRGen/TBDGen.h"
 #include "swift/Migrator/MigratorOptions.h"
-#include "swift/Parse/CodeCompletionCallbacks.h"
+#include "swift/Parse/IDEInspectionCallbacks.h"
 #include "swift/Parse/Parser.h"
 #include "swift/Sema/SourceLoader.h"
 #include "swift/Serialization/Validation.h"
@@ -95,13 +95,14 @@ class CompilerInvocation {
   IRGenOptions IRGenOpts;
   TBDGenOptions TBDGenOpts;
   ModuleInterfaceOptions ModuleInterfaceOpts;
-  llvm::MemoryBuffer *CodeCompletionBuffer = nullptr;
+  llvm::MemoryBuffer *IDEInspectionTargetBuffer = nullptr;
 
-  /// Code completion offset in bytes from the beginning of the main
-  /// source file.  Valid only if \c isCodeCompletion() == true.
-  unsigned CodeCompletionOffset = ~0U;
+  /// The offset that IDEInspection wants to further examine in offset of bytes
+  /// from the beginning of the main source file.  Valid only if
+  /// \c isIDEInspection() == true.
+  unsigned IDEInspectionOffset = ~0U;
 
-  CodeCompletionCallbacksFactory *CodeCompletionFactory = nullptr;
+  IDEInspectionCallbacksFactory *IDEInspectionFactory = nullptr;
 
 public:
   CompilerInvocation();
@@ -322,22 +323,22 @@ class CompilerInvocation {
     return FrontendOpts.InputsAndOutputs.getSingleOutputFilename();
   }
 
-  void setCodeCompletionPoint(llvm::MemoryBuffer *Buf, unsigned Offset) {
+  void setIDEInspectionTarget(llvm::MemoryBuffer *Buf, unsigned Offset) {
     assert(Buf);
-    CodeCompletionBuffer = Buf;
-    CodeCompletionOffset = Offset;
+    IDEInspectionTargetBuffer = Buf;
+    IDEInspectionOffset = Offset;
     // We don't need typo-correction for code-completion.
     // FIXME: This isn't really true, but is a performance issue.
     LangOpts.TypoCorrectionLimit = 0;
   }
 
-  std::pair<llvm::MemoryBuffer *, unsigned> getCodeCompletionPoint() const {
-    return std::make_pair(CodeCompletionBuffer, CodeCompletionOffset);
+  std::pair<llvm::MemoryBuffer *, unsigned> getIDEInspectionTarget() const {
+    return std::make_pair(IDEInspectionTargetBuffer, IDEInspectionOffset);
   }
 
   /// \returns true if we are doing code completion.
-  bool isCodeCompletion() const {
-    return CodeCompletionOffset != ~0U;
+  bool isIDEInspection() const {
+    return IDEInspectionOffset != ~0U;
   }
 
   /// Retrieve a module hash string that is suitable for uniquely
@@ -588,9 +589,9 @@ class CompilerInstance {
 
   const CompilerInvocation &getInvocation() const { return Invocation; }
 
-  /// If a code completion buffer has been set, returns the corresponding source
+  /// If a IDE inspection buffer has been set, returns the corresponding source
   /// file.
-  SourceFile *getCodeCompletionFile() const;
+  SourceFile *getIDEInspectionFile() const;
 
 private:
   /// Set up the file system by loading and validating all VFS overlay YAML
@@ -609,7 +610,7 @@ class CompilerInstance {
   /// \return false if successful, true on error.
   bool setupDiagnosticVerifierIfNeeded();
 
-  Optional<unsigned> setUpCodeCompletionBuffer();
+  Optional<unsigned> setUpIDEInspectionTargetBuffer();
 
   /// Find a buffer for a given input file and ensure it is recorded in
   /// SourceMgr, PartialModules, or InputSourceCodeBufferIDs as appropriate.

include/swift/IDE/CodeCompletion.h

@@ -20,7 +20,7 @@
 #include "swift/IDE/CompletionLookup.h"
 
 namespace swift {
-class CodeCompletionCallbacksFactory;
+class IDEInspectionCallbacksFactory;
 class Decl;
 class DeclContext;
 class FrontendOptions;
@@ -70,7 +70,7 @@ void deliverCompletionResults(CodeCompletionContext &CompletionContext,
                               CodeCompletionConsumer &Consumer);
 
 /// Create a factory for code completion callbacks.
-CodeCompletionCallbacksFactory *
+IDEInspectionCallbacksFactory *
 makeCodeCompletionCallbacksFactory(CodeCompletionContext &CompletionContext,
                                    CodeCompletionConsumer &Consumer);
 

include/swift/IDE/CodeCompletionConsumer.h

@@ -14,7 +14,7 @@
 #define SWIFT_IDE_CODECOMPLETIONCONSUMER
 
 #include "swift/IDE/CodeCompletionContext.h"
-#include "swift/Parse/CodeCompletionCallbacks.h"
+#include "swift/Parse/IDEInspectionCallbacks.h"
 
 namespace swift {
 namespace ide {