Skip to content

Commit 793cddb

Browse files
hamishknighthamishknight
committed
Update to use --leading-lines for split-file 
1 parent fcd1783 commit 793cddb

File tree

4 files changed

+62
-69
lines changed

4 files changed

+62
-69
lines changed

‎test/SourceKit/CodeComplete/complete_docbrief_2.swift

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %empty-directory(%t/Modules)
3-
// RUN: split-file %s %t
3+
// RUN: split-file --leading-lines %s %t
44

55
// RUN: %target-swift-frontend \
66
// RUN: -emit-module \
@@ -24,24 +24,22 @@ struct S: P {
2424
}
2525

2626
func test() {
27+
// RUN: %sourcekitd-test -req=complete -pos=%(line+1):7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser | %FileCheck %s -check-prefix=CHECK
2728
S().
28-
}
29-
30-
// RUN: %sourcekitd-test -req=complete -pos=7:7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser | %FileCheck %s -check-prefix=CHECK
31-
32-
// CHECK: {
33-
// CHECK: key.results: [
34-
// CHECK-NEXT: {
35-
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
36-
// CHECK-NEXT: key.name: "foo()",
37-
// CHECK-NEXT: key.sourcetext: "foo()",
38-
// CHECK-NEXT: key.description: "foo()",
39-
// CHECK-NEXT: key.typename: "Void",
40-
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
41-
// CHECK-NEXT: key.context: source.codecompletion.context.thisclass,
42-
// CHECK-NEXT: key.typerelation: source.codecompletion.typerelation.unknown,
43-
// CHECK-NEXT: key.num_bytes_to_erase: 0,
44-
// CHECK-NEXT: key.associated_usrs: "s:12DocBriefUser1SV3fooyyF s:12DocBriefTest1PP3fooyyF",
45-
// CHECK-NEXT: key.modulename: "DocBriefUser"
46-
// CHECK-NEXT: }
4729

30+
// CHECK: {
31+
// CHECK: key.results: [
32+
// CHECK-NEXT: {
33+
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
34+
// CHECK-NEXT: key.name: "foo()",
35+
// CHECK-NEXT: key.sourcetext: "foo()",
36+
// CHECK-NEXT: key.description: "foo()",
37+
// CHECK-NEXT: key.typename: "Void",
38+
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
39+
// CHECK-NEXT: key.context: source.codecompletion.context.thisclass,
40+
// CHECK-NEXT: key.typerelation: source.codecompletion.typerelation.unknown,
41+
// CHECK-NEXT: key.num_bytes_to_erase: 0,
42+
// CHECK-NEXT: key.associated_usrs: "s:12DocBriefUser1SV3fooyyF s:12DocBriefTest1PP3fooyyF",
43+
// CHECK-NEXT: key.modulename: "DocBriefUser"
44+
// CHECK-NEXT: }
45+
}

‎test/SourceKit/CodeComplete/complete_docbrief_3.swift

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %empty-directory(%t/Modules)
3-
// RUN: split-file %s %t
3+
// RUN: split-file --leading-lines %s %t
44

55
// RUN: %target-swift-frontend \
66
// RUN: -emit-module \
@@ -25,24 +25,22 @@ public struct S: P {
2525
//--- User.swift
2626
import DocBriefTest
2727
func test() {
28+
// RUN: %sourcekitd-test -req=complete -pos=%(line+1):7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser | %FileCheck %s -check-prefix=CHECK
2829
S().foo()
29-
}
30-
31-
// RUN: %sourcekitd-test -req=complete -pos=3:7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser | %FileCheck %s -check-prefix=CHECK
32-
33-
// CHECK: {
34-
// CHECK: key.results: [
35-
// CHECK-NEXT: {
36-
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
37-
// CHECK-NEXT: key.name: "foo()",
38-
// CHECK-NEXT: key.sourcetext: "foo()",
39-
// CHECK-NEXT: key.description: "foo()",
40-
// CHECK-NEXT: key.typename: "Void",
41-
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
42-
// CHECK-NEXT: key.context: source.codecompletion.context.thisclass,
43-
// CHECK-NEXT: key.typerelation: source.codecompletion.typerelation.unknown,
44-
// CHECK-NEXT: key.num_bytes_to_erase: 0,
45-
// CHECK-NEXT: key.associated_usrs: "s:12DocBriefTest1SV3fooyyF s:12DocBriefTest1PP3fooyyF",
46-
// CHECK-NEXT: key.modulename: "DocBriefTest"
47-
// CHECK-NEXT: }
4830

31+
// CHECK: {
32+
// CHECK: key.results: [
33+
// CHECK-NEXT: {
34+
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
35+
// CHECK-NEXT: key.name: "foo()",
36+
// CHECK-NEXT: key.sourcetext: "foo()",
37+
// CHECK-NEXT: key.description: "foo()",
38+
// CHECK-NEXT: key.typename: "Void",
39+
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
40+
// CHECK-NEXT: key.context: source.codecompletion.context.thisclass,
41+
// CHECK-NEXT: key.typerelation: source.codecompletion.typerelation.unknown,
42+
// CHECK-NEXT: key.num_bytes_to_erase: 0,
43+
// CHECK-NEXT: key.associated_usrs: "s:12DocBriefTest1SV3fooyyF s:12DocBriefTest1PP3fooyyF",
44+
// CHECK-NEXT: key.modulename: "DocBriefTest"
45+
// CHECK-NEXT: }
46+
}

‎test/SourceKit/CodeComplete/complete_docbrief_package.swift

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %empty-directory(%t/Modules)
3-
// RUN: split-file %s %t
3+
// RUN: split-file --leading-lines %s %t
44

55
// RUN: %target-swift-frontend \
66
// RUN: -emit-module \
@@ -27,19 +27,17 @@ package struct S: P {
2727
package import DocBriefTest
2828

2929
func test() {
30+
// RUN: %sourcekitd-test -req=complete -pos=%(line+1):7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser -package-name DocPackage -enable-experimental-feature AccessLevelOnImport | %FileCheck %s -check-prefix=CHECK
3031
S().foo()
31-
}
32-
33-
// RUN: %sourcekitd-test -req=complete -pos=4:7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser -package-name DocPackage -enable-experimental-feature AccessLevelOnImport | %FileCheck %s -check-prefix=CHECK
34-
35-
// CHECK: {
36-
// CHECK: key.results: [
37-
// CHECK-NEXT: {
38-
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
39-
// CHECK-NEXT: key.name: "foo()",
40-
// CHECK-NEXT: key.sourcetext: "foo()",
41-
// CHECK-NEXT: key.description: "foo()",
42-
// CHECK-NEXT: key.typename: "Void",
43-
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
44-
// CHECK: }
4532

33+
// CHECK: {
34+
// CHECK: key.results: [
35+
// CHECK-NEXT: {
36+
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
37+
// CHECK-NEXT: key.name: "foo()",
38+
// CHECK-NEXT: key.sourcetext: "foo()",
39+
// CHECK-NEXT: key.description: "foo()",
40+
// CHECK-NEXT: key.typename: "Void",
41+
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
42+
// CHECK: }
43+
}

‎test/SourceKit/CodeComplete/complete_docbrief_spi.swift

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %empty-directory(%t/Modules)
3-
// RUN: split-file %s %t
3+
// RUN: split-file --leading-lines %s %t
44

55
// RUN: %target-swift-frontend \
66
// RUN: -emit-module \
@@ -28,18 +28,17 @@ public struct S: P {
2828
@_spi(SomeSPI) import DocBriefTest
2929

3030
func test() {
31+
// RUN: %sourcekitd-test -req=complete -pos=%(line+1):7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser | %FileCheck %s -check-prefix=CHECK
3132
S().foo()
32-
}
33-
34-
// RUN: %sourcekitd-test -req=complete -pos=4:7 %t/User.swift -- %t/User.swift -I %t/Modules -target %target-triple -module-name DocBriefUser | %FileCheck %s -check-prefix=CHECK
3533

36-
// CHECK: {
37-
// CHECK: key.results: [
38-
// CHECK-NEXT: {
39-
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
40-
// CHECK-NEXT: key.name: "foo()",
41-
// CHECK-NEXT: key.sourcetext: "foo()",
42-
// CHECK-NEXT: key.description: "foo()",
43-
// CHECK-NEXT: key.typename: "Void",
44-
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
45-
// CHECK: }
34+
// CHECK: {
35+
// CHECK: key.results: [
36+
// CHECK-NEXT: {
37+
// CHECK-NEXT: key.kind: source.lang.swift.decl.function.method.instance,
38+
// CHECK-NEXT: key.name: "foo()",
39+
// CHECK-NEXT: key.sourcetext: "foo()",
40+
// CHECK-NEXT: key.description: "foo()",
41+
// CHECK-NEXT: key.typename: "Void",
42+
// CHECK-NEXT: key.doc.brief: "This is a doc comment of P.foo",
43+
// CHECK: }
44+
}

0 commit comments

Comments
 (0)