[CodeCompletion] Rename DotExprCompletion -> PostfixCompletion

Author: ahoppen

include/swift/IDE/DotExprCompletion.h renamed to include/swift/IDE/PostfixCompletion.h

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SWIFT_IDE_DOTEXPRCODECOMPLETION_H
-#define SWIFT_IDE_DOTEXPRCODECOMPLETION_H
+#ifndef SWIFT_IDE_POSTFIXCOMPLETION_H
+#define SWIFT_IDE_POSTFIXCOMPLETION_H
 
 #include "swift/IDE/CodeCompletionConsumer.h"
 #include "swift/IDE/CodeCompletionContext.h"
@@ -20,10 +20,9 @@
 namespace swift {
 namespace ide {
 
-/// Used to collect and store information needed to perform member completion
-/// (\c CompletionKind::DotExpr ) from the solutions formed during expression
-/// type-checking.
-class DotExprTypeCheckCompletionCallback : public TypeCheckCompletionCallback {
+/// Used to collect and store information needed to perform postfix completion
+/// (either <base>.#^COMPLETE^# or <base>#^COMPLETE^#).
+class PostfixCompletionCallback : public TypeCheckCompletionCallback {
   struct Result {
     /// The type that we are completing on. Will never be null.
     Type BaseTy;
@@ -83,8 +82,7 @@ class DotExprTypeCheckCompletionCallback : public TypeCheckCompletionCallback {
   void sawSolutionImpl(const constraints::Solution &solution) override;
 
 public:
-  DotExprTypeCheckCompletionCallback(CodeCompletionExpr *CompletionExpr,
-                                     DeclContext *DC)
+  PostfixCompletionCallback(CodeCompletionExpr *CompletionExpr, DeclContext *DC)
       : CompletionExpr(CompletionExpr), DC(DC) {}
 
   /// Typecheck the code completion expression in isolation, calling
@@ -109,4 +107,4 @@ class DotExprTypeCheckCompletionCallback : public TypeCheckCompletionCallback {
 } // end namespace ide
 } // end namespace swift
 
-#endif // SWIFT_IDE_DOTEXPRCODECOMPLETION_H
+#endif // SWIFT_IDE_POSTFIXCOMPLETION_H

lib/IDE/CMakeLists.txt

@@ -1,15 +1,16 @@
 
 add_swift_host_library(swiftIDE STATIC
   AfterPoundExprCompletion.cpp
+  APIDigesterData.cpp
   ArgumentCompletion.cpp
   CodeCompletion.cpp
   CodeCompletionCache.cpp
-  CodeCompletionContext.cpp
   CodeCompletionConsumer.cpp
+  CodeCompletionContext.cpp
   CodeCompletionDiagnostics.cpp
+  CodeCompletionResult.cpp
   CodeCompletionResultBuilder.cpp
   CodeCompletionResultPrinter.cpp
-  CodeCompletionResult.cpp
   CodeCompletionResultType.cpp
   CodeCompletionString.cpp
   CodeCompletionStringPrinter.cpp
@@ -20,26 +21,25 @@ add_swift_host_library(swiftIDE STATIC
   CompletionOverrideLookup.cpp
   ConformingMethodList.cpp
   DependencyChecking.cpp
-  DotExprCompletion.cpp
   ExprCompletion.cpp
   ExprContextAnalysis.cpp
   Formatting.cpp
   FuzzyStringMatcher.cpp
-  Refactoring.cpp
+  IDERequests.cpp
+  IDETypeChecking.cpp
+  ImportDepth.cpp
   KeyPathCompletion.cpp
   ModuleInterfacePrinting.cpp
+  PostfixCompletion.cpp
+  Refactoring.cpp
   REPLCodeCompletion.cpp
+  SourceEntityWalker.cpp
   SwiftSourceDocInfo.cpp
   SyntaxModel.cpp
   TypeCheckCompletionCallback.cpp
+  TypeContextInfo.cpp
   UnresolvedMemberCompletion.cpp
   Utils.cpp
-  IDETypeChecking.cpp
-  ImportDepth.cpp
-  APIDigesterData.cpp
-  SourceEntityWalker.cpp
-  TypeContextInfo.cpp
-  IDERequests.cpp
   )
 target_link_libraries(swiftIDE PRIVATE
   swiftAST

lib/IDE/CodeCompletion.cpp

@@ -40,9 +40,9 @@
 #include "swift/IDE/CodeCompletionStringPrinter.h"
 #include "swift/IDE/CompletionLookup.h"
 #include "swift/IDE/CompletionOverrideLookup.h"
-#include "swift/IDE/DotExprCompletion.h"
 #include "swift/IDE/ExprCompletion.h"
 #include "swift/IDE/KeyPathCompletion.h"
+#include "swift/IDE/PostfixCompletion.h"
 #include "swift/IDE/TypeCheckCompletionCallback.h"
 #include "swift/IDE/UnresolvedMemberCompletion.h"
 #include "swift/IDE/Utils.h"
@@ -1338,8 +1338,7 @@ bool CodeCompletionCallbacksImpl::trySolverCompletion(bool MaybeFuncBody) {
     assert(CodeCompleteTokenExpr);
     assert(CurDeclContext);
 
-    DotExprTypeCheckCompletionCallback Lookup(CodeCompleteTokenExpr,
-                                              CurDeclContext);
+    PostfixCompletionCallback Lookup(CodeCompleteTokenExpr, CurDeclContext);
     llvm::SaveAndRestore<TypeCheckCompletionCallback*>
       CompletionCollector(Context.CompletionCallback, &Lookup);
     typeCheckContextAt(CurDeclContext, CompletionLoc);

lib/IDE/DotExprCompletion.cpp renamed to lib/IDE/PostfixCompletion.cpp

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/IDE/DotExprCompletion.h"
+#include "swift/IDE/PostfixCompletion.h"
 #include "swift/IDE/CodeCompletion.h"
 #include "swift/IDE/CompletionLookup.h"
 #include "swift/Sema/CompletionContextFinder.h"
@@ -21,12 +21,12 @@ using namespace swift;
 using namespace swift::constraints;
 using namespace swift::ide;
 
-bool DotExprTypeCheckCompletionCallback::Result::canBeMergedWith(
+bool PostfixCompletionCallback::Result::canBeMergedWith(
     const Result &Other) const {
   return BaseTy->isEqual(Other.BaseTy) && BaseDecl == Other.BaseDecl;
 }
 
-void DotExprTypeCheckCompletionCallback::Result::merge(const Result &Other) {
+void PostfixCompletionCallback::Result::merge(const Result &Other) {
   assert(canBeMergedWith(Other));
   // These properties should match if we are talking about the same BaseDecl.
   assert(IsBaseDeclUnapplied == Other.IsBaseDeclUnapplied);
@@ -45,7 +45,7 @@ void DotExprTypeCheckCompletionCallback::Result::merge(const Result &Other) {
   IsInAsyncContext |= Other.IsInAsyncContext;
 }
 
-void DotExprTypeCheckCompletionCallback::addResult(const Result &Res) {
+void PostfixCompletionCallback::addResult(const Result &Res) {
   auto ExistingRes =
       llvm::find_if(Results, [&Res](const Result &ExistingResult) {
         return ExistingResult.canBeMergedWith(Res);
@@ -57,7 +57,7 @@ void DotExprTypeCheckCompletionCallback::addResult(const Result &Res) {
   }
 }
 
-void DotExprTypeCheckCompletionCallback::fallbackTypeCheck(DeclContext *DC) {
+void PostfixCompletionCallback::fallbackTypeCheck(DeclContext *DC) {
   assert(!gotCallback());
 
   // Default to checking the completion expression in isolation.
@@ -103,7 +103,7 @@ static bool isUnappliedFunctionRef(const OverloadChoice &Choice) {
   }
 }
 
-void DotExprTypeCheckCompletionCallback::sawSolutionImpl(
+void PostfixCompletionCallback::sawSolutionImpl(
     const constraints::Solution &S) {
   auto &CS = S.getConstraintSystem();
   auto *ParsedExpr = CompletionExpr->getBase();
@@ -315,7 +315,7 @@ static void addOperatorResults(Type LHSType, ArrayRef<OperatorDecl *> Operators,
   }
 }
 
-void DotExprTypeCheckCompletionCallback::deliverResults(
+void PostfixCompletionCallback::deliverResults(
     SourceLoc DotLoc, bool IsInSelector, bool IncludeOperators,
     bool HasLeadingSpace, CodeCompletionContext &CompletionCtx,
     CodeCompletionConsumer &Consumer) {