Skip to content

Commit 4a590ce

Browse files
committed
Add missing ? in “did you mean …” diagnostics
1 parent 69d1060 commit 4a590ce

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ ERROR(could_not_find_subscript_member_did_you_mean,none,
107107
(Type))
108108

109109
ERROR(could_not_find_enum_case,none,
110-
"enum type %0 has no case %1; did you mean %2",
110+
"enum type %0 has no case %1; did you mean %2?",
111111
(Type, DeclNameRef, DeclName))
112112

113113
NOTE(did_you_mean_raw_type,none,
@@ -951,7 +951,7 @@ NOTE(in_cast_expr_types,none,
951951
(Type, Type))
952952

953953
ERROR(types_not_convertible_use_bool_value,none,
954-
"%0 is not convertible to %1; did you mean %0.boolValue", (Type, Type))
954+
"%0 is not convertible to %1; did you mean %0.boolValue?", (Type, Type))
955955

956956
ERROR(tuple_types_not_convertible_nelts,none,
957957
"%0 is not convertible to %1, "

test/Constraints/diagnostics.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,8 +529,8 @@ let _: Color = .frob(1, b: i) // expected-error {{passing value of type 'Int' t
529529
let _: Color = .frob(1, &d) // expected-error {{missing argument label 'b:' in call}}
530530
// expected-error@-1 {{cannot convert value of type 'Double' to expected argument type 'Int'}}
531531
let _: Color = .frob(1, b: &d) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
532-
var someColor : Color = .red // expected-error {{enum type 'Color' has no case 'red'; did you mean 'Red'}}
533-
someColor = .red // expected-error {{enum type 'Color' has no case 'red'; did you mean 'Red'}}
532+
var someColor : Color = .red // expected-error {{enum type 'Color' has no case 'red'; did you mean 'Red'?}}
533+
someColor = .red // expected-error {{enum type 'Color' has no case 'red'; did you mean 'Red'?}}
534534
someColor = .svar() // expected-error {{cannot call value of non-function type 'Color'}}
535535
someColor = .svar(1) // expected-error {{cannot call value of non-function type 'Color'}}
536536

test/Constraints/enum_cases.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func rdar34583132() {
121121

122122
func bar(_ s: S) {
123123
guard s.foo(1 + 2) == .timeout else {
124-
// expected-error@-1 {{enum type 'E' has no case 'timeout'; did you mean 'timeOut'}}
124+
// expected-error@-1 {{enum type 'E' has no case 'timeout'; did you mean 'timeOut'?}}
125125
fatalError()
126126
}
127127
}

test/Constraints/keyword_arguments.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,14 @@ func trailingClosure6<T>(value: Int, expression: () -> T?) { }
349349
trailingClosure5(file: "hello", line: 17) { // expected-error{{extraneous argument label 'file:' in call}}{{18-24=}}
350350
// expected-error@-1 {{generic parameter 'T' could not be inferred}}
351351
return Optional.Some(5)
352-
// expected-error@-1 {{enum type 'Optional<Wrapped>' has no case 'Some'; did you mean 'some'}} {{19-23=some}}
352+
// expected-error@-1 {{enum type 'Optional<Wrapped>' has no case 'Some'; did you mean 'some'?}} {{19-23=some}}
353353
// expected-error@-2 {{generic parameter 'Wrapped' could not be inferred}}
354354
// expected-note@-3 {{explicitly specify the generic arguments to fix this issue}}
355355
}
356356
trailingClosure6(5) { // expected-error{{missing argument label 'value:' in call}}{{18-18=value: }}
357357
// expected-error@-1 {{generic parameter 'T' could not be inferred}}
358358
return Optional.Some(5)
359-
// expected-error@-1 {{enum type 'Optional<Wrapped>' has no case 'Some'; did you mean 'some'}} {{19-23=some}}
359+
// expected-error@-1 {{enum type 'Optional<Wrapped>' has no case 'Some'; did you mean 'some'?}} {{19-23=some}}
360360
// expected-error@-2 {{generic parameter 'Wrapped' could not be inferred}}
361361
// expected-note@-3 {{explicitly specify the generic arguments to fix this issue}}
362362
}

test/NameBinding/name_lookup.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,9 @@ default:
553553
}
554554

555555
func foo() {
556-
_ = MyEnum.One // expected-error {{enum type 'MyEnum' has no case 'One'; did you mean 'one'}}{{14-17=one}}
557-
_ = MyEnum.Two // expected-error {{enum type 'MyEnum' has no case 'Two'; did you mean 'two'}}{{14-17=two}}
558-
_ = MyEnum.OneTwoThree // expected-error {{enum type 'MyEnum' has no case 'OneTwoThree'; did you mean 'oneTwoThree'}}{{14-25=oneTwoThree}}
556+
_ = MyEnum.One // expected-error {{enum type 'MyEnum' has no case 'One'; did you mean 'one'?}}{{14-17=one}}
557+
_ = MyEnum.Two // expected-error {{enum type 'MyEnum' has no case 'Two'; did you mean 'two'?}}{{14-17=two}}
558+
_ = MyEnum.OneTwoThree // expected-error {{enum type 'MyEnum' has no case 'OneTwoThree'; did you mean 'oneTwoThree'?}}{{14-25=oneTwoThree}}
559559
}
560560

561561
enum MyGenericEnum<T> {
@@ -564,8 +564,8 @@ enum MyGenericEnum<T> {
564564
}
565565

566566
func foo1() {
567-
_ = MyGenericEnum<Int>.One // expected-error {{enum type 'MyGenericEnum<Int>' has no case 'One'; did you mean 'one'}}{{26-29=one}}
568-
_ = MyGenericEnum<Int>.OneTwo // expected-error {{enum type 'MyGenericEnum<Int>' has no case 'OneTwo'; did you mean 'oneTwo'}}{{26-32=oneTwo}}
567+
_ = MyGenericEnum<Int>.One // expected-error {{enum type 'MyGenericEnum<Int>' has no case 'One'; did you mean 'one'?}}{{26-29=one}}
568+
_ = MyGenericEnum<Int>.OneTwo // expected-error {{enum type 'MyGenericEnum<Int>' has no case 'OneTwo'; did you mean 'oneTwo'?}}{{26-32=oneTwo}}
569569
}
570570

571571
// SR-4082

0 commit comments

Comments
 (0)