Optional case lowercase improvements: 26481304 (#2715)

* [Sema] Properly diagnose Optional lowercase rename of None/Some

Because Optional static var .None and static func .Some unavailable
stubs that were put in the standard library aren't imported from
C/Objective-C, the path that diagnoses renaming enum cases to lowercase
isn't triggered.

rdar://problem/26481304

* Optional case lowercase cleanups

- Use == operator for identifier comparison
- Add a test where the Optional isn't the top-level type

rdar://problem/26481304

Author: bitjammer

lib/Sema/TypeCheckPattern.cpp

@@ -17,6 +17,7 @@
 
 #include "TypeChecker.h"
 #include "GenericTypeResolver.h"
+#include "swift/Basic/StringExtras.h"
 #include "swift/AST/ExprHandle.h"
 #include "swift/AST/ASTWalker.h"
 #include "swift/AST/ASTVisitor.h"
@@ -1384,9 +1385,29 @@ bool TypeChecker::coercePatternToType(Pattern *&P, DeclContext *dc, Type type,
       if (type->getAnyNominal())
         elt = lookupEnumMemberElement(*this, dc, type, EEP->getName());
       if (!elt) {
-        if (!type->is<ErrorType>())
+        if (!type->is<ErrorType>()) {
+          // Lowercasing of Swift.Optional's cases is handled in the
+          // standard library itself, not through the clang importer,
+          // so we have to do this check here. Additionally, .Some
+          // isn't a static VarDecl, so the existing mechanics in
+          // extractEnumElement won't work.
+          if (type->getAnyNominal() == Context.getOptionalDecl()) {
+            if (EEP->getName().str() == "None" ||
+                EEP->getName().str() == "Some") {
+              SmallString<4> Rename;
+              camel_case::toLowercaseWord(EEP->getName().str(), Rename);
+              diagnose(EEP->getLoc(), diag::availability_decl_unavailable_rename,
+                          EEP->getName(), /*replaced*/false,
+                          /*special kind*/0, Rename.str())
+                .fixItReplace(EEP->getLoc(), Rename.str());
+
+            }
+            return true;
+          }
+
           diagnose(EEP->getLoc(), diag::enum_element_pattern_member_not_found,
                    EEP->getName().str(), type);
+        }
         return true;
       }
       enumTy = type;

test/1_stdlib/OptionalRenames.swift

@@ -0,0 +1,26 @@
+// RUN: %target-parse-verify-swift
+
+func getInt(x: Int) -> Int? {
+  if x == 0 {
+    return .None // expected-error {{'None' has been renamed to 'none'}} {{13-17=none}}
+  }
+  return .Some(1) // expected-error {{'Some' has been renamed to 'some'}} {{11-15=some}}
+}
+
+let x = Optional.Some(1) // expected-error {{'Some' has been renamed to 'some'}} {{18-22=some}}
+
+switch x {
+  case .None: break // expected-error {{'None' has been renamed to 'none'}} {{9-13=none}}
+  case .Some(let x): print(x) // expected-error {{'Some' has been renamed to 'some'}} {{9-13=some}}
+}
+
+let optionals: (Int?, Int?) = (Optional.Some(1), .None)
+// expected-error@-1 {{'Some' has been renamed to 'some'}} {{41-45=some}}
+// expected-error@-2 {{'None' has been renamed to 'none'}} {{51-55=none}}
+
+switch optionals {
+  case (.None, .none): break // expected-error {{'None' has been renamed to 'none'}} {{10-14=none}}
+  case (.Some(let left), .some(let right)): break // expected-error {{'Some' has been renamed to 'some'}} {{10-14=some}}
+  default: break
+}
+