[tests] Adjusting SR-11535 test case on the suit

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -7183,9 +7183,9 @@ static bool attemptUnresolvedMemberFix(ConstraintSystem &cs,
     return false;
 
   // Right now, name lookup only unwraps a single layer of optionality, which
-  // for cases where base type is a multi-optional type e.g. Foo?? so, it only
-  // finds optional base candidates. To produce the correct warning perform an
-  // extra lookup on unwrapped type is required.
+  // for cases where base type is a multi-optional type e.g. Foo?? it only
+  // finds optional base candidates. To produce the correct warning we perform
+  // an extra lookup on unwrapped type.
   if (!allOptionalBaseCandidates)
     return true;
 

test/decl/enum/enumtest.swift

@@ -511,9 +511,23 @@ let _: GenericEnumWithStaticNone<Int>? = .none // expected-warning {{assuming yo
 // expected-note@-2 {{use 'GenericEnumWithStaticNone<Int>.none' instead}}{{42-42=GenericEnumWithStaticNone<Int>}}
 let _: GenericEnumWithStaticNone<String>? = .none // Okay
 
-let _: GenericEnumWithStaticNone? = .none // Okay
-// Base can only be inferred as static member `none` since `Optional.none` overload does not
-// provide a valid solution because the struct's generic argument `T` cannot be infered in this context.
+let _: GenericEnumWithStaticNone? = .none // expected-warning {{assuming you mean 'GenericEnumWithStaticNone<Int>.none'; did you mean 'Optional<GenericEnumWithStaticNone<Int>>.none' instead?}}
+// expected-note@-1 {{use 'Optional<GenericEnumWithStaticNone<Int>>.none' instead}} {{37-37=Optional<GenericEnumWithStaticNone<Int>>}} 
+// expected-note@-2 {{use 'GenericEnumWithStaticNone<Int>.none' instead}} {{37-37=GenericEnumWithStaticNone<Int>}} 
+
+enum GenericStructWithStaticNone<T> {
+  init() {}
+  static var none: GenericStructWithStaticNone<Int> { GenericStructWithStaticNone<Int>() }
+}
+
+let _: GenericStructWithStaticNone<Int>? = .none // expected-warning {{assuming you mean 'Optional<GenericStructWithStaticNone<Int>>.none'; did you mean 'GenericStructWithStaticNone<Int>.none' instead?}}
+// expected-note@-1 {{explicitly specify 'Optional' to silence this warning}}{{44-44=Optional}}
+// expected-note@-2 {{use 'GenericStructWithStaticNone<Int>.none' instead}}{{44-44=GenericStructWithStaticNone<Int>}}
+let _: GenericStructWithStaticNone<String>? = .none // Okay
+
+let _: GenericStructWithStaticNone? = .none // expected-warning {{assuming you mean 'GenericStructWithStaticNone<Int>.none'; did you mean 'Optional<GenericStructWithStaticNone<Int>>.none' instead?}}
+// expected-note@-1 {{use 'Optional<GenericStructWithStaticNone<Int>>.none' instead}} {{39-39=Optional<GenericStructWithStaticNone<Int>>}} 
+// expected-note@-2 {{use 'GenericStructWithStaticNone<Int>.none' instead}} {{39-39=GenericStructWithStaticNone<Int>}} 
 
 enum GenericEnumWithoutNone<T> {
   case a