[SourceKit] Update expression type request tests with qualified types

Author: skrtks

test/IDE/expr_type.swift

@@ -1,13 +1,13 @@
 // RUN: %target-swift-ide-test -print-expr-type -source-filename %S/Inputs/ExprType.swift -swift-version 5 | %FileCheck %s -check-prefix=CHECK-SUGAR
 // RUN: %target-swift-ide-test -print-expr-type -source-filename %S/Inputs/ExprType.swift -swift-version 5 -canonicalize-type | %FileCheck %s -check-prefix=CHECK-CANON
 
-// CHECK-SUGAR: func foo() -> Int { return <expr type:"Int">1</expr> }
-// CHECK-SUGAR: func bar(f: Float) -> Float { return <expr type:"Float"><expr type:"(Float) -> Float">bar</expr>(f: <expr type:"Float">1</expr>)</expr> }
-// CHECK-SUGAR: func fooP(_ p: P) { <expr type:"()"><expr type:"(P) -> ()">fooP</expr>(<expr type:"P">p</expr>)</expr> }
-// CHECK-SUGAR: <expr type:"()"><expr type:"Int">_</expr> = <expr type:"Int"><expr type:"[C]">a</expr>.count</expr></expr>
-// CHECK-SUGAR: <expr type:"()"><expr type:"String">_</expr> = <expr type:"String"><expr type:"Int"><expr type:"(Int) -> Int"><expr type:"Int"><expr type:"String"><expr type:"[C]">a</expr>.description</expr>.count</expr>.<expr type:"(Int) -> (Int) -> Int">advanced</expr></expr>(by: <expr type:"Int">1</expr>)</expr>.description</expr></expr>
-// CHECK-SUGAR: <expr type:"()"><expr type:"Int?">_</expr> = <expr type:"Int?"><expr type:"Int"><expr type:"(Int) -> Int"><expr type:"Int"><expr type:"S"><expr type:"S?"><expr type:"[Int : S]">a</expr>[<expr type:"Int">2</expr>]</expr>?</expr>.val</expr>.<expr type:"(Int) -> (Int) -> Int">advanced</expr></expr>(by: <expr type:"Int">1</expr>)</expr>.byteSwapped</expr></expr>
+// CHECK-SUGAR: func foo() -> Int { return <expr type:"Int", qualified:"Swift.Int">1</expr> }
+// CHECK-SUGAR: func bar(f: Float) -> Float { return <expr type:"Float", qualified:"Swift.Float"><expr type:"(Float) -> Float", qualified:"(Swift.Float) -> Swift.Float">bar</expr>(f: <expr type:"Float", qualified:"Swift.Float">1</expr>)</expr> }
+// CHECK-SUGAR: func fooP(_ p: P) { <expr type:"()", qualified:"()"><expr type:"(P) -> ()", qualified:"(swift_ide_test.P) -> ()">fooP</expr>(<expr type:"P", qualified:"swift_ide_test.P">p</expr>)</expr> }
+// CHECK-SUGAR: <expr type:"()", qualified:"()"><expr type:"Int", qualified:"Swift.Int">_</expr> = <expr type:"Int", qualified:"Swift.Int"><expr type:"[C]", qualified:"[swift_ide_test.C]">a</expr>.count</expr></expr>
+// CHECK-SUGAR: <expr type:"()", qualified:"()"><expr type:"String", qualified:"Swift.String">_</expr> = <expr type:"String", qualified:"Swift.String"><expr type:"Int", qualified:"Swift.Int"><expr type:"(Int) -> Int", qualified:"(Swift.Int) -> Swift.Int"><expr type:"Int", qualified:"Swift.Int"><expr type:"String", qualified:"Swift.String"><expr type:"[C]", qualified:"[swift_ide_test.C]">a</expr>.description</expr>.count</expr>.<expr type:"(Int) -> (Int) -> Int", qualified:"(Swift.Int) -> (Swift.Int) -> Swift.Int">advanced</expr></expr>(by: <expr type:"Int", qualified:"Swift.Int">1</expr>)</expr>.description</expr></expr>
+// CHECK-SUGAR: <expr type:"()", qualified:"()"><expr type:"Int?", qualified:"Swift.Int?">_</expr> = <expr type:"Int?", qualified:"Swift.Int?"><expr type:"Int", qualified:"Swift.Int"><expr type:"(Int) -> Int", qualified:"(Swift.Int) -> Swift.Int"><expr type:"Int", qualified:"Swift.Int"><expr type:"S", qualified:"swift_ide_test.S"><expr type:"S?", qualified:"swift_ide_test.S?"><expr type:"[Int : S]", qualified:"[Swift.Int : swift_ide_test.S]">a</expr>[<expr type:"Int", qualified:"Swift.Int">2</expr>]</expr>?</expr>.val</expr>.<expr type:"(Int) -> (Int) -> Int", qualified:"(Swift.Int) -> (Swift.Int) -> Swift.Int">advanced</expr></expr>(by: <expr type:"Int", qualified:"Swift.Int">1</expr>)</expr>.byteSwapped</expr></expr>
 
 
-// CHECK-SUGAR: return <expr type:"MyInt"><expr type:"MyInt">a</expr> <expr type:"(Int, Int) -> Int">+</expr> <expr type:"MyInt">b</expr></expr>
-// CHECK-CANON: return <expr type:"Int"><expr type:"Int">a</expr> <expr type:"(Int, Int) -> Int">+</expr> <expr type:"Int">b</expr></expr>
+// CHECK-SUGAR: return <expr type:"MyInt", qualified:"swift_ide_test.MyInt"><expr type:"MyInt", qualified:"swift_ide_test.MyInt">a</expr> <expr type:"(Int, Int) -> Int", qualified:"(Swift.Int, Swift.Int) -> Swift.Int">+</expr> <expr type:"MyInt", qualified:"swift_ide_test.MyInt">b</expr></expr>
+// CHECK-CANON: return <expr type:"Int", qualified:"Swift.Int"><expr type:"Int", qualified:"Swift.Int">a</expr> <expr type:"(Int, Int) -> Int", qualified:"(Swift.Int, Swift.Int) -> Swift.Int">+</expr> <expr type:"Int", qualified:"Swift.Int">b</expr></expr>

test/IDE/expr_type_filtered.swift

@@ -12,19 +12,19 @@
 // EMPTY: }
 
 // PROTO: class Clas: Prot {
-// PROTO:   var value: Clas { return <expr type:"Clas">self</expr> }
-// PROTO:   func getValue() -> Clas { return <expr type:"Clas">self</expr> }
+// PROTO:   var value: Clas { return <expr type:"Clas", qualified:"filtered.Clas">self</expr> }
+// PROTO:   func getValue() -> Clas { return <expr type:"Clas", qualified:"filtered.Clas">self</expr> }
 // PROTO: }
 // PROTO: struct Stru: Prot, Prot1 {
-// PROTO:   var value: Stru { return <expr type:"Stru">self</expr> }
-// PROTO:   func getValue() -> Stru { return <expr type:"Stru">self</expr> }
+// PROTO:   var value: Stru { return <expr type:"Stru", qualified:"filtered.Stru">self</expr> }
+// PROTO:   func getValue() -> Stru { return <expr type:"Stru", qualified:"filtered.Stru">self</expr> }
 // PROTO: }
 
 // PROTO1: class Clas: Prot {
 // PROTO1:   var value: Clas { return self }
 // PROTO1:   func getValue() -> Clas { return self }
 // PROTO1: }
 // PROTO1: struct Stru: Prot, Prot1 {
-// PROTO1:   var value: Stru { return <expr type:"Stru">self</expr> }
-// PROTO1:   func getValue() -> Stru { return <expr type:"Stru">self</expr> }
+// PROTO1:   var value: Stru { return <expr type:"Stru", qualified:"filtered.Stru">self</expr> }
+// PROTO1:   func getValue() -> Stru { return <expr type:"Stru", qualified:"filtered.Stru">self</expr> }
 // PROTO1: }

tools/swift-ide-test/swift-ide-test.cpp

@@ -2598,9 +2598,14 @@ static int doPrintExpressionTypes(const CompilerInvocation &InitInvok,
   // Collect all tags of expressions.
   for (auto R: collectExpressionType(*CI.getPrimarySourceFile(), Usrs, Scratch,
                                      options::CanonicalizeType, OS)) {
-    SortedTags.push_back({R.offset,
-      (llvm::Twine("<expr type:\"") + TypeBuffer.str().substr(R.typeOffset,
-                                                  R.typeLength) + "\">").str()});
+    SortedTags.push_back(
+        {R.offset, (llvm::Twine("<expr type:\"") +
+                    TypeBuffer.str().substr(R.typeOffset, R.typeLength) +
+                    llvm::Twine("\", qualified:\"") +
+                    TypeBuffer.str().substr(R.qualifiedTypeOffset,
+                                            R.qualifiedTypeLength) +
+                    "\">")
+                       .str()});
     SortedTags.push_back({R.offset + R.length, "</expr>"});
   }
   // Sort tags by offset.