---

yaml
---
r: 318591
b: refs/heads/master-rebranch
c: 567729b
h: refs/heads/master
i:
  318589: 682f63f
  318587: b716f82
  318583: 3c14b66
  318575: 37ecf1d
  318559: 0656276
  318527: f328ea9
  318463: 2d68970

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 75552d2b66023907022c17dfd899aae8b198add5
+refs/heads/master-rebranch: 567729b7c0fed713ecb45d703f087ab9b56b22d0

branches/master-rebranch/lib/IDE/SyntaxModel.cpp

@@ -895,6 +895,13 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
           SourceRange NameRange = SourceRange(EnumElemD->getNameLoc(),
                                               ParamList->getSourceRange().End);
           SN.NameRange = charSourceRangeFromSourceRange(SM, NameRange);
+
+          for (auto Param : ParamList->getArray()) {
+            auto TL = Param->getTypeLoc();
+            CharSourceRange TR = charSourceRangeFromSourceRange(SM,
+                                                                TL.getSourceRange());
+            passNonTokenNode({SyntaxNodeKind::TypeId, TR});
+          }
         } else {
           SN.NameRange = CharSourceRange(EnumElemD->getNameLoc(),
                                          EnumElemD->getName().getLength());

branches/master-rebranch/test/IDE/coloring.swift

@@ -4,7 +4,7 @@
 enum List<T> {
   case Nil
   // rdar://21927124
-  // CHECK: <attr-builtin>indirect</attr-builtin> <kw>case</kw> Cons(T, List)
+  // CHECK: <attr-builtin>indirect</attr-builtin> <kw>case</kw> Cons(<type>T</type>, <type>List</type>)
   indirect case Cons(T, List)
 }
 

branches/master-rebranch/test/SourceKit/SyntaxMapData/Inputs/syntaxmap.swift

@@ -57,3 +57,10 @@ func testArgumentLabels(in class: Int, _ case: (_ default: Int) -> Void) -> (in:
 
 // https://bugs.swift.org/browse/SR-9576
 func someFunc(input :Int?, completion: () throws -> Void) rethrows {}
+
+// https://bugs.swift.org/browse/SR-9740
+enum A {
+    case noArguments
+    case namedArguments(param1: String, param2: Int)
+    case mutedArguments(String, Int)
+}

branches/master-rebranch/test/SourceKit/SyntaxMapData/syntaxmap.swift.response

@@ -1,6 +1,6 @@
 {
   key.offset: 0,
-  key.length: 1161,
+  key.length: 1325,
   key.diagnostic_stage: source.diagnostic.stage.swift.parse,
   key.syntaxmap: [
     {
@@ -622,6 +622,91 @@
       key.kind: source.lang.swift.syntaxtype.keyword,
       key.offset: 1149,
       key.length: 8
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.comment,
+      key.offset: 1162,
+      key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.comment.url,
+      key.offset: 1165,
+      key.length: 37
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.comment,
+      key.offset: 1202,
+      key.length: 1
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1203,
+      key.length: 4
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1208,
+      key.length: 1
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1216,
+      key.length: 4
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1221,
+      key.length: 11
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1237,
+      key.length: 4
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1242,
+      key.length: 14
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1257,
+      key.length: 6
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.typeidentifier,
+      key.offset: 1265,
+      key.length: 6
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1273,
+      key.length: 6
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.typeidentifier,
+      key.offset: 1281,
+      key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1290,
+      key.length: 4
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1295,
+      key.length: 14
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.typeidentifier,
+      key.offset: 1310,
+      key.length: 6
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.typeidentifier,
+      key.offset: 1318,
+      key.length: 3
     }
   ]
 }