SourceKit: Include up to closing paren in object literals

rdar://problem/26451674

Author: bitjammer

lib/IDE/SyntaxModel.cpp

@@ -59,6 +59,7 @@ SyntaxModelContext::SyntaxModelContext(SourceFile &SrcFile)
   std::vector<SyntaxNode> Nodes;
   SourceLoc AttrLoc;
   SourceLoc UnaryMinusLoc;
+  auto LiteralStartLoc = Optional<SourceLoc>();
   for (unsigned I = 0, E = Tokens.size(); I != E; ++I) {
     auto &Tok = Tokens[I];
     SyntaxNodeKind Kind;
@@ -82,6 +83,16 @@ SyntaxModelContext::SyntaxModelContext(SourceFile &SrcFile)
       Loc = Tok.getLoc();
       Length = Tok.getLength();
 
+      if (LiteralStartLoc.hasValue() && Length.hasValue()) {
+        if (Tok.getKind() != tok::r_paren)
+          continue;
+        Kind = SyntaxNodeKind::ObjectLiteral;
+        Nodes.emplace_back(Kind, CharSourceRange(SM, LiteralStartLoc.getValue(),
+                                                 Tok.getRange().getEnd()));
+        LiteralStartLoc = Optional<SourceLoc>();
+        continue;
+      }
+
       switch(Tok.getKind()) {
 #define KEYWORD(X) case tok::kw_##X: Kind = SyntaxNodeKind::Keyword; break;
 #include "swift/Parse/Tokens.def"
@@ -91,8 +102,8 @@ SyntaxModelContext::SyntaxModelContext(SourceFile &SrcFile)
       case tok::pound_##Name:
 #define POUND_OBJECT_LITERAL(Name, Desc, Proto) case tok::pound_##Name:
 #include "swift/Parse/Tokens.def"
-        Kind = SyntaxNodeKind::ObjectLiteral;
-        break;
+        LiteralStartLoc = Loc;
+        continue;
 
 #define POUND_OBJECT_LITERAL(Name, Desc, Proto)
 #define POUND_OLD_OBJECT_LITERAL(Name, NewName, OldArg, NewArg)

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

@@ -4,3 +4,4 @@
 let image = #imageLiteral(resourceName: "cloud.png")
 let color = #colorLiteral(red: 1, blue: 0, green: 1, alpha: 1)
 let file = #fileLiteral(resourceName: "test.txt")
+

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

@@ -1,6 +1,6 @@
 {
   key.offset: 0,
-  key.length: 278,
+  key.length: 279,
   key.diagnostic_stage: source.diagnostic.stage.swift.parse,
   key.syntaxmap: [
     {
@@ -26,17 +26,7 @@
     {
       key.kind: source.lang.swift.syntaxtype.objectliteral,
       key.offset: 124,
-      key.length: 13
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.identifier,
-      key.offset: 138,
-      key.length: 12
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.string,
-      key.offset: 152,
-      key.length: 11
+      key.length: 40
     },
     {
       key.kind: source.lang.swift.syntaxtype.keyword,
@@ -51,47 +41,7 @@
     {
       key.kind: source.lang.swift.syntaxtype.objectliteral,
       key.offset: 177,
-      key.length: 13
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.identifier,
-      key.offset: 191,
-      key.length: 3
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.number,
-      key.offset: 196,
-      key.length: 1
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.identifier,
-      key.offset: 199,
-      key.length: 4
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.number,
-      key.offset: 205,
-      key.length: 1
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.identifier,
-      key.offset: 208,
-      key.length: 5
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.number,
-      key.offset: 215,
-      key.length: 1
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.identifier,
-      key.offset: 218,
-      key.length: 5
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.number,
-      key.offset: 225,
-      key.length: 1
+      key.length: 50
     },
     {
       key.kind: source.lang.swift.syntaxtype.keyword,
@@ -106,17 +56,7 @@
     {
       key.kind: source.lang.swift.syntaxtype.objectliteral,
       key.offset: 239,
-      key.length: 12
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.identifier,
-      key.offset: 252,
-      key.length: 12
-    },
-    {
-      key.kind: source.lang.swift.syntaxtype.string,
-      key.offset: 266,
-      key.length: 10
+      key.length: 38
     }
   ]
 }