Add tests for CollectVariableType request

- Add CollectVariableType test for function/closure parameters
- Test ranged CollectVariableType request
- Add separate test for ranged CollectVariableType
- Use line:col positions in sourcekitd-test for var types
- Add test case for CollectVariableType and inout params
- Update ranged CollectVariableType test
  ...as per the PR suggestions.
- Fix style issue

Author: fwcd

test/SourceKit/VariableType/basic.swift

@@ -0,0 +1,32 @@
+let x: Int = 3
+let y = "abc"
+
+var foo = ["abc" + "def"]
+
+struct A {
+  let x: String = ""
+  let y = ""
+}
+
+class B {
+  var x = 4.0
+  var y = [A]()
+  var z: [Int: Int] = [:]
+  var w: (Int) -> Int { { $0 * 2 } }
+}
+
+func foo() {
+  var local = 5
+}
+
+// RUN: %sourcekitd-test -req=collect-var-type %s -- %s | %FileCheck %s
+// CHECK: (1:5, 1:6): Int (explicit type: 1)
+// CHECK: (2:5, 2:6): String (explicit type: 0)
+// CHECK: (4:5, 4:8): [String] (explicit type: 0)
+// CHECK: (7:7, 7:8): String (explicit type: 1)
+// CHECK: (8:7, 8:8): String (explicit type: 0)
+// CHECK: (12:7, 12:8): Double (explicit type: 0)
+// CHECK: (13:7, 13:8): [A] (explicit type: 0)
+// CHECK: (14:7, 14:8): [Int : Int] (explicit type: 1)
+// CHECK: (15:7, 15:8): (Int) -> Int (explicit type: 1)
+// CHECK: (19:7, 19:12): Int (explicit type: 0)

test/SourceKit/VariableType/inout.swift

@@ -0,0 +1,10 @@
+func x(_ param: inout Int) -> Int {
+  param = 4
+}
+
+let z = { (param: inout String) in }
+
+// RUN: %sourcekitd-test -req=collect-var-type %s -- %s | %FileCheck %s
+// CHECK: (1:10, 1:15): Int (explicit type: 1)
+// CHECK: (5:5, 5:6): (inout String) -> () (explicit type: 0)
+// CHECK: (5:12, 5:17): String (explicit type: 1)

test/SourceKit/VariableType/params.swift

@@ -0,0 +1,16 @@
+func x(_ param: Int) -> Int {
+  param
+}
+
+let y: (String) -> Void = { param in }
+
+let z = { (param: String) in
+  param.count
+}
+
+// RUN: %sourcekitd-test -req=collect-var-type %s -- %s | %FileCheck %s
+// CHECK: (1:10, 1:15): Int (explicit type: 1)
+// CHECK: (5:5, 5:6): (String) -> Void (explicit type: 1)
+// CHECK: (5:29, 5:34): String (explicit type: 0)
+// CHECK: (7:5, 7:6): (String) -> Int (explicit type: 0)
+// CHECK: (7:12, 7:17): String (explicit type: 1)

test/SourceKit/VariableType/ranged.swift

@@ -0,0 +1,10 @@
+let x = 1
+let y = "abc"
+let z: String = "def"
+var w = 4
+
+// RUN: %sourcekitd-test -req=collect-var-type -pos=2:1 -end-pos=4:1 %s -- %s | %FileCheck %s
+// CHECK-NOT: (1:5, 1:6)
+// CHECK: (2:5, 2:6): String (explicit type: 0)
+// CHECK: (3:5, 3:6): String (explicit type: 1)
+// CHECK-NOT: (4:5, 4:6)

tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp

@@ -67,7 +67,9 @@ static void printNameTranslationInfo(sourcekitd_variant_t Info, llvm::raw_ostrea
 static void printRangeInfo(sourcekitd_variant_t Info, StringRef Filename,
                            llvm::raw_ostream &OS);
 static void printExpressionType(sourcekitd_variant_t Info, llvm::raw_ostream &OS);
-static void printVariableType(sourcekitd_variant_t Info, llvm::raw_ostream &OS);
+static void printVariableType(sourcekitd_variant_t Info,
+                              llvm::MemoryBuffer *SourceBuf,
+                              llvm::raw_ostream &OS);
 static void printDocInfo(sourcekitd_variant_t Info, StringRef Filename);
 static void printInterfaceGen(sourcekitd_variant_t Info, bool CheckASCII);
 static void printSemanticInfo();
@@ -1267,7 +1269,7 @@ static bool handleResponse(sourcekitd_response_t Resp, const TestOptions &Opts,
       break;
 
     case SourceKitRequest::CollectVariableType:
-      printVariableType(Info, llvm::outs());
+      printVariableType(Info, SourceBuf.get(), llvm::outs());
       break;
 
     case SourceKitRequest::DocInfo:
@@ -1961,7 +1963,9 @@ static void printExpressionType(sourcekitd_variant_t Info, llvm::raw_ostream &OS
   OS << "</ExpressionTypes>\n";
 }
 
-static void printVariableType(sourcekitd_variant_t Info, llvm::raw_ostream &OS) {
+static void printVariableType(sourcekitd_variant_t Info,
+                              llvm::MemoryBuffer *SourceBuf,
+                              llvm::raw_ostream &OS) {
   auto TypeBuffer =
       sourcekitd_variant_dictionary_get_value(Info, KeyVariableTypeList);
   unsigned Count = sourcekitd_variant_array_get_count(TypeBuffer);
@@ -1974,9 +1978,16 @@ static void printVariableType(sourcekitd_variant_t Info, llvm::raw_ostream &OS)
     sourcekitd_variant_t Item = sourcekitd_variant_array_get_value(TypeBuffer, i);
     unsigned Offset = sourcekitd_variant_dictionary_get_int64(Item, KeyVariableOffset);
     unsigned Length = sourcekitd_variant_dictionary_get_int64(Item, KeyVariableLength);
+    auto Start = resolveToLineCol(Offset, SourceBuf);
+    auto End = resolveToLineCol(Offset + Length, SourceBuf);
     bool HasExplicitType = sourcekitd_variant_dictionary_get_bool(Item, KeyVariableTypeExplicit);
-    OS << "(" << Offset << ", " << Offset + Length << "): "
-       << sourcekitd_variant_dictionary_get_string(Item, KeyVariableType)
+    auto PrintedType = sourcekitd_variant_dictionary_get_string(Item, KeyVariableType);
+    OS << "("
+       << Start.first << ":" << Start.second
+       << ", "
+       << End.first << ":" << End.second
+       << "): "
+       << PrintedType
        << " (explicit type: " << HasExplicitType << ")\n";
   }
   OS << "</VariableTypes>\n";