Add TrailingAngleBrackLoc to EditorPlaceholder for upcoming scope code.

Author: David Ungar

include/swift/AST/Expr.h

@@ -4666,16 +4666,19 @@ class UnresolvedPatternExpr : public Expr {
 class EditorPlaceholderExpr : public Expr {
   Identifier Placeholder;
   SourceLoc Loc;
+  SourceLoc TrailingAngleBracketLoc;
   TypeLoc PlaceholderTy;
   TypeRepr *ExpansionTyR;
   Expr *SemanticExpr;
 
 public:
   EditorPlaceholderExpr(Identifier Placeholder, SourceLoc Loc,
+                        SourceLoc TrailingAngleBracketLoc,
                         TypeLoc PlaceholderTy,
                         TypeRepr *ExpansionTyR)
     : Expr(ExprKind::EditorPlaceholder, /*Implicit=*/false),
       Placeholder(Placeholder), Loc(Loc),
+      TrailingAngleBracketLoc(TrailingAngleBracketLoc),
       PlaceholderTy(PlaceholderTy),
       ExpansionTyR(ExpansionTyR),
       SemanticExpr(nullptr) {
@@ -4685,6 +4688,9 @@ class EditorPlaceholderExpr : public Expr {
   SourceRange getSourceRange() const { return Loc; }
   TypeLoc &getTypeLoc() { return PlaceholderTy; }
   TypeLoc getTypeLoc() const { return PlaceholderTy; }
+  SourceLoc getTrailingAngleBracketLoc() const {
+    return TrailingAngleBracketLoc;
+  }
 
   /// The TypeRepr to be considered for placeholder expansion.
   TypeRepr *getTypeForExpansion() const { return ExpansionTyR; }

lib/AST/ASTDumper.cpp

@@ -2635,7 +2635,19 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
     PrintWithColorRAII(OS, ParenthesisColor) << ')';
   }
   void visitEditorPlaceholderExpr(EditorPlaceholderExpr *E) {
-    printCommon(E, "editor_placeholder_expr") << '\n';
+    printCommon(E, "editor_placeholder_expr") << ' ';
+
+    // Print the trailing angle bracket location
+    if (auto Ty = GetTypeOfExpr(E)) {
+      auto &Ctx = Ty->getASTContext();
+      auto TABL = E->getTrailingAngleBracketLoc();
+      if (TABL.isValid()) {
+        PrintWithColorRAII(OS, LocationColor) << " trailing_angle_bracket_loc=";
+        TABL.print(PrintWithColorRAII(OS, LocationColor).getOS(),
+                   Ctx.SourceMgr);
+      }
+    }
+    OS << '\n';
     auto *TyR = E->getTypeLoc().getTypeRepr();
     auto *ExpTyR = E->getTypeForExpansion();
     if (TyR)

lib/Parse/ParseExpr.cpp

@@ -2385,6 +2385,7 @@ Expr *Parser::parseExprEditorPlaceholder(Token PlaceholderTok,
   parseTypeForPlaceholder(TyLoc, ExpansionTyR);
   return new (Context) EditorPlaceholderExpr(PlaceholderId,
                                              PlaceholderTok.getLoc(),
+                                             PlaceholderTok.getRange().getEnd(),
                                              TyLoc, ExpansionTyR);
 }
 

test/Parse/source_locs.swift

@@ -2,7 +2,10 @@
 
 func string_interpolation() {
   "\("abc")"
+  <#Int#>
 }
 
-// RUN: %target-swift-frontend -dump-ast %s | %FileCheck %s
+// RUN: not %target-swift-frontend -dump-ast %s | %FileCheck %s
 // CHECK: (interpolated_string_literal_expr {{.*}} trailing_quote_loc=SOURCE_DIR{{/|\\}}test{{/|\\}}Parse{{/|\\}}source_locs.swift:4:12 {{.*}}
+// CHECK: (editor_placeholder_expr type='()' {{.*}} trailing_angle_bracket_loc=SOURCE_DIR{{/|\\}}test{{/|\\}}Parse{{/|\\}}source_locs.swift:5:10
+