Merge pull request #65933 from ahoppen/ahoppen/5.9/complete-constraint-type

[5.9][CodeComplete] Offer completions after `~` in an inheritance clause

Author: ahoppen

include/swift/IDE/CodeCompletionResult.h

@@ -228,6 +228,9 @@ enum class CompletionKind : uint8_t {
   ForEachPatternBeginning,
   TypeAttrBeginning,
   OptionalBinding,
+
+  /// Completion after `~` in an inheritance clause.
+  WithoutConstraintType
 };
 
 enum class CodeCompletionDiagnosticSeverity : uint8_t {

include/swift/IDE/CompletionLookup.h

@@ -620,6 +620,8 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
   void getStmtLabelCompletions(SourceLoc Loc, bool isContinue);
 
   void getOptionalBindingCompletions(SourceLoc Loc);
+
+  void getWithoutConstraintTypes();
 };
 
 } // end namespace ide

include/swift/Parse/IDEInspectionCallbacks.h

@@ -261,6 +261,8 @@ class CodeCompletionCallbacks {
   virtual void completeTypeAttrBeginning() {};
 
   virtual void completeOptionalBinding(){};
+
+  virtual void completeWithoutConstraintType(){};
 };
 
 class DoneParsingCallback {

lib/IDE/CodeCompletion.cpp

@@ -305,6 +305,7 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
   void completeForEachPatternBeginning(bool hasTry, bool hasAwait) override;
   void completeTypeAttrBeginning() override;
   void completeOptionalBinding() override;
+  void completeWithoutConstraintType() override;
 
   void doneParsing(SourceFile *SrcFile) override;
 
@@ -664,6 +665,11 @@ void CodeCompletionCallbacksImpl::completeOptionalBinding() {
   Kind = CompletionKind::OptionalBinding;
 }
 
+void CodeCompletionCallbacksImpl::completeWithoutConstraintType() {
+  CurDeclContext = P.CurDeclContext;
+  Kind = CompletionKind::WithoutConstraintType;
+}
+
 void CodeCompletionCallbacksImpl::completeTypeAttrBeginning() {
   CurDeclContext = P.CurDeclContext;
   Kind = CompletionKind::TypeAttrBeginning;
@@ -975,6 +981,7 @@ void CodeCompletionCallbacksImpl::addKeywords(CodeCompletionResultSink &Sink,
   case CompletionKind::StmtLabel:
   case CompletionKind::TypeAttrBeginning:
   case CompletionKind::OptionalBinding:
+  case CompletionKind::WithoutConstraintType:
     break;
 
   case CompletionKind::EffectsSpecifier:
@@ -2057,6 +2064,11 @@ void CodeCompletionCallbacksImpl::doneParsing(SourceFile *SrcFile) {
     break;
   }
 
+  case CompletionKind::WithoutConstraintType: {
+    Lookup.getWithoutConstraintTypes();
+    break;
+  }
+
   case CompletionKind::AfterIfStmtElse:
   case CompletionKind::CaseStmtKeyword:
   case CompletionKind::EffectsSpecifier:

lib/IDE/CompletionLookup.cpp

@@ -3348,3 +3348,9 @@ void CompletionLookup::getOptionalBindingCompletions(SourceLoc Loc) {
   lookupVisibleDecls(FilteringConsumer, CurrDeclContext,
                      /*IncludeTopLevel=*/false, Loc);
 }
+
+void CompletionLookup::getWithoutConstraintTypes() {
+  // FIXME: Once we have a typealias declaration for copyable, we should be
+  // returning that instead of a keyword (rdar://109107817).
+  addKeyword("Copyable");
+}

lib/Parse/ParseDecl.cpp

@@ -5873,6 +5873,13 @@ ParserStatus Parser::parseInheritance(
             TildeCopyableLoc = tildeLoc;
 
           continue;
+        } else if (nextTok.is(tok::code_complete)) {
+          consumeToken(); // consume '~'
+          Status.setHasCodeCompletionAndIsError();
+          if (CodeCompletionCallbacks) {
+            CodeCompletionCallbacks->completeWithoutConstraintType();
+          }
+          consumeToken(tok::code_complete);
         }
 
         // can't suppress whatever is between '~' and ',' or '{'.

test/IDE/complete_without_constraint_type.swift

@@ -0,0 +1,6 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+
+struct FileDescriptor: ~#^COMPLETE^# {}
+// FIXME: This should be emitting a `Copyable` declaration instead of a keyword, once there is a declaration for `Copyable`
+// COMPLETE: Keyword/None:                       Copyable; name=Copyable