Merge pull request #31738 from rintaro/5.3-ide-completion-rdar62617558

[CodeCompletion] Annotated type name and 'IsSystem'

Author: rintaro

include/swift/IDE/CodeCompletion.h

@@ -182,6 +182,10 @@ class CodeCompletionStringChunk {
     /// This chunk should not be inserted into the editor buffer.
     TypeAnnotation,
 
+    /// Structured group version of 'TypeAnnotation'.
+    /// This grouped chunks should not be inserted into the editor buffer.
+    TypeAnnotationBegin,
+
     /// A brace statement -- left brace and right brace.  The preferred
     /// position to put the cursor after the completion result is inserted
     /// into the editor buffer is between the braces.
@@ -195,7 +199,8 @@ class CodeCompletionStringChunk {
     return Kind == ChunkKind::CallParameterBegin ||
            Kind == ChunkKind::GenericParameterBegin ||
            Kind == ChunkKind::OptionalBegin ||
-           Kind == ChunkKind::CallParameterTypeBegin;
+           Kind == ChunkKind::CallParameterTypeBegin ||
+           Kind == ChunkKind::TypeAnnotationBegin;
   }
 
   static bool chunkHasText(ChunkKind Kind) {
@@ -594,6 +599,7 @@ class CodeCompletionResult {
   unsigned SemanticContext : 3;
   unsigned NotRecommended : 1;
   unsigned NotRecReason : 3;
+  unsigned IsSystem : 1;
 
   /// The number of bytes to the left of the code completion point that
   /// should be erased first if this completion string is inserted in the
@@ -634,6 +640,7 @@ class CodeCompletionResult {
     assert(!isOperator() ||
            getOperatorKind() != CodeCompletionOperatorKind::None);
     AssociatedKind = 0;
+    IsSystem = 0;
   }
 
   /// Constructs a \c Keyword result.
@@ -651,6 +658,7 @@ class CodeCompletionResult {
         TypeDistance(TypeDistance) {
     assert(CompletionString);
     AssociatedKind = static_cast<unsigned>(Kind);
+    IsSystem = 0;
   }
 
   /// Constructs a \c Literal result.
@@ -667,6 +675,7 @@ class CodeCompletionResult {
         NumBytesToErase(NumBytesToErase), CompletionString(CompletionString),
         TypeDistance(TypeDistance) {
     AssociatedKind = static_cast<unsigned>(LiteralKind);
+    IsSystem = 0;
     assert(CompletionString);
   }
 
@@ -694,6 +703,7 @@ class CodeCompletionResult {
         TypeDistance(TypeDistance) {
     assert(AssociatedDecl && "should have a decl");
     AssociatedKind = unsigned(getCodeCompletionDeclKind(AssociatedDecl));
+    IsSystem = getDeclIsSystem(AssociatedDecl);
     assert(CompletionString);
     if (isOperator())
       KnownOperatorKind =
@@ -706,8 +716,8 @@ class CodeCompletionResult {
   CodeCompletionResult(SemanticContextKind SemanticContext,
                        unsigned NumBytesToErase,
                        CodeCompletionString *CompletionString,
-                       CodeCompletionDeclKind DeclKind, StringRef ModuleName,
-                       bool NotRecommended,
+                       CodeCompletionDeclKind DeclKind, bool IsSystem,
+                       StringRef ModuleName, bool NotRecommended,
                        CodeCompletionResult::NotRecommendedReason NotRecReason,
                        StringRef BriefDocComment,
                        ArrayRef<StringRef> AssociatedUSRs,
@@ -718,10 +728,10 @@ class CodeCompletionResult {
         KnownOperatorKind(unsigned(KnownOperatorKind)),
         SemanticContext(unsigned(SemanticContext)),
         NotRecommended(NotRecommended), NotRecReason(NotRecReason),
-        NumBytesToErase(NumBytesToErase), CompletionString(CompletionString),
-        ModuleName(ModuleName), BriefDocComment(BriefDocComment),
-        AssociatedUSRs(AssociatedUSRs), DocWords(DocWords),
-        TypeDistance(TypeDistance) {
+        IsSystem(IsSystem), NumBytesToErase(NumBytesToErase),
+        CompletionString(CompletionString), ModuleName(ModuleName),
+        BriefDocComment(BriefDocComment), AssociatedUSRs(AssociatedUSRs),
+        DocWords(DocWords), TypeDistance(TypeDistance) {
     AssociatedKind = static_cast<unsigned>(DeclKind);
     assert(CompletionString);
     assert(!isOperator() ||
@@ -763,6 +773,10 @@ class CodeCompletionResult {
     return static_cast<CodeCompletionOperatorKind>(KnownOperatorKind);
   }
 
+  bool isSystem() const {
+    return static_cast<bool>(IsSystem);
+  }
+
   ExpectedTypeRelation getExpectedTypeRelation() const {
     return static_cast<ExpectedTypeRelation>(TypeDistance);
   }
@@ -810,6 +824,7 @@ class CodeCompletionResult {
   getCodeCompletionOperatorKind(StringRef name);
   static CodeCompletionOperatorKind
   getCodeCompletionOperatorKind(CodeCompletionString *str);
+  static bool getDeclIsSystem(const Decl *D);
 };
 
 struct CodeCompletionResultSink {
@@ -874,7 +889,7 @@ class CodeCompletionContext {
       : Cache(Cache) {}
 
   void setAnnotateResult(bool flag) { CurrentResults.annotateResult = flag; }
-  bool getAnnnoateResult() { return CurrentResults.annotateResult; }
+  bool getAnnotateResult() { return CurrentResults.annotateResult; }
 
   /// Allocate a string owned by the code completion context.
   StringRef copyString(StringRef Str);

include/swift/IDE/CodeCompletionResultPrinter.h

@@ -27,6 +27,13 @@ void printCodeCompletionResultDescription(const CodeCompletionResult &Result,
 void printCodeCompletionResultDescriptionAnnotated(
     const CodeCompletionResult &Result, llvm::raw_ostream &OS,
     bool leadingPunctuation);
+
+void printCodeCompletionResultTypeName(
+    const CodeCompletionResult &Result, llvm::raw_ostream &OS);
+
+void printCodeCompletionResultTypeNameAnnotated(
+    const CodeCompletionResult &Result, llvm::raw_ostream &OS);
+
 } // namespace ide
 } // namespace swift