[SourceKit] Report init info instead of the type decl info

Simon Barinka · Simon Barinka · commit e32a20a55cdd · 2023-08-01T12:51:39.000+02:00
Addresses PR review comments.
diff --git a/lib/IDE/IDERequests.cpp b/lib/IDE/IDERequests.cpp
@@ -348,8 +348,8 @@ bool CursorInfoResolver::walkToExprPost(Expr *E) {
     return false;
 
   if (OutermostCursorExpr && isCursorOn(E, LocToResolve)) {
-    CursorInfo = new ResolvedExprStartCursorInfo(
-        CursorInfo->getSourceFile(), CursorInfo->getLoc(), E);
+    CursorInfo = new ResolvedExprStartCursorInfo(CursorInfo->getSourceFile(),
+                                                 CursorInfo->getLoc(), E);
     return false;
   }
 
diff --git a/test/SourceKit/CursorInfo/cursor_info.swift b/test/SourceKit/CursorInfo/cursor_info.swift
@@ -230,11 +230,16 @@ enum E7: String {
 
 func checkAnyIsAKeyword(x: Any) {}
 
-var nilLiteral1: Int? = nil
-var nilLiteral2: Int! = nil
-
 var binExpr = 1 + 2 + 3
 
+struct A: ExpressibleByIntegerLiteral {
+    init(integerLiteral value: Int) {
+        self.value = value
+    }
+    let value: Int
+}
+var a: A = 42
+
 // REQUIRES: objc_interop
 // RUN: %empty-directory(%t.tmp)
 // RUN: %swiftc_driver -emit-module -o %t.tmp/FooSwiftModule.swiftmodule %S/Inputs/FooSwiftModule.swift
@@ -808,52 +813,48 @@ var binExpr = 1 + 2 + 3
 // CHECK93: <Declaration>case b = &quot;f&quot;</Declaration>
 // CHECK93-NEXT: <decl.enumelement><syntaxtype.keyword>case</syntaxtype.keyword> <decl.name>b</decl.name> = <syntaxtype.string>&quot;f&quot;</syntaxtype.string></decl.enumelement>
 
-// RUN: %sourcekitd-test -req=cursor -pos=23:23 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK94 %s
-// CHECK94: source.lang.swift.expr.literal ()
-// CHECK94-EMPTY:
-// CHECK94-NEXT: s:SS
+// RUN: %sourcekitd-test -req=cursor -pos=227:14 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK94 %s
+// CHECK94: source.lang.swift.ref.function.constructor
+// CHECK94-NEXT: init(_builtinStringLiteral:utf8CodeUnitCount:isASCII:)
+// CHECK94-NEXT: s:SS21_builtinStringLiteral17utf8CodeUnitCount7isASCIISSBp_BwBi1_tcfc
 // CHECK94-NEXT: source.lang.swift
-// CHECK94-NEXT: String
-// CHECK94-NEXT: $sSSD
+// CHECK94-NEXT: (String.Type) -> (Builtin.RawPointer, Builtin.Word, Builtin.Int1) -> String
+// CHECK94-NEXT: $s21_builtinStringLiteral17utf8CodeUnitCount7isASCIISSBp_BwBi1_tcD
 // CHECK94-NEXT: Swift
 // CHECK94-NEXT: <Group>String</Group>
 // CHECK94-NEXT: SYSTEM
-// CHECK94-NEXT: <Declaration>@frozen @_eagerMove struct String</Declaration>
-// CHECK94-NEXT: <decl.struct><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@frozen</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.attribute.builtin><syntaxtype.attribute.name>@_eagerMove</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.keyword>struct</syntaxtype.keyword> <decl.name>String</decl.name></decl.struct>
 
 // RUN:  %sourcekitd-test -req=cursor -pos=231:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK95 %s
 // CHECK95: <Declaration>func checkAnyIsAKeyword(x: Any)</Declaration>
 // CHECK95-NEXT: <decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>checkAnyIsAKeyword</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>x</decl.var.parameter.argument_label>: <decl.var.parameter.type><syntaxtype.keyword>Any</syntaxtype.keyword></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>
 
-// RUN: %sourcekitd-test -req=cursor -pos=233:25 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK96 %s
-// CHECK96: source.lang.swift.expr.literal
-// CHECK96-EMPTY:
-// CHECK96-NEXT: s:Sq
+// RUN: %sourcekitd-test -req=cursor -pos=23:23 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK96 %s
+// CHECK96: source.lang.swift.ref.function.constructor
+// CHECK96-NEXT: init(_builtinStringLiteral:utf8CodeUnitCount:isASCII:)
+// CHECK96-NEXT: s:SS21_builtinStringLiteral17utf8CodeUnitCount7isASCIISSBp_BwBi1_tcfc
 // CHECK96-NEXT: source.lang.swift
-// CHECK96-NEXT: Int?
-// CHECK96-NEXT: $sSiXSqD
+// CHECK96-NEXT: (String.Type) -> (Builtin.RawPointer, Builtin.Word, Builtin.Int1) -> String
+// CHECK96-NEXT: $s21_builtinStringLiteral17utf8CodeUnitCount7isASCIISSBp_BwBi1_tcD
 // CHECK96-NEXT: Swift
-// CHECK96-NEXT: <Group>Optional</Group>
+// CHECK96-NEXT: <Group>String</Group>
 // CHECK96-NEXT: SYSTEM
 
-// RUN: %sourcekitd-test -req=cursor -pos=234:25 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK97 %s
-// CHECK97: source.lang.swift.expr.literal
-// CHECK97-EMPTY:
-// CHECK97-NEXT: s:Sq
+// RUN: %sourcekitd-test -req=cursor -pos=233:19 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK97 %s
+// CHECK97: source.lang.swift.ref.function.constructor
+// CHECK97-NEXT: init(_builtinIntegerLiteral:)
+// CHECK97-NEXT: s:Si22_builtinIntegerLiteralSiBI_tcfc
 // CHECK97-NEXT: source.lang.swift
-// CHECK97-NEXT: Int?
-// CHECK97-NEXT: $sSiXSqD
+// CHECK97-NEXT: (Int.Type) -> (Builtin.IntLiteral) -> Int
+// CHECK97-NEXT: $s22_builtinIntegerLiteralSiBI_tcD
 // CHECK97-NEXT: Swift
-// CHECK97-NEXT: <Group>Optional</Group>
+// CHECK97-NEXT: <Group>Math/Integers</Group>
 // CHECK97-NEXT: SYSTEM
 
-// RUN: %sourcekitd-test -req=cursor -pos=236:19 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK98 %s
-// CHECK98: source.lang.swift.expr.literal
-// CHECK98-EMPTY:
-// CHECK98-NEXT: s:Si
+// RUN: %sourcekitd-test -req=cursor -pos=241:12 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK98 %s
+// CHECK98: source.lang.swift.ref.function.constructor (236:5-236:36)
+// CHECK98-NEXT: init(integerLiteral:)
+// CHECK98-NEXT: s:11cursor_info1AV14integerLiteralACSi_tcfc
 // CHECK98-NEXT: source.lang.swift
-// CHECK98-NEXT: Int
-// CHECK98-NEXT: $sSiD
-// CHECK98-NEXT: Swift
-// CHECK98-NEXT: <Group>Math/Integers</Group>
-// CHECK98-NEXT: SYSTEM
+// CHECK98-NEXT: (A.Type) -> (Int) -> A
+// CHECK98-NEXT: $s14integerLiteral11cursor_info1AVSi_tcD
+// CHECK98-NEXT: cursor_info
diff --git a/test/SourceKit/CursorInfo/cursor_stdlib.swift b/test/SourceKit/CursorInfo/cursor_stdlib.swift
@@ -235,55 +235,56 @@ let dictNonCost = [1:2, 3:d]
 // RUN: %sourcekitd-test_plain \
 // RUN:    -req=open -name %s %s -- %s -sdk %sdk == \
 // RUN:    -req=cursor -pos=25:29 %s -- %s -sdk %sdk | %FileCheck -check-prefix=CHECK-OBJ-LITERAL %s
-// CHECK-OBJ-LITERAL: source.lang.swift.expr.object_literal
-// CHECK-OBJ-LITERAL-EMPTY:
-// CHECK-OBJ-LITERAL: c:objc(cs)NSColor
-// CHECK-OBJ-LITERAL: source.lang.objc
-// CHECK-OBJ-LITERAL: NSColor
-// CHECK-OBJ-LITERAL: $sSo7NSColorCD
-// CHECK-OBJ-LITERAL: AppKit.NSColor
-// CHECK-OBJ-LITERAL: SYSTEM
+// CHECK-OBJ-LITERAL: source.lang.swift.ref.function.constructor
+// CHECK-OBJ-LITERAL-NEXT: init(_colorLiteralRed:green:blue:alpha:)
+// CHECK-OBJ-LITERAL-NEXT: s:So7NSColorC6AppKitE16_colorLiteralRed5green4blue5alphaABSf_S3ftcfc
+// CHECK-OBJ-LITERAL-NEXT: source.lang.swift
+// CHECK-OBJ-LITERAL-NEXT: (NSColor.Type) -> (Float, Float, Float, Float) -> NSColor
+// CHECK-OBJ-LITERAL-NEXT: $s16_colorLiteralRed5green4blue5alphaSo7NSColorCSf_S3ftcD
+// CHECK-OBJ-LITERAL-NEXT: AppKit
+// CHECK-OBJ-LITERAL-NEXT: SYSTEM
+
 
 // RUN: %sourcekitd-test_plain -req=cursor -pos=27:18 %s -- %s -sdk %sdk | %FileCheck -check-prefix=CHECK-ARRAY1 %s
-// CHECK-ARRAY1: source.lang.swift.expr.literal
-// CHECK-ARRAY1-EMPTY:
-// CHECK-ARRAY1: s:Sa
-// CHECK-ARRAY1: source.lang.swift
-// CHECK-ARRAY1: [Int]
-// CHECK-ARRAY1: $sSiXSaD
-// CHECK-ARRAY1: Swift
-// CHECK-ARRAY1: <Group>Collection/Array</Group>
-// CHECK-ARRAY1: SYSTEM
+// CHECK-ARRAY1: source.lang.swift.ref.function.constructor
+// CHECK-ARRAY1-NEXT: init(arrayLiteral:)
+// CHECK-ARRAY1-NEXT: s:Sa12arrayLiteralSayxGxd_tcfc
+// CHECK-ARRAY1-NEXT: source.lang.swift
+// CHECK-ARRAY1-NEXT: <Element> (Array<Element>.Type) -> (Element...) -> Array<Element>
+// CHECK-ARRAY1-NEXT: $s12arrayLiteralSayxGxd_tcD
+// CHECK-ARRAY1-NEXT: Swift
+// CHECK-ARRAY1-NEXT: <Group>Collection/Array</Group>
+// CHECK-ARRAY1-NEXT: SYSTEM
 
 // RUN: %sourcekitd-test_plain -req=cursor -pos=28:19 %s -- %s -sdk %sdk | %FileCheck -check-prefix=CHECK-ARRAY2 %s
-// CHECK-ARRAY2: source.lang.swift.expr.literal
-// CHECK-ARRAY2-EMPTY:
-// CHECK-ARRAY2: s:Sa
-// CHECK-ARRAY2: source.lang.swift
-// CHECK-ARRAY2: [Any]
-// CHECK-ARRAY2: $sypXSaD
-// CHECK-ARRAY2: Swift
-// CHECK-ARRAY2: <Group>Collection/Array</Group>
-// CHECK-ARRAY2: SYSTEM
+// CHECK-ARRAY2: source.lang.swift.ref.function.constructor
+// CHECK-ARRAY2-NEXT: init(arrayLiteral:)
+// CHECK-ARRAY2-NEXT: s:Sa12arrayLiteralSayxGxd_tcfc
+// CHECK-ARRAY2-NEXT: source.lang.swift
+// CHECK-ARRAY2-NEXT: <Element> (Array<Element>.Type) -> (Element...) -> Array<Element>
+// CHECK-ARRAY2-NEXT: $s12arrayLiteralSayxGxd_tcD
+// CHECK-ARRAY2-NEXT: Swift
+// CHECK-ARRAY2-NEXT: <Group>Collection/Array</Group>
+// CHECK-ARRAY2-NEXT: SYSTEM
 
 // RUN: %sourcekitd-test_plain -req=cursor -pos=30:19 %s -- %s -sdk %sdk | %FileCheck -check-prefix=CHECK-DICT1 %s
-// CHECK-DICT1: source.lang.swift.expr.literal
-// CHECK-DICT1-EMPTY:
-// CHECK-DICT1: s:SD
-// CHECK-DICT1: source.lang.swift
-// CHECK-DICT1: [Int : Int]
-// CHECK-DICT1: $sS2iXSDD
-// CHECK-DICT1: Swift
-// CHECK-DICT1: <Group>Collection/HashedCollections</Group>
-// CHECK-DICT1: SYSTEM
+// CHECK-DICT1: source.lang.swift.ref.function.constructor
+// CHECK-DICT1-NEXT: init(dictionaryLiteral:)
+// CHECK-DICT1-NEXT: s:SD17dictionaryLiteralSDyxq_Gx_q_td_tcfc
+// CHECK-DICT1-NEXT: source.lang.swift
+// CHECK-DICT1-NEXT: <Key, Value where Key : Hashable> (Dictionary<Key, Value>.Type) -> ((Key, Value)...) -> Dictionary<Key, Value>
+// CHECK-DICT1-NEXT: $s17dictionaryLiteralSDyxq_Gx_q_td_tcD
+// CHECK-DICT1-NEXT: Swift
+// CHECK-DICT1-NEXT: <Group>Collection/HashedCollections</Group>
+// CHECK-DICT1-NEXT: SYSTEM
 
 // RUN: %sourcekitd-test_plain -req=cursor -pos=31:19 %s -- %s -sdk %sdk | %FileCheck -check-prefix=CHECK-DICT2 %s
-// CHECK-DICT2: source.lang.swift.expr.literal
-// CHECK-DICT2-EMPTY:
-// CHECK-DICT2: s:SD
-// CHECK-DICT2: source.lang.swift
-// CHECK-DICT2: [Int : Any]
-// CHECK-DICT2: $sSiypXSDD
-// CHECK-DICT2: Swift
-// CHECK-DICT2: <Group>Collection/HashedCollections</Group>
-// CHECK-DICT2: SYSTEM
+// CHECK-DICT2: source.lang.swift.ref.function.constructor
+// CHECK-DICT2-NEXT: init(dictionaryLiteral:)
+// CHECK-DICT2-NEXT: s:SD17dictionaryLiteralSDyxq_Gx_q_td_tcfc
+// CHECK-DICT2-NEXT: source.lang.swift
+// CHECK-DICT2-NEXT: <Key, Value where Key : Hashable> (Dictionary<Key, Value>.Type) -> ((Key, Value)...) -> Dictionary<Key, Value>
+// CHECK-DICT2-NEXT: $s17dictionaryLiteralSDyxq_Gx_q_td_tcD
+// CHECK-DICT2-NEXT: Swift
+// CHECK-DICT2-NEXT: <Group>Collection/HashedCollections</Group>
+// CHECK-DICT2-NEXT: SYSTEM
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
@@ -333,13 +333,6 @@ UIdent SwiftLangSupport::getUIDForDecl(const Decl *D, bool IsRef) {
   return UIdentVisitor(IsRef).visit(const_cast<Decl*>(D));
 }
 
-UIdent SwiftLangSupport::getUIDForLiteral(const Expr *Lit) {
-  if (dyn_cast<ObjectLiteralExpr>(Lit)) {
-    return KindExprObjectLiteral;
-  }
-  return KindExprLiteral;
-}
-
 UIdent SwiftLangSupport::getUIDForExtensionOfDecl(const Decl *D) {
   switch (D->getKind()) {
     case swift::DeclKind::Struct:
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
@@ -427,7 +427,6 @@ class SwiftLangSupport : public LangSupport {
   static SourceKit::UIdent getUIDForDeclLanguage(const swift::Decl *D);
   static SourceKit::UIdent getUIDForDecl(const swift::Decl *D,
                                          bool IsRef = false);
-  static SourceKit::UIdent getUIDForLiteral(const swift::Expr *Lit);
   static SourceKit::UIdent getUIDForExtensionOfDecl(const swift::Decl *D);
   static SourceKit::UIdent getUIDForLocalVar(bool IsRef = false);
   static SourceKit::UIdent getUIDForRefactoringKind(
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
diff --git a/utils/gyb_sourcekit_support/UIDs.py b/utils/gyb_sourcekit_support/UIDs.py

Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,8 @@ bool CursorInfoResolver::walkToExprPost(Expr *E) {`
`348`	`348`	`return false;`
`349`	`349`
`350`	`350`	`if (OutermostCursorExpr && isCursorOn(E, LocToResolve)) {`
`351`		`- CursorInfo = new ResolvedExprStartCursorInfo(`
`352`		`- CursorInfo->getSourceFile(), CursorInfo->getLoc(), E);`
	`351`	`+ CursorInfo = new ResolvedExprStartCursorInfo(CursorInfo->getSourceFile(),`
	`352`	`+ CursorInfo->getLoc(), E);`
`353`	`353`	`return false;`
`354`	`354`	`}`
`355`	`355`