Skip to content

Commit c6f709c

Browse files
authored
Merge pull request #1319 from ahoppen/ahoppen/with-not-by
Change 'by' -> 'with' in Fix-It messages
2 parents 044ec03 + a760a3d commit c6f709c

File tree

8 files changed

+35
-35
lines changed

8 files changed

+35
-35
lines changed

Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,10 @@ extension FixItMessage where Self == StaticParserFixIt {
475475
.init("remove operator body")
476476
}
477477
public static var replaceCurlyQuoteByNormalQuote: Self {
478-
.init(#"replace curly quotes by '"'"#)
478+
.init(#"replace curly quotes with '"'"#)
479479
}
480480
public static var replaceNonBreakingSpaceBySpace: Self {
481-
.init("replace non-breaking space by ' '")
481+
.init("replace non-breaking space with ' '")
482482
}
483483
public static var wrapInBackticks: Self {
484484
.init("if this name is unavoidable, use backticks to escape it")
@@ -548,6 +548,6 @@ public struct ReplaceTokensFixIt: ParserFixIt {
548548
public let replacement: TokenSyntax
549549

550550
public var message: String {
551-
"replace \(nodesDescription(replaceTokens, format: false)) by '\(replacement.text)'"
551+
"replace \(nodesDescription(replaceTokens, format: false)) with '\(replacement.text)'"
552552
}
553553
}

Tests/SwiftParserTest/ExpressionTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ final class ExpressionTests: XCTestCase {
641641
1️⃣'red'
642642
"""#,
643643
diagnostics: [
644-
DiagnosticSpec(message: #"Single-quoted string literal found, use '"'"#, fixIts: [#"replace ''' by '"'"#])
644+
DiagnosticSpec(message: #"Single-quoted string literal found, use '"'"#, fixIts: [#"replace ''' with '"'"#])
645645
],
646646
fixedSource: """
647647
"red"
@@ -653,7 +653,7 @@ final class ExpressionTests: XCTestCase {
653653
1️⃣' red ' + 1
654654
"""#,
655655
diagnostics: [
656-
DiagnosticSpec(message: #"Single-quoted string literal found, use '"'"#, fixIts: [#"replace ''' by '"'"#])
656+
DiagnosticSpec(message: #"Single-quoted string literal found, use '"'"#, fixIts: [#"replace ''' with '"'"#])
657657
],
658658
fixedSource: """
659659
" red " + 1
@@ -1158,7 +1158,7 @@ final class ExpressionTests: XCTestCase {
11581158
AssertParse(
11591159
"a 1️⃣\u{a0}+ 2",
11601160
diagnostics: [
1161-
DiagnosticSpec(message: "non-breaking space (U+00A0) used instead of regular space", severity: .warning, fixIts: ["replace non-breaking space by ' '"])
1161+
DiagnosticSpec(message: "non-breaking space (U+00A0) used instead of regular space", severity: .warning, fixIts: ["replace non-breaking space with ' '"])
11621162
],
11631163
fixedSource: "a + 2"
11641164
)

Tests/SwiftParserTest/translated/AvailabilityQueryTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ final class AvailabilityQueryTests: XCTestCase {
6565
}
6666
""",
6767
diagnostics: [
68-
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#unavailable'?", fixIts: ["replace '!#available' by '#unavailable'"])
68+
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#unavailable'?", fixIts: ["replace '!#available' with '#unavailable'"])
6969
],
7070
fixedSource: """
7171
if #unavailable(OSX 10.52, *) {
@@ -81,7 +81,7 @@ final class AvailabilityQueryTests: XCTestCase {
8181
}
8282
""",
8383
diagnostics: [
84-
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#unavailable'?", fixIts: ["replace '!#available' by '#unavailable'"])
84+
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#unavailable'?", fixIts: ["replace '!#available' with '#unavailable'"])
8585
]
8686
)
8787
}
@@ -93,7 +93,7 @@ final class AvailabilityQueryTests: XCTestCase {
9393
}
9494
""",
9595
diagnostics: [
96-
DiagnosticSpec(message: "expected ',' joining parts of a multi-clause condition", fixIts: ["replace '&&' by ','"])
96+
DiagnosticSpec(message: "expected ',' joining parts of a multi-clause condition", fixIts: ["replace '&&' with ','"])
9797
],
9898
fixedSource: """
9999
if #available(OSX 10.51, *) , #available(OSX 10.52, *) {
@@ -389,7 +389,7 @@ final class AvailabilityQueryTests: XCTestCase {
389389
}
390390
""",
391391
diagnostics: [
392-
DiagnosticSpec(message: "expected ',' joining platforms in availability condition", fixIts: ["replace '||' by ','"])
392+
DiagnosticSpec(message: "expected ',' joining platforms in availability condition", fixIts: ["replace '||' with ','"])
393393
],
394394
fixedSource: """
395395
if #available(OSX 10.51 , iOS 8.0) {

Tests/SwiftParserTest/translated/AvailabilityQueryUnavailabilityTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ final class AvailabilityQueryUnavailabilityTests: XCTestCase {
5050
}
5151
""",
5252
diagnostics: [
53-
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#available'?", fixIts: ["replace '!#unavailable' by '#available'"])
53+
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#available'?", fixIts: ["replace '!#unavailable' with '#available'"])
5454
],
5555
fixedSource: """
5656
if #available(OSX 10.52) {
@@ -66,7 +66,7 @@ final class AvailabilityQueryUnavailabilityTests: XCTestCase {
6666
}
6767
""",
6868
diagnostics: [
69-
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#available'?", fixIts: ["replace '!#unavailable' by '#available'"])
69+
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#available'?", fixIts: ["replace '!#unavailable' with '#available'"])
7070
]
7171
)
7272
}
@@ -78,7 +78,7 @@ final class AvailabilityQueryUnavailabilityTests: XCTestCase {
7878
}
7979
""",
8080
diagnostics: [
81-
DiagnosticSpec(message: "expected ',' joining parts of a multi-clause condition", fixIts: ["replace '&&' by ','"])
81+
DiagnosticSpec(message: "expected ',' joining parts of a multi-clause condition", fixIts: ["replace '&&' with ','"])
8282
]
8383
)
8484
}
@@ -471,7 +471,7 @@ final class AvailabilityQueryUnavailabilityTests: XCTestCase {
471471
}
472472
""",
473473
diagnostics: [
474-
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#unavailable'?", fixIts: ["replace '!#available' by '#unavailable'"])
474+
DiagnosticSpec(message: "availability condition cannot be used in an expression; did you mean '#unavailable'?", fixIts: ["replace '!#available' with '#unavailable'"])
475475
]
476476
)
477477
}

Tests/SwiftParserTest/translated/DiagnoseInitializerAsTypedPatternTests.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
2222
let a1️⃣:[X]()
2323
""",
2424
diagnostics: [
25-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
25+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
2626
],
2727
fixedSource: "let a=[X]()"
2828
)
@@ -34,7 +34,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
3434
let b1️⃣: [X]()
3535
""",
3636
diagnostics: [
37-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
37+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
3838
],
3939
fixedSource: "let b= [X]()"
4040
)
@@ -46,7 +46,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
4646
let c 1️⃣:[X]()
4747
""",
4848
diagnostics: [
49-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
49+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
5050
],
5151
fixedSource: "let c =[X]()"
5252
)
@@ -58,7 +58,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
5858
let d 1️⃣: [X]()
5959
""",
6060
diagnostics: [
61-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
61+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
6262
],
6363
fixedSource: "let d = [X]()"
6464
)
@@ -82,7 +82,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
8282
let f1️⃣:/*comment*/[X]()
8383
""",
8484
diagnostics: [
85-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
85+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
8686
],
8787
fixedSource: "let f=/*comment*/[X]()"
8888
)
@@ -94,7 +94,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
9494
let f/*comment*/1️⃣:[X]()
9595
""",
9696
diagnostics: [
97-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
97+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
9898
],
9999
fixedSource: "let f/*comment*/=[X]()"
100100
)
@@ -126,7 +126,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
126126
let g1️⃣: X(x)
127127
""",
128128
diagnostics: [
129-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
129+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
130130
]
131131
)
132132
}
@@ -137,7 +137,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
137137
let h1️⃣: X(x, y)
138138
""",
139139
diagnostics: [
140-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
140+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
141141
]
142142
)
143143
}
@@ -148,7 +148,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
148148
let i1️⃣: X() { foo() }
149149
""",
150150
diagnostics: [
151-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
151+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
152152
]
153153
)
154154
}
@@ -159,7 +159,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
159159
let j1️⃣: X(x) { foo() }
160160
""",
161161
diagnostics: [
162-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
162+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
163163
]
164164
)
165165
}
@@ -170,7 +170,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
170170
let k1️⃣: X(x, y) { foo() }
171171
""",
172172
diagnostics: [
173-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
173+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
174174
]
175175
)
176176
}
@@ -183,7 +183,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
183183
}
184184
""",
185185
diagnostics: [
186-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
186+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
187187
]
188188
)
189189
}
@@ -196,7 +196,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
196196
}
197197
""",
198198
diagnostics: [
199-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
199+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
200200
]
201201
)
202202
}
@@ -209,7 +209,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
209209
}
210210
""",
211211
diagnostics: [
212-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
212+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
213213
]
214214
)
215215
}
@@ -222,7 +222,7 @@ final class DiagnoseInitializerAsTypedPatternTests: XCTestCase {
222222
}
223223
""",
224224
diagnostics: [
225-
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' by '='"])
225+
DiagnosticSpec(message: "unexpected initializer in pattern; did you mean to use '='?", fixIts: ["replace ':' with '='"])
226226
]
227227
)
228228
}

Tests/SwiftParserTest/translated/ErrorsTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ final class ErrorsTests: XCTestCase {
323323
func fixitThrow0() 1️⃣throw {}
324324
""",
325325
diagnostics: [
326-
DiagnosticSpec(message: "expected throwing specifier; did you mean 'throws'?", fixIts: ["replace 'throw' by 'throws'"])
326+
DiagnosticSpec(message: "expected throwing specifier; did you mean 'throws'?", fixIts: ["replace 'throw' with 'throws'"])
327327
],
328328
fixedSource: """
329329
func fixitThrow0() throws {}
@@ -442,7 +442,7 @@ final class ErrorsTests: XCTestCase {
442442
func fixitAwait0() 1️⃣await { }
443443
""",
444444
diagnostics: [
445-
DiagnosticSpec(message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'await' by 'async'"])
445+
DiagnosticSpec(message: "expected async specifier; did you mean 'async'?", fixIts: ["replace 'await' with 'async'"])
446446
],
447447
fixedSource: """
448448
func fixitAwait0() async { }

Tests/SwiftParserTest/translated/InvalidTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ final class InvalidTests: XCTestCase {
525525
}
526526
""",
527527
diagnostics: [
528-
DiagnosticSpec(message: "'class' constraint can only appear on protocol declarations", fixIts: ["replace 'class' by 'AnyObject'"])
528+
DiagnosticSpec(message: "'class' constraint can only appear on protocol declarations", fixIts: ["replace 'class' with 'AnyObject'"])
529529
],
530530
fixedSource: """
531531
struct Weak<T: AnyObject> {

Tests/SwiftParserTest/translated/TypealiasTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ final class TypealiasTests: XCTestCase {
113113
typealias Recovery2 1️⃣:2️⃣
114114
""",
115115
diagnostics: [
116-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected '=' in typealias declaration", fixIts: ["replace ':' by '='"]),
116+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected '=' in typealias declaration", fixIts: ["replace ':' with '='"]),
117117
DiagnosticSpec(locationMarker: "2️⃣", message: "expected type in typealias declaration"),
118118
]
119119
)
@@ -136,7 +136,7 @@ final class TypealiasTests: XCTestCase {
136136
typealias Recovery4 1️⃣: Int
137137
""",
138138
diagnostics: [
139-
DiagnosticSpec(message: "expected '=' in typealias declaration", fixIts: ["replace ':' by '='"])
139+
DiagnosticSpec(message: "expected '=' in typealias declaration", fixIts: ["replace ':' with '='"])
140140
]
141141
)
142142
}
@@ -147,7 +147,7 @@ final class TypealiasTests: XCTestCase {
147147
typealias Recovery5 1️⃣: Int2️⃣, Float
148148
""",
149149
diagnostics: [
150-
DiagnosticSpec(locationMarker: "1️⃣", message: "expected '=' in typealias declaration", fixIts: ["replace ':' by '='"]),
150+
DiagnosticSpec(locationMarker: "1️⃣", message: "expected '=' in typealias declaration", fixIts: ["replace ':' with '='"]),
151151
DiagnosticSpec(locationMarker: "2️⃣", message: "extraneous code ', Float' at top level"),
152152
]
153153
)

0 commit comments

Comments
 (0)