Merge pull request #27330 from nathawes/r55045797-image-literal-syntax-map-5.1

[5.1][IDE] Fix ModelASTWalker passing syntax nodes before the corresponding AST nodes have been visited

Author: Nathan Hawes

lib/IDE/SyntaxModel.cpp

@@ -516,13 +516,7 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
     pushStructureNode(SN, E);
   } else if (auto *Tup = dyn_cast<TupleExpr>(E)) {
     auto *ParentE = Parent.getAsExpr();
-    if (isCurrentCallArgExpr(Tup)) {
-      for (unsigned I = 0; I < Tup->getNumElements(); ++ I) {
-        SourceLoc NameLoc = Tup->getElementNameLoc(I);
-        if (NameLoc.isValid())
-          passTokenNodesUntil(NameLoc, PassNodesBehavior::ExcludeNodeAtLocation);
-      }
-    } else if (!ParentE || !isa<InterpolatedStringLiteralExpr>(ParentE)) {
+    if (!isCurrentCallArgExpr(Tup) && (!ParentE || !isa<InterpolatedStringLiteralExpr>(ParentE))) {
       SyntaxStructureNode SN;
       SN.Kind = SyntaxStructureKind::TupleExpression;
       SN.Range = charSourceRangeFromSourceRange(SM, Tup->getSourceRange());

test/IDE/coloring.swift

@@ -264,6 +264,8 @@ func bar(x: Int) -> (Int, Float) {
 
 // CHECK: <object-literal>#colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)</object-literal>
 #colorLiteral(red: 1.0, green: 1.0, blue: 1.0, alpha: 1.0)
+// CHECK: test(<object-literal>#imageLiteral(resourceName: "test")</object-literal>, test: <int>0</int>)
+test(#imageLiteral(resourceName: "test"), test: 0)
 
 class GenC<T1,T2> {}