[Syntax] Avoid highlighting keyword-like labels in call arguments as … (#3369)

* [Syntax] Avoid highlighting keyword-like labels in call arguments as keywords. rdar://24460689

* [test] Update test for SourceKit.

Author: nkcsgexi

lib/IDE/SyntaxModel.cpp

@@ -448,9 +448,15 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
       SN.Kind = SyntaxStructureKind::Parameter;
       SN.NameRange = NR;
       SN.BodyRange = charSourceRangeFromSourceRange(SM, E->getSourceRange());
-      if (NR.isValid())
+      if (NR.isValid()) {
         SN.Range = charSourceRangeFromSourceRange(SM, SourceRange(NR.getStart(),
                                                                   E->getEndLoc()));
+        passTokenNodesUntil(NR.getStart(),
+                            PassNodesBehavior::ExcludeNodeAtLocation);
+        if (!TokenNodes.empty())
+          const_cast<SyntaxNode&>(TokenNodes.front()).Kind = SyntaxNodeKind::
+            Identifier;
+      }
       else
         SN.Range = SN.BodyRange;
 
@@ -515,6 +521,17 @@ std::pair<bool, Expr *> ModelASTWalker::walkToExprPre(Expr *E) {
     }
     SN.BodyRange = innerCharSourceRangeFromSourceRange(SM, E->getSourceRange());
     pushStructureNode(SN, E);
+  } else if (auto *Tup = dyn_cast<TupleExpr>(E)) {
+    for (unsigned I = 0; I < Tup->getNumElements(); ++ I) {
+      SourceLoc NameLoc = Tup->getElementNameLoc(I);
+      if (NameLoc.isValid()) {
+        passTokenNodesUntil(NameLoc, PassNodesBehavior::ExcludeNodeAtLocation);
+        if (!TokenNodes.empty()) {
+          const_cast<SyntaxNode&>(TokenNodes.front()).Kind = SyntaxNodeKind::
+            Identifier;
+        }
+      }
+    }
   }
 
   return { true, E };

test/IDE/coloring.swift

@@ -490,6 +490,19 @@ let black = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 1)
 "--\"\(x) --"
 // CHECK: <str>"--\"</str>\<anchor>(</anchor>x<anchor>)</anchor><str> --"</str>
 
+func keywordAsLabel1(in: Int) {}
+// CHECK: <kw>func</kw> keywordAsLabel1(in: <type>Int</type>) {}
+func keywordAsLabel2(for: Int) {}
+// CHECK: <kw>func</kw> keywordAsLabel2(for: <type>Int</type>) {}
+
+func foo1() {
+// CHECK: <kw>func</kw> foo1() {
+  keywordAsLabel1(in: 1)
+// CHECK: keywordAsLabel1(in: <int>1</int>)
+  keywordAsLabel2(for: 1)
+// CHECK: keywordAsLabel2(for: <int>1</int>)
+}
+
 // Keep this as the last test
 /**
   Trailing off ...

test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift.response

@@ -29,7 +29,7 @@
       key.length: 40
     },
     {
-      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.kind: source.lang.swift.syntaxtype.identifier,
       key.offset: 165,
       key.length: 3
     },
@@ -44,7 +44,7 @@
       key.length: 50
     },
     {
-      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.kind: source.lang.swift.syntaxtype.identifier,
       key.offset: 228,
       key.length: 3
     },