Skip to content

Commit 848a7f0

Browse files
committed
Rename compositeName to equivalentNames in NameExpectation.
1 parent f4164d0 commit 848a7f0

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Tests/SwiftLexicalLookupTest/ExpectedName.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ enum NameExpectation: ExpectedName {
6363
case declaration(String)
6464
case implicit(ImplicitNameExpectation)
6565
case dollarIdentifier(String, String)
66-
case compositeName([NameExpectation])
66+
case equivalentNames([NameExpectation])
6767

6868
var marker: [String] {
6969
switch self {
@@ -73,7 +73,7 @@ enum NameExpectation: ExpectedName {
7373
return [marker]
7474
case .implicit(let implicitName):
7575
return [implicitName.marker]
76-
case .compositeName(let expectedNames):
76+
case .equivalentNames(let expectedNames):
7777
return
7878
expectedNames
7979
.flatMap { expectedName in
@@ -93,7 +93,7 @@ enum NameExpectation: ExpectedName {
9393
actualStr == expectedStr,
9494
"For marker \(marker), actual identifier \(actualStr) doesn't match expected \(expectedStr)"
9595
)
96-
case (.equivalentNames(let actualNames), .compositeName(let expectedNames)):
96+
case (.equivalentNames(let actualNames), .equivalentNames(let expectedNames)):
9797
XCTAssert(
9898
actualNames.count == expectedNames.count,
9999
"For marker \(marker), actual composite name count \(actualNames.count) doesn't match expected \(expectedNames.count)"

Tests/SwiftLexicalLookupTest/NameLookupTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,15 +827,15 @@ final class testNameLookup: XCTestCase {
827827
.fromScope(
828828
SwitchCaseSyntax.self,
829829
expectedNames: [
830-
NameExpectation.compositeName([.identifier("1️⃣"), .identifier("3️⃣")]),
831-
NameExpectation.compositeName([.identifier("2️⃣"), .identifier("4️⃣")]),
830+
NameExpectation.equivalentNames([.identifier("1️⃣"), .identifier("3️⃣")]),
831+
NameExpectation.equivalentNames([.identifier("2️⃣"), .identifier("4️⃣")]),
832832
]
833833
)
834834
],
835835
"9️⃣": [
836836
.fromScope(
837837
SwitchCaseSyntax.self,
838-
expectedNames: [NameExpectation.compositeName([.identifier("7️⃣"), .identifier("8️⃣")])]
838+
expectedNames: [NameExpectation.equivalentNames([.identifier("7️⃣"), .identifier("8️⃣")])]
839839
)
840840
],
841841
],

0 commit comments

Comments
 (0)