Skip to content

Commit ffba6d1

Browse files
ahoppenahoppen
authored
Merge pull request #75026 from Sajjon/cyon_typo_batch__test__ide
2 parents 0c74fe6 + a80b8ae commit ffba6d1

30 files changed

+91
-91
lines changed

‎test/IDE/Inputs/foo_swift_module.printed.comments.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ enum MyQuickLookObject {
3939
}
4040
var globalVar: Int
4141
func hiddenImport()
42-
func overlayedFoo()
42+
func overlaidFoo()
4343
func visibleImport()
4444
precedencegroup High {
4545
associativity: left

‎test/IDE/Inputs/foo_swift_module.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal postfix func =->(lhs: Int) -> Int {
2020
public func visibleImport() {}
2121
public func hiddenImport() {}
2222

23-
public func overlayedFoo() {}
23+
public func overlaidFoo() {}
2424

2525
public var globalVar: Int = 0
2626

‎test/IDE/Inputs/foo_swift_module_overlay.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@_exported import FooSwiftModule
22

3-
public func overlayedFoo() {}
3+
public func overlaidFoo() {}
44
public func onlyInFooOverlay() {}
55

‎test/IDE/Inputs/mock-sdk/OverlayTest.framework/Headers/Overlaid.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
#ifndef OVERLAID_H
3+
#define OVERLAID_H
4+
5+
struct __attribute__((swift_name("Overlaid"))) OVOverlaid {
6+
double x, y, z;
7+
};
8+
9+
double OVOverlaidInOriginalFunc(struct OVOverlaid s) __attribute__((swift_name("Overlaid.inOriginalFunc(self:)")));
10+
11+
struct OVOverlaid createOverlaid();
12+
13+
#endif

‎test/IDE/Inputs/mock-sdk/OverlayTest.framework/Headers/OverlayTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#include <OverlayTest/Overlayed.h>
1+
#include <OverlayTest/Overlaid.h>
22

‎test/IDE/Inputs/mock-sdk/OverlayTest.framework/Headers/Overlayed.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎test/IDE/Inputs/mock-sdk/OverlayTest.swiftinterface

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
@_exported import OverlayTest
55

6-
public extension Overlayed {
6+
public extension Overlaid {
77
public func inOverlayFunc() {}
88
}
99

10-
public func createOverlayedInOverlay() -> Overlayed
10+
public func createOverlaidInOverlay() -> Overlaid

‎test/IDE/complete_accessor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ extension UNKNOWN_TYPE {
116116
get {}
117117
#^UNKNOWN_EXT_PROPERTY_SECOND?check=NO_GLOBAL;check=NO_SELF;check=WITH_GETSET;check=WITH_OBSERVER^#
118118
}
119-
subscript<T>(_1 index: T) -> T where T: ANOTHER_UNKNWON_TYPE {
119+
subscript<T>(_1 index: T) -> T where T: ANOTHER_UNKNOWN_TYPE {
120120
#^UNKNOWN_EXT_SUBSCRIPT_FIRST?check=WITH_GLOBAL;check=WITH_SELF;check=WITH_GETSET;check=NO_OBSERVER^#
121121
}
122122
subscript(_2 index: Int) -> String {

‎test/IDE/complete_attributes.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ struct MyValue {
2323
// MEMBER_MyValue-DAG: Decl[Constructor]/CurrNominal: init()[#MyValue#];
2424
// MEMBER_MyValue-DAG: Decl[StaticVar]/CurrNominal: val[#Int#];
2525

26-
class TestUnkownDanglingAttr1 {
27-
@UknownAttr(arg: MyValue.#^ATTRARG_MEMBER^#)
26+
class TestUnknownDanglingAttr1 {
27+
@UnknownAttr(arg: MyValue.#^ATTRARG_MEMBER^#)
2828
}
29-
class TestUnkownDanglingAttr2 {
30-
@UknownAttr(arg: { MyValue.#^ATTRARG_MEMBER_IN_CLOSURE^# })
29+
class TestUnknownDanglingAttr2 {
30+
@UnknownAttr(arg: { MyValue.#^ATTRARG_MEMBER_IN_CLOSURE^# })
3131
}

‎test/IDE/complete_call_arg.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ func testImplicitMemberInArrayLiteral() {
650650
struct Wrap<T> {
651651
func method<U>(_ fn: (T) -> U) -> Wrap<U> {}
652652
}
653-
func testGenricMethodOnGenericOfArchetype<Wrapped>(value: Wrap<Wrapped>) {
653+
func testGenericMethodOnGenericOfArchetype<Wrapped>(value: Wrap<Wrapped>) {
654654
value.method(#^ARCHETYPE_GENERIC_1^#)
655655
// ARCHETYPE_GENERIC_1: Decl[InstanceMethod]/CurrNominal/Flair[ArgLabels]: ['(']{#(fn): (Wrapped) -> U##(Wrapped) -> U#}[')'][#Wrap<U>#];
656656
}
@@ -780,7 +780,7 @@ func testAfterVariadic() {
780780
}
781781
}
782782

783-
func testClosurePlaceholderContainsInternalParameterNamesIfPresentInSiganture() {
783+
func testClosurePlaceholderContainsInternalParameterNamesIfPresentInSignature() {
784784
func sort(callback: (_ left: Int, _ right: Int) -> Bool) {}
785785
sort(#^CLOSURE_PARAM_WITH_INTERNAL_NAME^#)
786786
// CLOSURE_PARAM_WITH_INTERNAL_NAME: Begin completions, 1 item
@@ -1072,16 +1072,16 @@ func testArgsAfterCompletion() {
10721072
// INVALID_MISSINGCONFORMANCE-DAG: Pattern/Local/Flair[ArgLabels]: {#p: String#}[#String#]; name=p:
10731073
// INVALID_MISSINGCONFORMANCE-DAG: Pattern/Local/Flair[ArgLabels]: {#y: String#}[#String#]; name=y:
10741074

1075-
overloadedGeneric(x: 1, #^INVALID_MISSINGCONFORMANCE_NOCOMMA?check=INVALID_MISSINGCONFORMANCE^# z: MisingConformance(), zz: MissingConformance())
1075+
overloadedGeneric(x: 1, #^INVALID_MISSINGCONFORMANCE_NOCOMMA?check=INVALID_MISSINGCONFORMANCE^# z: MissingConformance(), zz: MissingConformance())
10761076
overloadedGeneric(x: 1, #^INVALID_MISSINGCONFORMANCE_INDIRECT?check=INVALID_MISSINGCONFORMANCE^#, z: [MissingConformance()], zz: [MissingConformance()])
1077-
overloadedGeneric(x: 1, #^INVALID_MISSINGCONFORMANCE_CONSTRAINT?check=INVALID_MISSINGCONFORMANCE_CONSTAINT^#, z: [CondConfType("foo")], zz: [CondConfType("bar")])
1078-
SubOverloadedGeneric()[x: 1, #^INVALID_MISSINGCONFORMANCE_NOCOMMA_SUB?check=INVALID_MISSINGCONFORMANCE^# z: MisingConformance(), zz: MissingConformance()]
1077+
overloadedGeneric(x: 1, #^INVALID_MISSINGCONFORMANCE_CONSTRAINT?check=INVALID_MISSINGCONFORMANCE_CONSTRAINT^#, z: [CondConfType("foo")], zz: [CondConfType("bar")])
1078+
SubOverloadedGeneric()[x: 1, #^INVALID_MISSINGCONFORMANCE_NOCOMMA_SUB?check=INVALID_MISSINGCONFORMANCE^# z: MissingConformance(), zz: MissingConformance()]
10791079
SubOverloadedGeneric()[x: 1, #^INVALID_MISSINGCONFORMANCE_INDIRECT_SUB?check=INVALID_MISSINGCONFORMANCE^#, z: [MissingConformance()], zz: [MissingConformance()]]
1080-
SubOverloadedGeneric()[x: 1, #^INVALID_MISSINGCONFORMANCE_CONSTRAINT_SUB?check=INVALID_MISSINGCONFORMANCE_CONSTAINT^#, z: [CondConfType("foo")], zz: [CondConfType("bar")]]
1080+
SubOverloadedGeneric()[x: 1, #^INVALID_MISSINGCONFORMANCE_CONSTRAINT_SUB?check=INVALID_MISSINGCONFORMANCE_CONSTRAINT^#, z: [CondConfType("foo")], zz: [CondConfType("bar")]]
10811081

1082-
// INVALID_MISSINGCONFORMANCE_CONSTAINT: Begin completions, 2 items
1083-
// INVALID_MISSINGCONFORMANCE_CONSTAINT-DAG: Pattern/Local/Flair[ArgLabels]: {#y: String#}[#String#]; name=y:
1084-
// INVALID_MISSINGCONFORMANCE_CONSTAINT-DAG: Pattern/Local/Flair[ArgLabels]: {#p: String#}[#String#]; name=p:
1082+
// INVALID_MISSINGCONFORMANCE_CONSTRAINT: Begin completions, 2 items
1083+
// INVALID_MISSINGCONFORMANCE_CONSTRAINT-DAG: Pattern/Local/Flair[ArgLabels]: {#y: String#}[#String#]; name=y:
1084+
// INVALID_MISSINGCONFORMANCE_CONSTRAINT-DAG: Pattern/Local/Flair[ArgLabels]: {#p: String#}[#String#]; name=p:
10851085
}
10861086

10871087
func testFuncTyVars(param: (Int, String, Double) -> ()) {

‎test/IDE/complete_call_pattern.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ struct FooStruct {
1010
func testInsideFunctionCall_1(_ x: inout FooStruct) {
1111
x.instanceFunc(#^BEFORE_COMMA^#,
1212
// BEFORE_COMMA-NOT: Pattern/{{.*}}:{{.*}}({{.*}}{#Int#}
13-
// BOFORE_COMMA-NOT: Decl[InstanceMethod]/{{.*}}:{{.*}}({{.*}}{#Int#}
13+
// BEFORE_COMMA-NOT: Decl[InstanceMethod]/{{.*}}:{{.*}}({{.*}}{#Int#}
1414
}
1515
func testInsideFunctionCall_2(_ x: inout FooStruct) {
1616
x.instanceFunc(#^BEFORE_PLACEHOLDER^#<#placeholder#>
1717
// BEFORE_PLACEHOLDER-NOT: Pattern/{{.*}}:{{.*}}({{.*}}{#Int#}
18-
// BOFORE_PLACEHOLDER-NOT: Decl[InstanceMethod]/{{.*}}:{{.*}}({{.*}}{#Int#}
18+
// BEFORE_PLACEHOLDER-NOT: Decl[InstanceMethod]/{{.*}}:{{.*}}({{.*}}{#Int#}
1919
}
2020
func testConstructor() {
2121
FooStruct(#^CONSTRUCTOR^#,
22-
// CONSTURCTOR: Begin completions, 3 items
22+
// CONSTRUCTOR: Begin completions, 3 items
2323
// CONSTRUCTOR-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['('][')'][#FooStruct#];
2424
// CONSTRUCTOR-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#a: Int#}[')'][#FooStruct#];
2525
// CONSTRUCTOR-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#a: Int#}, {#b: Float#}[')'][#FooStruct#];

‎test/IDE/complete_concurrency_specifier.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ func testSpecifierWithAsync() async #^SPECIFIER_WITHASYNC^#
2020
func testSpecifierWithThrows() throws #^SPECIFIER_WITHTHROWS^#
2121
func testSpecifierWithAsyncThorws() async throws #^SPECIFIER_WITHASYNCTHROWS^#
2222

23-
func testTypeSpecifier(_: () #^TYPE_SPECIFICER?check=SPECIFIER^#) {}
24-
func testTypeSpecifierWithAsync(_: () async #^TYPE_SPECIFICER_WITHASYNC?check=SPECIFIER_WITHASYNC^#) {}
25-
func testTypeSpecifierWithThrows(_: () throws #^TYPE_SPECIFICER_WITHTHROWS?check=SPECIFIER_WITHTHROWS^#) {}
26-
func testTypeSpecifierWithAsyncThrows(_: () async throws #^TYPE_SPECIFICER_WITHASYNCTHROWS?check=SPECIFIER_WITHASYNCTHROWS^#) {}
27-
func testTypeSpecifierWithArrow(_: () #^TYPE_SPECIFICER_WITHARROW?check=SPECIFIER^#) {}
28-
func testTypeSpecifierWithAsyncArrow(_: () async #^TYPE_SPECIFICER_WITHASYNCARROW?check=SPECIFIER_WITHASYNC^# -> Void) {}
29-
func testTypeSpecifierWithThrowsArrow(_: () throws #^TYPE_SPECIFICER_WITHTHROWSARROW?check=SPECIFIER_WITHTHROWS^# -> Void
30-
func testTypeSpecifierWithAsyncThrowsArrow(_: () async throws #^TYPE_SPECIFICER_WITHASYNCTHROWSARROW?check=SPECIFIER_WITHASYNCTHROWS^# -> Void) {}
23+
func testTypeSpecifier(_: () #^TYPE_SPECIFIER?check=SPECIFIER^#) {}
24+
func testTypeSpecifierWithAsync(_: () async #^TYPE_SPECIFIER_WITHASYNC?check=SPECIFIER_WITHASYNC^#) {}
25+
func testTypeSpecifierWithThrows(_: () throws #^TYPE_SPECIFIER_WITHTHROWS?check=SPECIFIER_WITHTHROWS^#) {}
26+
func testTypeSpecifierWithAsyncThrows(_: () async throws #^TYPE_SPECIFIER_WITHASYNCTHROWS?check=SPECIFIER_WITHASYNCTHROWS^#) {}
27+
func testTypeSpecifierWithArrow(_: () #^TYPE_SPECIFIER_WITHARROW?check=SPECIFIER^#) {}
28+
func testTypeSpecifierWithAsyncArrow(_: () async #^TYPE_SPECIFIER_WITHASYNCARROW?check=SPECIFIER_WITHASYNC^# -> Void) {}
29+
func testTypeSpecifierWithThrowsArrow(_: () throws #^TYPE_SPECIFIER_WITHTHROWSARROW?check=SPECIFIER_WITHTHROWS^# -> Void
30+
func testTypeSpecifierWithAsyncThrowsArrow(_: () async throws #^TYPE_SPECIFIER_WITHASYNCTHROWSARROW?check=SPECIFIER_WITHASYNCTHROWS^# -> Void) {}
3131

3232
_ = { () #^CLOSURE?check=SPECIFIER^# in }
3333
_ = { () async #^CLOSURE_WITHASYNC?check=SPECIFIER_WITHASYNC^# in }

‎test/IDE/complete_constrained.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func testVegetarian(chef: Chef<Vegetarian>) {
126126
let _ = chefMeta.init(.#^CONDITIONAL_OVERLOAD_INIT_ARG^#)
127127

128128
chef.eat(.#^CONDITIONAL_INAPPLICABLE_ARG^#)
129-
// Note: 'eat' is from an inapplicable constrained extension. We complete as if the user intends to addess that later
129+
// Note: 'eat' is from an inapplicable constrained extension. We complete as if the user intends to address that later
130130
// (e.g. by adding the missing 'Meat' conformance to 'Vegetarian' - clearly not the intention here - but replace 'Meat' with 'Equatable').
131131
// CONDITIONAL_INAPPLICABLE_ARG: Begin completions, 2 items
132132
// CONDITIONAL_INAPPLICABLE_ARG-DAG: Decl[EnumElement]/CurrNominal/Flair[ExprSpecific]/TypeRelation[Convertible]: chicken[#Meat#]; name=chicken

‎test/IDE/complete_constructor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func testHaveComma1() {
233233
ExplicitConstructors1(#^HAVE_COMMA_1?check=EXPLICIT_CONSTRUCTORS_1P^#,
234234
}
235235

236-
//===--- Test that we show default constuctors inherited from protocols
236+
//===--- Test that we show default constructors inherited from protocols
237237

238238
protocol ProtDefaultInit {}
239239
extension ProtDefaultInit { init(foo: Int) {}}

‎test/IDE/complete_crossmodule.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
// BEGIN MyModule.swift
88

99
public protocol HasAssocWithConstraint {
10-
associatedtype AssocWithContraint: HasAssocWithConstraint
11-
var value: AssocWithContraint { get }
10+
associatedtype AssocWithConstraint: HasAssocWithConstraint
11+
var value: AssocWithConstraint { get }
1212
}
1313

1414
// BEGIN Test.swift

‎test/IDE/complete_decl_attribute.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ actor MyGlobalActor {
5454

5555
@globalActor
5656
actor MyGenericGlobalActor<T> {
57-
static let shared = MyGenricGlobalActor<T>()
57+
static let shared = MyGenericGlobalActor<T>()
5858
}
5959

6060
@available(#^AVAILABILITY1^#)

‎test/IDE/complete_expr_after_paren.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MyClass: Base, MyProtocol {
3434
override func method(method4: Int) {}
3535
}
3636

37-
func testConstructer() {
37+
func testConstructor() {
3838
MyClass(#^INITIALIZER^#)
3939
// INITIALIZER: Begin completions, 4 items
4040
// INITIALIZER-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#init1: Int#}[')'][#MyClass#];

‎test/IDE/complete_from_reexport.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
// RUN: %FileCheck %s -check-prefix=TOP_LEVEL_1 < %t.txt
88
// RUN: %FileCheck %s -check-prefix=NO_DUPLICATES < %t.txt
99

10-
// TOP_LEVEL_1-DAG: Decl[FreeFunction]/OtherModule[FooSwiftModuleOverlay]: overlayedFoo()[#Void#]{{; name=.+$}}
10+
// TOP_LEVEL_1-DAG: Decl[FreeFunction]/OtherModule[FooSwiftModuleOverlay]: overlaidFoo()[#Void#]{{; name=.+$}}
1111
// TOP_LEVEL_1-DAG: Decl[FreeFunction]/OtherModule[FooSwiftModuleOverlay]: onlyInFooOverlay()[#Void#]{{; name=.+$}}
1212

1313
// FIXME: there should be only one instance of this completion result.
14-
// NO_DUPLICATES: overlayedFoo()[#Void#]{{; name=.+$}}
15-
// NO_DUPLICATES: overlayedFoo()[#Void#]{{; name=.+$}}
16-
// NO_DUPLICATES-NOT: overlayedFoo()[#Void#]{{; name=.+$}}
14+
// NO_DUPLICATES: overlaidFoo()[#Void#]{{; name=.+$}}
15+
// NO_DUPLICATES: overlaidFoo()[#Void#]{{; name=.+$}}
16+
// NO_DUPLICATES-NOT: overlaidFoo()[#Void#]{{; name=.+$}}
1717

1818
import FooSwiftModuleOverlay
1919

‎test/IDE/complete_from_swift_module.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
// rdar://15305873 Code completion: implement proper shadowing of declarations represented by cached results
5454
// FIXME: %FileCheck %s -check-prefix=TOP_LEVEL_1_NEGATIVE < %t.compl.txt
5555

56-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=AMBIGOUS_RESULT_BUILER > %t.compl.txt
57-
// RUN: %FileCheck %s -check-prefix=AMBIGOUS_RESULT_BUILER < %t.compl.txt
56+
// RUN: %target-swift-ide-test -code-completion -source-filename %s -I %t -code-completion-token=AMBIGUOUS_RESULT_BUILER > %t.compl.txt
57+
// RUN: %FileCheck %s -check-prefix=AMBIGUOUS_RESULT_BUILER < %t.compl.txt
5858

5959
// ERROR_COMMON: found code completion token
6060

@@ -158,11 +158,11 @@ func testAmbiguousResultBuilder() {
158158

159159
func test() {
160160
Foo {
161-
#^AMBIGOUS_RESULT_BUILER^#
161+
#^AMBIGUOUS_RESULT_BUILER^#
162162
}
163163
// Results should only contain globalVar once
164-
// AMBIGOUS_RESULT_BUILER-NOT: globalVar
165-
// AMBIGOUS_RESULT_BUILER-DAG: Decl[GlobalVar]/OtherModule[foo_swift_module]/TypeRelation[Convertible]: globalVar[#Int#]; name=globalVar
166-
// AMBIGOUS_RESULT_BUILER-NOT: globalVar
164+
// AMBIGUOUS_RESULT_BUILER-NOT: globalVar
165+
// AMBIGUOUS_RESULT_BUILER-DAG: Decl[GlobalVar]/OtherModule[foo_swift_module]/TypeRelation[Convertible]: globalVar[#Int#]; name=globalVar
166+
// AMBIGUOUS_RESULT_BUILER-NOT: globalVar
167167
}
168168
}

‎test/IDE/complete_in_closures.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %batch-code-completion
22

3-
// EMTPY: Token
3+
// EMPTY: Token
44
// EMPTY-NOT: Begin completions
55

66
//===--- Helper types that are used in this test
@@ -385,11 +385,11 @@ func testClosureInPatternBindingInit() {
385385
case dragging(translation: Int, predictedLocation: Int)
386386
}
387387

388-
func pnChanged(_ action: () -> Void) {}
388+
func onChanged(_ action: () -> Void) {}
389389

390390
func foo() {
391391
var gestureViewState: DragState = .dragging(translation: 0, predictedLocation: 0)
392-
let longPressDrag = pnChanged {
392+
let longPressDrag = onChanged {
393393
_ = 1
394394
gestureViewState = .dragging(translation: 0, #^CLOSURE_IN_PATTERN_BINDING^#predictedLocation: 0)
395395
}

‎test/IDE/complete_inout.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct Foo {
99
var myInt: Int
1010

1111
func bar() {
12-
let context = Bar(wihtInout: &self.#^COMPLETE_INOUT?check=CHECK^#)
12+
let context = Bar(withInout: &self.#^COMPLETE_INOUT?check=CHECK^#)
1313
let context = Bar(withPointer: &self.#^COMPLETE_POINTER?check=CHECK^#)
1414
}
1515
}

‎test/IDE/complete_multiple_trailingclosure_signatures.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func test() {
2525
// GLOBALFUNC_SAMELINE-DAG: Pattern/Local/Flair[ArgLabels]: {#fn8: (Int...) -> Void {<#Int...#> in|}#}[#(Int...) -> Void#];
2626
}
2727

28-
func testStringAndMulipleTrailingClosures() {
28+
func testStringAndMultipleTrailingClosures() {
2929
func stringAndClosure(_ key: String, _ body: () -> Void) {}
3030

3131
func takeClosure(_ x: () -> Void) {}

‎test/IDE/complete_opaque_result.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// RUN: %batch-code-completion
22

33
protocol MyProtocol {
4-
associatedtype Mistery
4+
associatedtype Mystery
55
}
66
struct MyStruct {}
77
enum MyEnum {}
88
class MyClass {}
99
struct ConcreteMyProtocol : MyProtocol {
10-
typealias Mistery = MyStruct
10+
typealias Mystery = MyStruct
1111
}
1212

1313
// MARK: 'some' keyword.
@@ -19,7 +19,7 @@ struct ConcreteMyProtocol : MyProtocol {
1919
// BEGINNING_WITH_SOME-DAG: Decl[Protocol]/CurrModule: MyProtocol[#MyProtocol#]; name=MyProtocol
2020
// BEGINNING_WITH_SOME-DAG: Decl[Struct]/CurrModule: MyStruct[#MyStruct#]; name=MyStruct
2121

22-
func gloabalFunc() -> #^GLOBAL_FUNC?check=BEGINNING_WITH_SOME^#
22+
func globalFunc() -> #^GLOBAL_FUNC?check=BEGINNING_WITH_SOME^#
2323
var globalVar: #^GLOBAL_VAR?check=BEGINNING_WITH_SOME^#
2424

2525
protocol SomeProto {
@@ -129,7 +129,7 @@ class HasTypealias : HasAssocWithConformanceConstraint {
129129
// OVERRIDE_HasTypealias-DAG: Decl[InstanceMethod]/Super: func returnAssocWithConformanceConstraint(fn: (Int) -> Int) -> ConcreteMyProtocol {|};
130130
}
131131

132-
// MARK: Postfix expession for opaque result types.
132+
// MARK: Postfix expression for opaque result types.
133133

134134
protocol TestProtocol {
135135
associatedtype Assoc1

‎test/IDE/complete_overlaymodule.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ func testGlobalType() {
99
// TYPE_GLOBAL-NOT: OverlayTest[#Module#]
1010
// TYPE_GLOBAL-DAG: Decl[Module]/None: OverlayTest[#Module#];
1111
// TYPE_GLOBAL-NOT: OverlayTest[#Module#]
12-
// TYPE_GLOBAL-DAG: Decl[Struct]/OtherModule[OverlayTest.Overlayed]: Overlayed[#Overlayed#];
12+
// TYPE_GLOBAL-DAG: Decl[Struct]/OtherModule[OverlayTest.Overlaid]: Overlaid[#Overlaid#];
1313
}
1414
func testGlobalExpr() {
1515
let _ = #^EXPR_GLOBAL^#
1616
// EXPR_GLOBAL-NOT: OverlayTest[#Module#]
1717
// EXPR_GLOBAL-DAG: Decl[Module]/None: OverlayTest[#Module#];
1818
// EXPR_GLOBAL-NOT: OverlayTest[#Module#]
19-
// EXPR_GLOBAL-DAG: Decl[Struct]/OtherModule[OverlayTest.Overlayed]: Overlayed[#Overlayed#];
20-
// EXPR_GLOBAL-DAG: Decl[FreeFunction]/OtherModule[OverlayTest]: createOverlayedInOverlay()[#Overlayed#];
21-
// EXPR_GLOBAL-DAG: Decl[FreeFunction]/OtherModule[OverlayTest.Overlayed]: createOverlayed()[#Overlayed#];
19+
// EXPR_GLOBAL-DAG: Decl[Struct]/OtherModule[OverlayTest.Overlaid]: Overlaid[#Overlaid#];
20+
// EXPR_GLOBAL-DAG: Decl[FreeFunction]/OtherModule[OverlayTest]: createOverlaidInOverlay()[#Overlaid#];
21+
// EXPR_GLOBAL-DAG: Decl[FreeFunction]/OtherModule[OverlayTest.Overlaid]: createOverlaid()[#Overlaid#];
2222
}
23-
func testGlobalExpr(value: Overlayed) {
23+
func testGlobalExpr(value: Overlaid) {
2424
value.#^EXPR_MEMBER^#
2525
// EXPR_MEMBER: Begin completions, 6 items
26-
// EXPR_MEMBER-DAG: Keyword[self]/CurrNominal: self[#Overlayed#]; name=self
26+
// EXPR_MEMBER-DAG: Keyword[self]/CurrNominal: self[#Overlaid#]; name=self
2727
// EXPR_MEMBER-DAG: Decl[InstanceVar]/CurrNominal: x[#Double#]; name=x
2828
// EXPR_MEMBER-DAG: Decl[InstanceVar]/CurrNominal: y[#Double#]; name=y
2929
// EXPR_MEMBER-DAG: Decl[InstanceVar]/CurrNominal: z[#Double#]; name=z

‎test/IDE/complete_shadowing.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ var globalTest: Int = 1
151151
func test_Global_Local() {
152152
var globalTest: String = ""
153153
#^Global_Local^#
154-
// FIXME: currently global varialbles are suggested despite they are shadowed.
154+
// FIXME: currently global variables are suggested despite they are shadowed.
155155
// Ideally they should be suggested with the qualification (i.e. 'ModuleName.globalTest')
156156
// Global_Local-DAG: Decl[LocalVar]/Local: globalTest[#String#]; name=globalTest
157157
// Global_Local-DAG: Decl[GlobalVar]/CurrModule: globalTest[#Int#]; name=globalTest
@@ -257,7 +257,7 @@ struct test_InheritedMemberProtoExt_Member: ProtoWithIntTestValueExt {
257257
}
258258
}
259259

260-
protocol ClassWitnIntTestValue {
260+
protocol ClassWithIntTestValue {
261261
var testValue: Int { 1 }
262262
}
263263
struct test_InheritedMemberSuper_Member: ClassWithIntTestValue {

0 commit comments

Comments
 (0)