Merge pull request swiftlang#39395 from rintaro/sourcekit-completion-inits

[CodeCompletion] Remove two completion options from LangOptions

Author: rintaro

include/swift/Basic/LangOptions.h

@@ -230,14 +230,6 @@ namespace swift {
     /// Keep comments during lexing and attach them to declarations.
     bool AttachCommentsToDecls = false;
 
-    /// Whether to include initializers when code-completing a postfix
-    /// expression.
-    bool CodeCompleteInitsInPostfixExpr = false;
-
-    /// Whether to use heuristics to decide whether to show call-pattern
-    /// completions.
-    bool CodeCompleteCallPatternHeuristics = false;
-
     ///
     /// Flags for use by tests
     ///

include/swift/IDE/CodeCompletion.h

@@ -947,6 +947,13 @@ struct CodeCompletionResultSink {
   /// Whether to emit object literals if desired.
   bool includeObjectLiterals = true;
 
+  /// Whether to emit type initializers in addition to type names in expression
+  /// position.
+  bool addInitsToTopLevel = false;
+
+  /// Whether to perform "call pettern heuristics".
+  bool enableCallPatternHeuristics = false;
+
   std::vector<CodeCompletionResult *> Results;
 
   /// A single-element cache for module names stored in Allocator, keyed by a
@@ -1021,7 +1028,23 @@ class CodeCompletionContext {
   void setIncludeObjectLiterals(bool flag) {
     CurrentResults.includeObjectLiterals = flag;
   }
-  bool includeObjectLiterals() { return CurrentResults.includeObjectLiterals; }
+  bool includeObjectLiterals() const {
+    return CurrentResults.includeObjectLiterals;
+  }
+
+  void setAddInitsToTopLevel(bool flag) {
+    CurrentResults.addInitsToTopLevel = flag;
+  }
+  bool getAddInitsToTopLevel() const {
+    return CurrentResults.addInitsToTopLevel;
+  }
+
+  void setCallPatternHeuristics(bool flag) {
+    CurrentResults.enableCallPatternHeuristics = flag;
+  }
+  bool getCallPatternHeuristics() const {
+    return CurrentResults.enableCallPatternHeuristics;
+  }
 
   /// Allocate a string owned by the code completion context.
   StringRef copyString(StringRef Str);

include/swift/IDE/CodeCompletionCache.h

@@ -42,7 +42,7 @@ class CodeCompletionCache {
     bool ResultsHaveLeadingDot;
     bool ForTestableLookup;
     bool ForPrivateImportLookup;
-    bool CodeCompleteInitsInPostfixExpr;
+    bool AddInitsInToplevel;
     bool Annotated;
 
     friend bool operator==(const Key &LHS, const Key &RHS) {
@@ -52,7 +52,8 @@ class CodeCompletionCache {
         LHS.ResultsHaveLeadingDot == RHS.ResultsHaveLeadingDot &&
         LHS.ForTestableLookup == RHS.ForTestableLookup &&
         LHS.ForPrivateImportLookup == RHS.ForPrivateImportLookup &&
-        LHS.CodeCompleteInitsInPostfixExpr == RHS.CodeCompleteInitsInPostfixExpr;
+        LHS.AddInitsInToplevel == RHS.AddInitsInToplevel &&
+        LHS.Annotated == RHS.Annotated;
     }
   };
 
@@ -123,6 +124,7 @@ struct DenseMapInfo<swift::ide::CodeCompletionCache::Key> {
     H ^= std::hash<bool>()(Val.ResultsHaveLeadingDot);
     H ^= std::hash<bool>()(Val.ForTestableLookup);
     H ^= std::hash<bool>()(Val.ForPrivateImportLookup);
+    H ^= std::hash<bool>()(Val.AddInitsInToplevel);
     H ^= std::hash<bool>()(Val.Annotated);
     return static_cast<unsigned>(H);
   }

lib/Frontend/CompilerInvocation.cpp

@@ -506,12 +506,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     }
   }
 
-  Opts.CodeCompleteInitsInPostfixExpr |=
-      Args.hasArg(OPT_code_complete_inits_in_postfix_expr);
-
-  Opts.CodeCompleteCallPatternHeuristics |=
-      Args.hasArg(OPT_code_complete_call_pattern_heuristics);
-
   if (auto A = Args.getLastArg(OPT_enable_target_os_checking,
                                OPT_disable_target_os_checking)) {
     Opts.EnableTargetOSChecking

lib/IDE/CodeCompletion.cpp

@@ -3366,7 +3366,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
   void addConstructorCallsForType(Type type, Identifier name,
                                   DeclVisibilityKind Reason,
                                   DynamicLookupInfo dynamicLookupInfo) {
-    if (!Ctx.LangOpts.CodeCompleteInitsInPostfixExpr)
+    if (!Sink.addInitsToTopLevel)
       return;
 
     assert(CurrDeclContext);
@@ -4459,7 +4459,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
     });
 
     // Optionally add object literals.
-    if (CompletionContext->includeObjectLiterals()) {
+    if (Sink.includeObjectLiterals) {
       auto floatType = context.getFloatType();
       addFromProto(LK::ColorLiteral, [&](Builder &builder) {
         builder.addBaseName("#colorLiteral");
@@ -5766,7 +5766,7 @@ void CodeCompletionCallbacksImpl::completePostfixExprParen(Expr *E,
   CodeCompleteTokenExpr = static_cast<CodeCompletionExpr*>(CodeCompletionE);
 
   ShouldCompleteCallPatternAfterParen = true;
-  if (Context.LangOpts.CodeCompleteCallPatternHeuristics) {
+  if (CompletionContext.getCallPatternHeuristics()) {
     // Lookahead one token to decide what kind of call completions to provide.
     // When it appears that there is already code for the call present, just
     // complete values and/or argument labels.  Otherwise give the entire call
@@ -5908,7 +5908,7 @@ void CodeCompletionCallbacksImpl::completeCallArg(CodeCompletionExpr *E,
   ShouldCompleteCallPatternAfterParen = false;
   if (isFirst) {
     ShouldCompleteCallPatternAfterParen = true;
-    if (Context.LangOpts.CodeCompleteCallPatternHeuristics) {
+    if (CompletionContext.getCallPatternHeuristics()) {
       // Lookahead one token to decide what kind of call completions to provide.
       // When it appears that there is already code for the call present, just
       // complete values and/or argument labels.  Otherwise give the entire call
@@ -6635,7 +6635,7 @@ static void deliverCompletionResults(CodeCompletionContext &CompletionContext,
             SF.hasTestableOrPrivateImport(
                 AccessLevel::Internal, TheModule,
                 SourceFile::ImportQueryKind::PrivateOnly),
-            Ctx.LangOpts.CodeCompleteInitsInPostfixExpr,
+            CompletionContext.getAddInitsToTopLevel(),
             CompletionContext.getAnnotateResult(),
         };
 
@@ -7600,7 +7600,11 @@ void SimpleCachingCodeCompletionConsumer::handleResultsAndModules(
     if (!V.hasValue()) {
       // No cached results found. Fill the cache.
       V = context.Cache.createValue();
-      (*V)->Sink.annotateResult = context.getAnnotateResult();
+      CodeCompletionResultSink &Sink = (*V)->Sink;
+      Sink.annotateResult = context.getAnnotateResult();
+      Sink.addInitsToTopLevel = context.getAddInitsToTopLevel();
+      Sink.enableCallPatternHeuristics = context.getCallPatternHeuristics();
+      Sink.includeObjectLiterals = context.includeObjectLiterals();
       lookupCodeCompletionResultsFromModule(
           (*V)->Sink, R.TheModule, R.Key.AccessPath,
           R.Key.ResultsHaveLeadingDot, SF);

lib/IDE/CodeCompletionCache.cpp

@@ -293,7 +293,7 @@ static void writeCachedModule(llvm::raw_ostream &out,
     OSSLE.write(K.ResultsHaveLeadingDot);
     OSSLE.write(K.ForTestableLookup);
     OSSLE.write(K.ForPrivateImportLookup);
-    OSSLE.write(K.CodeCompleteInitsInPostfixExpr);
+    OSSLE.write(K.AddInitsInToplevel);
     OSSLE.write(K.Annotated);
     LE.write(static_cast<uint32_t>(OSS.tell()));   // Size of debug info
     out.write(OSS.str().data(), OSS.str().size()); // Debug info blob
@@ -404,7 +404,7 @@ static std::string getName(StringRef cacheDirectory,
   OSS << (K.ResultsHaveLeadingDot ? "-dot" : "")
       << (K.ForTestableLookup ? "-testable" : "")
       << (K.ForPrivateImportLookup ? "-private" : "")
-      << (K.CodeCompleteInitsInPostfixExpr ? "-inits" : "")
+      << (K.AddInitsInToplevel ? "-inits" : "")
       << (K.Annotated ? "-annotated" : "");
 
   // name[-access-path-components]

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.h

@@ -36,7 +36,7 @@ struct Options {
   bool addInnerResults = false;
   bool addInnerOperators = true;
   bool addInitsToTopLevel = false;
-  bool callPatternHeuristics = true;
+  bool callPatternHeuristics = false;
   bool hideUnderscores = true;
   bool reallyHideAllUnderscores = false;
   bool hideLowPriority = true;

tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp

@@ -133,6 +133,8 @@ static bool swiftCodeCompleteImpl(
         CompletionContext.ReusingASTContext = reusingASTContext;
         CompletionContext.setAnnotateResult(opts.annotatedDescription);
         CompletionContext.setIncludeObjectLiterals(opts.includeObjectLiterals);
+        CompletionContext.setAddInitsToTopLevel(opts.addInitsToTopLevel);
+        CompletionContext.setCallPatternHeuristics(opts.callPatternHeuristics);
         std::unique_ptr<CodeCompletionCallbacksFactory> callbacksFactory(
             ide::makeCodeCompletionCallbacksFactory(CompletionContext,
                                                     SwiftConsumer));
@@ -1077,6 +1079,8 @@ void SwiftLangSupport::codeCompleteOpen(
   unsigned resultOffset = 0;
   unsigned maxResults = 0;
   CodeCompletion::Options CCOpts;
+  // Enable "call pattern heuristics" by default for this API.
+  CCOpts.callPatternHeuristics = true;
   if (options)
     translateCodeCompletionOptions(*options, CCOpts, filterText, resultOffset,
                                    maxResults);
@@ -1119,20 +1123,9 @@ void SwiftLangSupport::codeCompleteOpen(
             extendCompletions(results, sink, info, nameToPopularity, CCOpts);
       });
 
-  // Add any codecomplete.open specific flags.
-  std::vector<const char *> extendedArgs(args.begin(), args.end());
-  if (CCOpts.addInitsToTopLevel) {
-    extendedArgs.push_back("-Xfrontend");
-    extendedArgs.push_back("-code-complete-inits-in-postfix-expr");
-  }
-  if (CCOpts.callPatternHeuristics) {
-    extendedArgs.push_back("-Xfrontend");
-    extendedArgs.push_back("-code-complete-call-pattern-heuristics");
-  }
-
   // Invoke completion.
   if (!swiftCodeCompleteImpl(*this, inputBuf, offset, swiftConsumer,
-                             extendedArgs, fileSystem, CCOpts, error)) {
+                             args, fileSystem, CCOpts, error)) {
     consumer.failed(error);
     return;
   }
@@ -1150,7 +1143,7 @@ void SwiftLangSupport::codeCompleteOpen(
   using CodeCompletion::SessionCacheRef;
   auto bufferCopy = llvm::MemoryBuffer::getMemBufferCopy(
       inputBuf->getBuffer(), inputBuf->getBufferIdentifier());
-  std::vector<std::string> argsCopy(extendedArgs.begin(), extendedArgs.end());
+  std::vector<std::string> argsCopy(args.begin(), args.end());
   SessionCacheRef session{new SessionCache(
       std::move(sink), std::move(bufferCopy), std::move(argsCopy), fileSystem,
       completionKind, typeContextKind, mayUseImplicitMemberExpr,

tools/swift-ide-test/swift-ide-test.cpp

@@ -471,7 +471,7 @@ CodeCompletionSourceText("code-completion-sourcetext",
                          llvm::cl::init(false));
 
 static llvm::cl::opt<bool>
-CodeCOmpletionAnnotateResults("code-completion-annotate-results",
+CodeCompletionAnnotateResults("code-completion-annotate-results",
                               llvm::cl::desc("annotate completion results with XML"),
                               llvm::cl::cat(Category),
                               llvm::cl::init(false));
@@ -925,6 +925,8 @@ static int doCodeCompletion(const CompilerInvocation &InitInvok,
                             bool CodeCompletionKeywords,
                             bool CodeCompletionComments,
                             bool CodeCompletionAnnotateResults,
+                            bool CodeCompletionAddInitsToTopLevel,
+                            bool CodeCompletionCallPatternHeuristics,
                             bool CodeCompletionSourceText) {
   std::unique_ptr<ide::OnDiskCodeCompletionCache> OnDiskCache;
   if (!options::CompletionCachePath.empty()) {
@@ -934,6 +936,8 @@ static int doCodeCompletion(const CompilerInvocation &InitInvok,
   ide::CodeCompletionCache CompletionCache(OnDiskCache.get());
   ide::CodeCompletionContext CompletionContext(CompletionCache);
   CompletionContext.setAnnotateResult(CodeCompletionAnnotateResults);
+  CompletionContext.setAddInitsToTopLevel(CodeCompletionAddInitsToTopLevel);
+  CompletionContext.setCallPatternHeuristics(CodeCompletionCallPatternHeuristics);
 
   // Create a CodeCompletionConsumer.
   std::unique_ptr<ide::CodeCompletionConsumer> Consumer(
@@ -1130,6 +1134,8 @@ static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
                                  bool CodeCompletionKeywords,
                                  bool CodeCompletionComments,
                                  bool CodeCompletionAnnotateResults,
+                                 bool CodeCompletionAddInitsToTopLevel,
+                                 bool CodeCompletionCallPatternHeuristics,
                                  bool CodeCompletionSourceText) {
   auto FileBufOrErr = llvm::MemoryBuffer::getFile(SourceFilename);
   if (!FileBufOrErr) {
@@ -1272,6 +1278,8 @@ static int doBatchCodeCompletion(const CompilerInvocation &InitInvok,
           // Consumer.
           ide::CodeCompletionContext CompletionContext(CompletionCache);
           CompletionContext.setAnnotateResult(CodeCompletionAnnotateResults);
+          CompletionContext.setAddInitsToTopLevel(CodeCompletionAddInitsToTopLevel);
+          CompletionContext.setCallPatternHeuristics(CodeCompletionCallPatternHeuristics);
           std::unique_ptr<CodeCompletionCallbacksFactory> callbacksFactory(
               ide::makeCodeCompletionCallbacksFactory(CompletionContext,
                                                       *Consumer));
@@ -3835,7 +3843,7 @@ int main(int argc, char *argv[]) {
         llvm::outs(), options::CodeCompletionKeywords,
         options::CodeCompletionComments,
         options::CodeCompletionSourceText,
-        options::CodeCOmpletionAnnotateResults);
+        options::CodeCompletionAnnotateResults);
     for (StringRef filename : options::InputFilenames) {
       auto resultsOpt = ide::OnDiskCodeCompletionCache::getFromFile(filename);
       if (!resultsOpt) {
@@ -3965,10 +3973,6 @@ int main(int argc, char *argv[]) {
     options::ImportObjCHeader;
   InitInvok.getLangOptions().EnableAccessControl =
     !options::DisableAccessControl;
-  InitInvok.getLangOptions().CodeCompleteInitsInPostfixExpr |=
-      options::CodeCompleteInitsInPostfixExpr;
-  InitInvok.getLangOptions().CodeCompleteCallPatternHeuristics |=
-      options::CodeCompleteCallPatternHeuristics;
   InitInvok.getLangOptions().EnableSwift3ObjCInference =
     options::EnableSwift3ObjCInference;
   InitInvok.getClangImporterOptions().ImportForwardDeclarations |=
@@ -4076,7 +4080,9 @@ int main(int argc, char *argv[]) {
                                      options::CodeCompletionDiagnostics,
                                      options::CodeCompletionKeywords,
                                      options::CodeCompletionComments,
-                                     options::CodeCOmpletionAnnotateResults,
+                                     options::CodeCompletionAnnotateResults,
+                                     options::CodeCompleteInitsInPostfixExpr,
+                                     options::CodeCompleteCallPatternHeuristics,
                                      options::CodeCompletionSourceText);
     break;
 
@@ -4092,7 +4098,9 @@ int main(int argc, char *argv[]) {
                                 options::CodeCompletionDiagnostics,
                                 options::CodeCompletionKeywords,
                                 options::CodeCompletionComments,
-                                options::CodeCOmpletionAnnotateResults,
+                                options::CodeCompletionAnnotateResults,
+                                options::CodeCompleteInitsInPostfixExpr,
+                                options::CodeCompleteCallPatternHeuristics,
                                 options::CodeCompletionSourceText);
     break;