Merge pull request #30552 from AnthonyLatsis/assoc-coloring

[ASTWalker] Associated type defaults deserve syntax coloring

Author: AnthonyLatsis

lib/AST/ASTWalker.cpp

@@ -267,8 +267,12 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
       if (doIt(Inherit))
         return true;
     }
-    
-    if (auto *ATD = dyn_cast<AssociatedTypeDecl>(TPD)) {
+
+    if (const auto ATD = dyn_cast<AssociatedTypeDecl>(TPD)) {
+      if (const auto DefaultTy = ATD->getDefaultDefinitionTypeRepr())
+        if (doIt(DefaultTy))
+          return true;
+
       if (auto *WhereClause = ATD->getTrailingWhereClause()) {
         for (auto &Req: WhereClause->getRequirements()) {
           if (doIt(Req))

test/IDE/coloring.swift

@@ -160,6 +160,12 @@ func foo(n: Float) -> Int {
 
 // CHECK: <kw>protocol</kw> Prot
 protocol Prot {
+  // CHECK: <kw>associatedtype</kw> Assoc1 = <type>Array</type><<type>Never</type>>
+  associatedtype Assoc1 = Array<Never>
+  // CHECK: <kw>associatedtype</kw> Assoc2 = <type>Void</type> <kw>where</kw> <type>Assoc2</type>: <type>Equatable</type>
+  associatedtype Assoc2 = Void where Assoc2: Equatable
+  // CHECK: <kw>associatedtype</kw> Assoc3: <type>Prot</type>, <type>Prot</type> = <type>Void</type> <kw>where</kw> <type>Assoc3</type>: <type>Prot</type>
+  associatedtype Assoc3: Prot, Prot = Void where Assoc3: Prot
   // CHECK: <kw>typealias</kw> Blarg
   typealias Blarg
   // CHECK: <kw>func</kw> protMeth(x: <type>Int</type>)