Merge pull request swiftlang#27325 from rintaro/syntaxparse-cctype

[SyntaxParse] Introduce CodeCompletionTypeSyntax

Author: rintaro

cmake/modules/SwiftHandleGybSources.cmake

@@ -118,6 +118,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AttributeNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AvailabilityNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CommonNodes.py"
+      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CompletionOnlyNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"

include/swift/Parse/ASTGen.h

@@ -97,6 +97,8 @@ class ASTGen {
                      const SourceLoc Loc);
   TypeRepr *generate(const syntax::ImplicitlyUnwrappedOptionalTypeSyntax &Type,
                      const SourceLoc Loc);
+  TypeRepr *generate(const syntax::CodeCompletionTypeSyntax &Type,
+                     const SourceLoc Loc);
   TypeRepr *generate(const syntax::UnknownTypeSyntax &Type,
                      const SourceLoc Loc);
 

include/swift/Parse/CodeCompletionCallbacks.h

@@ -40,6 +40,8 @@ class CodeCompletionCallbacks {
   /// completion. This declaration contained the code completion token.
   Decl *ParsedDecl = nullptr;
 
+  TypeLoc ParsedTypeLoc;
+
   /// True if code completion is done inside a raw value expression of an enum
   /// case.
   bool InEnumElementRawValue = false;
@@ -76,6 +78,10 @@ class CodeCompletionCallbacks {
     ParsedDecl = D;
   }
 
+  void setParsedTypeLoc(TypeLoc TyLoc) {
+    ParsedTypeLoc = TyLoc;
+  }
+
   void setLeadingSequenceExprs(ArrayRef<Expr *> exprs) {
     leadingSequenceExprs.assign(exprs.begin(), exprs.end());
   }
@@ -159,10 +165,10 @@ class CodeCompletionCallbacks {
   virtual void completeTypeSimpleBeginning() {};
 
   /// Complete a given type-identifier after we have consumed the dot.
-  virtual void completeTypeIdentifierWithDot(IdentTypeRepr *ITR) {};
+  virtual void completeTypeIdentifierWithDot() {};
 
   /// Complete a given type-identifier when there is no trailing dot.
-  virtual void completeTypeIdentifierWithoutDot(IdentTypeRepr *ITR) {};
+  virtual void completeTypeIdentifierWithoutDot() {};
 
   /// Complete the beginning of a case statement at the top of switch stmt.
   virtual void completeCaseStmtKeyword() {};

include/swift/Parse/ParsedSyntaxBuilders.h.gyb

@@ -30,7 +30,7 @@ namespace swift {
 class ParsedRawSyntaxRecorder;
 class SyntaxParsingContext;
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if node.is_buildable():
 %     child_count = len(node.children)
 class Parsed${node.name}Builder {

include/swift/Parse/ParsedSyntaxNodes.h.gyb

@@ -28,20 +28,20 @@ namespace swift {
 % # Emit the non-collection classes first, then emit the collection classes
 % # that reference these classes.
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if not node.is_syntax_collection():
 class Parsed${node.name};
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if node.is_syntax_collection():
 using Parsed${node.name} =
   ParsedSyntaxCollection<syntax::SyntaxKind::${node.syntax_kind}>;
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if not node.is_syntax_collection():
 %     qualifier = "" if node.is_base() else "final"
 %     for line in dedented_lines(node.description):

include/swift/Parse/ParsedSyntaxRecorder.h.gyb

@@ -31,7 +31,7 @@ class SyntaxParsingContext;
 
 struct ParsedSyntaxRecorder {
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if node.children:
 %     child_params = []
 %     for child in node.children:

include/swift/Syntax/SyntaxBuilders.h.gyb

@@ -29,7 +29,7 @@ namespace syntax {
 
 class SyntaxArena;
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if node.is_buildable():
 %     child_count = len(node.children)
 class ${node.name}Builder {

include/swift/Syntax/SyntaxFactory.h.gyb

@@ -71,7 +71,7 @@ struct SyntaxFactory {
   static Syntax
   makeBlankCollectionSyntax(SyntaxKind Kind);
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if node.children:
 %     child_params = []
 %     for child in node.children:

include/swift/Syntax/SyntaxKind.h.gyb

@@ -2,7 +2,7 @@
   from gyb_syntax_support import *
   from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS
   grouped_nodes = { kind: [] for kind in SYNTAX_BASE_KINDS }
-  for node in SYNTAX_NODES + SILONLY_NODES:
+  for node in SYNTAX_NODES + PARSEONLY_NODES:
     grouped_nodes[node.base_kind].append(node)
   # -*- mode: C++ -*-
   # Ignore the following admonition; it applies to the resulting .h file only
@@ -93,7 +93,7 @@ struct WrapperTypeTraits<syntax::SyntaxKind> {
     case syntax::SyntaxKind::${node.syntax_kind}: 
       return ${SYNTAX_NODE_SERIALIZATION_CODES[node.syntax_kind]};
 % end
-% for node in SILONLY_NODES:
+% for node in PARSEONLY_NODES:
     case syntax::SyntaxKind::${node.syntax_kind}:
 % end
       llvm_unreachable("unserializable syntax kind");
@@ -124,7 +124,7 @@ struct ScalarReferenceTraits<syntax::SyntaxKind> {
       case syntax::SyntaxKind::${node.syntax_kind}:
         return "\"${node.syntax_kind}\"";
 % end
-% for node in SILONLY_NODES:
+% for node in PARSEONLY_NODES:
       case syntax::SyntaxKind::${node.syntax_kind}:
 % end
         llvm_unreachable("unserializable syntax kind");

include/swift/Syntax/SyntaxNodes.h.gyb

@@ -32,21 +32,21 @@ namespace syntax {
 % # Emit the non-collection classes first, then emit the collection classes
 % # that reference these classes.
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if not node.is_syntax_collection():
 class ${node.name};
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if node.is_syntax_collection():
 using ${node.name} =
   SyntaxCollection<SyntaxKind::${node.syntax_kind},
                    ${node.collection_element_type}>;
 %   end
 % end
 
-% for node in SYNTAX_NODES + SILONLY_NODES:
+% for node in SYNTAX_NODES + PARSEONLY_NODES:
 %   if not node.is_syntax_collection():
 %     qualifier = "" if node.is_base() else "final"
 %     for line in dedented_lines(node.description):