From 10447c32d2f536dfaafc91cc3bac683c72f9c8e4 Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Sat, 6 Jul 2024 13:28:59 +0200 Subject: [PATCH 1/9] [test/SourceKit] Fix typos --- .../CodeComplete/complete_filter.swift | 16 ++++++------- .../CodeComplete/complete_typerelation.swift | 6 ++--- ...te_typerelation.swift.convertible.response | 24 +++++++++---------- ...lete_typerelation.swift.identical.response | 24 +++++++++---------- .../CodeExpand/code-expand-no-typecheck.swift | 2 +- .../cursor_generated_interface.swift | 14 +++++------ .../InterfaceGen/error_swift_module.swift | 18 +++++++------- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/test/SourceKit/CodeComplete/complete_filter.swift b/test/SourceKit/CodeComplete/complete_filter.swift index 6b7369832ab0f..82d74549e1061 100644 --- a/test/SourceKit/CodeComplete/complete_filter.swift +++ b/test/SourceKit/CodeComplete/complete_filter.swift @@ -52,14 +52,14 @@ func foo() { // RUN: %sourcekitd-test -req=complete.open -pos=11:5 \ // RUN: -req-opts=filtertext=d %s -- %s > %t.d -// RUN: %FileCheck -check-prefix=CHECKD %s < %t.d - -// CHECKD-NOT: key.name -// CHECKD: ], -// CHECKD-NEXT: key.kind: source.lang.swift.codecomplete.group -// CHECKD-NEXT: key.name: "" -// CHECKD-NEXT: key.nextrequeststart: 0 -// CHECKD-NEXT: } +// RUN: %FileCheck -check-prefix=CHECKED %s < %t.d + +// CHECKED-NOT: key.name +// CHECKED: ], +// CHECKED-NEXT: key.kind: source.lang.swift.codecomplete.group +// CHECKED-NEXT: key.name: "" +// CHECKED-NEXT: key.nextrequeststart: 0 +// CHECKED-NEXT: } // RUN: %complete-test -tok=FOO %s | %FileCheck %s diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift b/test/SourceKit/CodeComplete/complete_typerelation.swift index 2e3856a7fce75..1c9e9e25eb427 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift @@ -5,10 +5,10 @@ enum MyEnum : MyProto { static func staticReturnVoid() {} static func staticReturnMyEnum() -> MyEnum { return .foo } - func intanceReturnVoid() {} - func intanceReturnMyEnum() -> MyEnum { return .foo } + func instanceReturnVoid() {} + func instanceReturnMyEnum() -> MyEnum { return .foo } @available(*, deprecated) - func intanceReturnVoidDeprecated() {} + func instanceReturnVoidDeprecated() {} } func testIdenticalContext() -> MyEnum { diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response index 1ae93e005e752..c6ac8e71670cf 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response @@ -26,40 +26,40 @@ }, { key.kind: source.lang.swift.decl.function.method.instance, - key.name: "intanceReturnMyEnum(:)", - key.description: "intanceReturnMyEnum(self: MyEnum)", + key.name: "instanceReturnMyEnum(:)", + key.description: "instanceReturnMyEnum(self: MyEnum)", key.typename: "() -> MyEnum", key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.unrelated, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO013intanceReturncD0ACyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO013instanceReturncD0ACyF", key.modulename: "complete_typerelation", - key.sourcetext: "intanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)" + key.sourcetext: "instanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)" }, { key.kind: source.lang.swift.decl.function.method.instance, - key.name: "intanceReturnVoid(:)", - key.description: "intanceReturnVoid(self: MyEnum)", + key.name: "instanceReturnVoid(:)", + key.description: "instanceReturnVoid(self: MyEnum)", key.typename: "() -> Void", key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO17intanceReturnVoidyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO17instanceReturnVoidyyF", key.modulename: "complete_typerelation", - key.sourcetext: "intanceReturnVoid(<#T##self: MyEnum##MyEnum#>)" + key.sourcetext: "instanceReturnVoid(<#T##self: MyEnum##MyEnum#>)" }, { key.kind: source.lang.swift.decl.function.method.instance, - key.name: "intanceReturnVoidDeprecated(:)", - key.description: "intanceReturnVoidDeprecated(self: MyEnum)", + key.name: "instanceReturnVoidDeprecated(:)", + key.description: "instanceReturnVoidDeprecated(self: MyEnum)", key.typename: "() -> Void", key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, key.not_recommended: 1, - key.associated_usrs: "s:21complete_typerelation6MyEnumO27intanceReturnVoidDeprecatedyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO27instanceReturnVoidDeprecatedyyF", key.modulename: "complete_typerelation", - key.sourcetext: "intanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)" + key.sourcetext: "instanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)" }, { key.kind: source.lang.swift.keyword, diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response index 1ae93e005e752..c6ac8e71670cf 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response @@ -26,40 +26,40 @@ }, { key.kind: source.lang.swift.decl.function.method.instance, - key.name: "intanceReturnMyEnum(:)", - key.description: "intanceReturnMyEnum(self: MyEnum)", + key.name: "instanceReturnMyEnum(:)", + key.description: "instanceReturnMyEnum(self: MyEnum)", key.typename: "() -> MyEnum", key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.unrelated, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO013intanceReturncD0ACyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO013instanceReturncD0ACyF", key.modulename: "complete_typerelation", - key.sourcetext: "intanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)" + key.sourcetext: "instanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)" }, { key.kind: source.lang.swift.decl.function.method.instance, - key.name: "intanceReturnVoid(:)", - key.description: "intanceReturnVoid(self: MyEnum)", + key.name: "instanceReturnVoid(:)", + key.description: "instanceReturnVoid(self: MyEnum)", key.typename: "() -> Void", key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO17intanceReturnVoidyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO17instanceReturnVoidyyF", key.modulename: "complete_typerelation", - key.sourcetext: "intanceReturnVoid(<#T##self: MyEnum##MyEnum#>)" + key.sourcetext: "instanceReturnVoid(<#T##self: MyEnum##MyEnum#>)" }, { key.kind: source.lang.swift.decl.function.method.instance, - key.name: "intanceReturnVoidDeprecated(:)", - key.description: "intanceReturnVoidDeprecated(self: MyEnum)", + key.name: "instanceReturnVoidDeprecated(:)", + key.description: "instanceReturnVoidDeprecated(self: MyEnum)", key.typename: "() -> Void", key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, key.not_recommended: 1, - key.associated_usrs: "s:21complete_typerelation6MyEnumO27intanceReturnVoidDeprecatedyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO27instanceReturnVoidDeprecatedyyF", key.modulename: "complete_typerelation", - key.sourcetext: "intanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)" + key.sourcetext: "instanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)" }, { key.kind: source.lang.swift.keyword, diff --git a/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift b/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift index 4a20e8d69d1ee..b1109a32254f7 100644 --- a/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift +++ b/test/SourceKit/CodeExpand/code-expand-no-typecheck.swift @@ -1,6 +1,6 @@ // RUN: %sourcekitd-test -req=expand-placeholder %s | %FileCheck %s -// FIXME: Make it acccept '-debug-forbid-typecheck-prefix' and ensure no typecheck happens.' +// FIXME: Make it accept '-debug-forbid-typecheck-prefix' and ensure no typecheck happens.' protocol MyProto {} diff --git a/test/SourceKit/CursorInfo/cursor_generated_interface.swift b/test/SourceKit/CursorInfo/cursor_generated_interface.swift index 81826a37c43c8..8a6a26351fa63 100644 --- a/test/SourceKit/CursorInfo/cursor_generated_interface.swift +++ b/test/SourceKit/CursorInfo/cursor_generated_interface.swift @@ -105,13 +105,13 @@ public class CType {} @interface DType @end -// RUN: %sourcekitd-test -req=interface-gen-open -module LibA -- -F %t/frameworks -target %target-triple == -req=cursor -pos=14:57 -print-raw-response | %FileCheck %s --check-prefix=CHECKD -// CHECKD: key.name: "DType" -// CHECKD: key.line: [[@LINE-5]] -// CHECKD: key.column: 12 -// CHECKD: key.filepath: {{.*}}LibD.h -// CHECKD: key.modulename: "LibD" -// CHECKD: key.decl_lang: source.lang.objc +// RUN: %sourcekitd-test -req=interface-gen-open -module LibA -- -F %t/frameworks -target %target-triple == -req=cursor -pos=14:57 -print-raw-response | %FileCheck %s --check-prefix=CHECKED +// CHECKED: key.name: "DType" +// CHECKED: key.line: [[@LINE-5]] +// CHECKED: key.column: 12 +// CHECKED: key.filepath: {{.*}}LibD.h +// CHECKED: key.modulename: "LibD" +// CHECKED: key.decl_lang: source.lang.objc //--- mods/module.map module LibD { diff --git a/test/SourceKit/InterfaceGen/error_swift_module.swift b/test/SourceKit/InterfaceGen/error_swift_module.swift index 61ab865b16d58..a01b42025a6fc 100644 --- a/test/SourceKit/InterfaceGen/error_swift_module.swift +++ b/test/SourceKit/InterfaceGen/error_swift_module.swift @@ -13,9 +13,9 @@ import Transitive import WrongName -//--- LibraryNonExistant.swift +//--- LibraryNonExistent.swift -import NonExistant +import NonExistent // RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name Transitive -o %t/WrongName.swiftmodule // RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name Transitive -o %t/Transitive.swiftmodule @@ -45,14 +45,14 @@ import NonExistant // RUN: not %sourcekitd-test -req=interface-gen -module LibraryWrong -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix TRANSITIVE-FAIL %s // TRANSITIVE-FAIL: Could not load module: LibraryWrong (cannot load module 'Transitive' as 'WrongName') -// Try a non-existant module +// Try a non-existent module -// RUN: not %sourcekitd-test -req=interface-gen -module NonExistant -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix DIRECT-NONEXISTANT %s -// DIRECT-NONEXISTANT: Could not load module: NonExistant +// RUN: not %sourcekitd-test -req=interface-gen -module NonExistent -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix DIRECT-NONEXISTENT %s +// DIRECT-NONEXISTENT: Could not load module: NonExistent -// RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name NonExistant -o %t -// RUN: %target-swift-frontend -emit-module %t/Inputs/LibraryNonExistant.swift -module-name LibraryNonExistant -I %t -o %t +// RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name NonExistent -o %t +// RUN: %target-swift-frontend -emit-module %t/Inputs/LibraryNonExistant.swift -module-name LibraryNonExistent -I %t -o %t // RUN: rm -rf %t/NonExistant.swiftmodule -// RUN: not %sourcekitd-test -req=interface-gen -module LibraryNonExistant -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix TRANSITIVE-NONEXISTANT %s -// TRANSITIVE-NONEXISTANT: Could not load module: LibraryNonExistant (missing required module 'NonExistant') +// RUN: not %sourcekitd-test -req=interface-gen -module LibraryNonExistent -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix TRANSITIVE-NONEXISTENT %s +// TRANSITIVE-NONEXISTENT: Could not load module: LibraryNonExistent (missing required module 'NonExistent') From bda8314044b7d859150e3ca3d3577dcdab26c1bc Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 8 Jul 2024 20:32:48 +0200 Subject: [PATCH 2/9] Update test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response Co-authored-by: Ben Barham --- .../complete_typerelation.swift.convertible.response | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response index c6ac8e71670cf..9f2d99ef3b1ba 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response @@ -32,7 +32,7 @@ key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.unrelated, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO013instanceReturncD0ACyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO014instanceReturncD0ACyF", key.modulename: "complete_typerelation", key.sourcetext: "instanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)" }, From b85054907a57a6092b27cce5447d60f5cd77743e Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 8 Jul 2024 20:32:56 +0200 Subject: [PATCH 3/9] Update test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response Co-authored-by: Ben Barham --- .../complete_typerelation.swift.convertible.response | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response index 9f2d99ef3b1ba..cae6b89441a02 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response @@ -44,7 +44,7 @@ key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO17instanceReturnVoidyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO18instanceReturnVoidyyF", key.modulename: "complete_typerelation", key.sourcetext: "instanceReturnVoid(<#T##self: MyEnum##MyEnum#>)" }, From 27ff8b9480fa84ff08ae22fcd3c5fed42d9d2495 Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 8 Jul 2024 20:33:02 +0200 Subject: [PATCH 4/9] Update test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response Co-authored-by: Ben Barham --- .../complete_typerelation.swift.convertible.response | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response index cae6b89441a02..9afb988027ecf 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.convertible.response @@ -57,7 +57,7 @@ key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, key.not_recommended: 1, - key.associated_usrs: "s:21complete_typerelation6MyEnumO27instanceReturnVoidDeprecatedyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO28instanceReturnVoidDeprecatedyyF", key.modulename: "complete_typerelation", key.sourcetext: "instanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)" }, From 44fea1f81042e190bdf26d097601412f5d0dc73e Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 8 Jul 2024 20:33:10 +0200 Subject: [PATCH 5/9] Update test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response Co-authored-by: Ben Barham --- .../CodeComplete/complete_typerelation.swift.identical.response | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response index c6ac8e71670cf..9f2d99ef3b1ba 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response @@ -32,7 +32,7 @@ key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.unrelated, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO013instanceReturncD0ACyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO014instanceReturncD0ACyF", key.modulename: "complete_typerelation", key.sourcetext: "instanceReturnMyEnum(<#T##self: MyEnum##MyEnum#>)" }, From 906585ba74b62a2237867d5be412d88e9a7a7663 Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 8 Jul 2024 20:33:17 +0200 Subject: [PATCH 6/9] Update test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response Co-authored-by: Ben Barham --- .../CodeComplete/complete_typerelation.swift.identical.response | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response index 9f2d99ef3b1ba..cae6b89441a02 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response @@ -44,7 +44,7 @@ key.context: source.codecompletion.context.thisclass, key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, - key.associated_usrs: "s:21complete_typerelation6MyEnumO17instanceReturnVoidyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO18instanceReturnVoidyyF", key.modulename: "complete_typerelation", key.sourcetext: "instanceReturnVoid(<#T##self: MyEnum##MyEnum#>)" }, From ba43236def2e3c115174f665baf1853b96709f5b Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 8 Jul 2024 20:33:23 +0200 Subject: [PATCH 7/9] Update test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response Co-authored-by: Ben Barham --- .../CodeComplete/complete_typerelation.swift.identical.response | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response index cae6b89441a02..9afb988027ecf 100644 --- a/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response +++ b/test/SourceKit/CodeComplete/complete_typerelation.swift.identical.response @@ -57,7 +57,7 @@ key.typerelation: source.codecompletion.typerelation.invalid, key.num_bytes_to_erase: 0, key.not_recommended: 1, - key.associated_usrs: "s:21complete_typerelation6MyEnumO27instanceReturnVoidDeprecatedyyF", + key.associated_usrs: "s:21complete_typerelation6MyEnumO28instanceReturnVoidDeprecatedyyF", key.modulename: "complete_typerelation", key.sourcetext: "instanceReturnVoidDeprecated(<#T##self: MyEnum##MyEnum#>)" }, From c8229653797b28912b2c0c718727485738406594 Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Mon, 8 Jul 2024 20:37:04 +0200 Subject: [PATCH 8/9] [test/SourceKit] Revert incorrect typo changes ('CHECKD'). --- .../SourceKit/CodeComplete/complete_filter.swift | 16 ++++++++-------- .../CursorInfo/cursor_generated_interface.swift | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/SourceKit/CodeComplete/complete_filter.swift b/test/SourceKit/CodeComplete/complete_filter.swift index 82d74549e1061..6b7369832ab0f 100644 --- a/test/SourceKit/CodeComplete/complete_filter.swift +++ b/test/SourceKit/CodeComplete/complete_filter.swift @@ -52,14 +52,14 @@ func foo() { // RUN: %sourcekitd-test -req=complete.open -pos=11:5 \ // RUN: -req-opts=filtertext=d %s -- %s > %t.d -// RUN: %FileCheck -check-prefix=CHECKED %s < %t.d - -// CHECKED-NOT: key.name -// CHECKED: ], -// CHECKED-NEXT: key.kind: source.lang.swift.codecomplete.group -// CHECKED-NEXT: key.name: "" -// CHECKED-NEXT: key.nextrequeststart: 0 -// CHECKED-NEXT: } +// RUN: %FileCheck -check-prefix=CHECKD %s < %t.d + +// CHECKD-NOT: key.name +// CHECKD: ], +// CHECKD-NEXT: key.kind: source.lang.swift.codecomplete.group +// CHECKD-NEXT: key.name: "" +// CHECKD-NEXT: key.nextrequeststart: 0 +// CHECKD-NEXT: } // RUN: %complete-test -tok=FOO %s | %FileCheck %s diff --git a/test/SourceKit/CursorInfo/cursor_generated_interface.swift b/test/SourceKit/CursorInfo/cursor_generated_interface.swift index 8a6a26351fa63..81826a37c43c8 100644 --- a/test/SourceKit/CursorInfo/cursor_generated_interface.swift +++ b/test/SourceKit/CursorInfo/cursor_generated_interface.swift @@ -105,13 +105,13 @@ public class CType {} @interface DType @end -// RUN: %sourcekitd-test -req=interface-gen-open -module LibA -- -F %t/frameworks -target %target-triple == -req=cursor -pos=14:57 -print-raw-response | %FileCheck %s --check-prefix=CHECKED -// CHECKED: key.name: "DType" -// CHECKED: key.line: [[@LINE-5]] -// CHECKED: key.column: 12 -// CHECKED: key.filepath: {{.*}}LibD.h -// CHECKED: key.modulename: "LibD" -// CHECKED: key.decl_lang: source.lang.objc +// RUN: %sourcekitd-test -req=interface-gen-open -module LibA -- -F %t/frameworks -target %target-triple == -req=cursor -pos=14:57 -print-raw-response | %FileCheck %s --check-prefix=CHECKD +// CHECKD: key.name: "DType" +// CHECKD: key.line: [[@LINE-5]] +// CHECKD: key.column: 12 +// CHECKD: key.filepath: {{.*}}LibD.h +// CHECKD: key.modulename: "LibD" +// CHECKD: key.decl_lang: source.lang.objc //--- mods/module.map module LibD { From 64466cd8b87d6031f45546ae0eb9a8739c92e9f7 Mon Sep 17 00:00:00 2001 From: Alexander Cyon Date: Thu, 18 Jul 2024 08:11:33 +0200 Subject: [PATCH 9/9] Update error_swift_module.swift Co-authored-by: Alex Hoppen --- test/SourceKit/InterfaceGen/error_swift_module.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/SourceKit/InterfaceGen/error_swift_module.swift b/test/SourceKit/InterfaceGen/error_swift_module.swift index a01b42025a6fc..f8175d5767ebf 100644 --- a/test/SourceKit/InterfaceGen/error_swift_module.swift +++ b/test/SourceKit/InterfaceGen/error_swift_module.swift @@ -51,8 +51,8 @@ import NonExistent // DIRECT-NONEXISTENT: Could not load module: NonExistent // RUN: %target-swift-frontend -emit-module %t/Inputs/Transitive.swift -module-name NonExistent -o %t -// RUN: %target-swift-frontend -emit-module %t/Inputs/LibraryNonExistant.swift -module-name LibraryNonExistent -I %t -o %t -// RUN: rm -rf %t/NonExistant.swiftmodule +// RUN: %target-swift-frontend -emit-module %t/Inputs/LibraryNonExistent.swift -module-name LibraryNonExistent -I %t -o %t +// RUN: rm -rf %t/NonExistent.swiftmodule // RUN: not %sourcekitd-test -req=interface-gen -module LibraryNonExistent -- -I %t -target %target-triple %s 2>&1 | %FileCheck --check-prefix TRANSITIVE-NONEXISTENT %s // TRANSITIVE-NONEXISTENT: Could not load module: LibraryNonExistent (missing required module 'NonExistent')