Fix test failures

Author: calda

lib/Parse/ParseStmt.cpp

@@ -1635,10 +1635,12 @@ Parser::parseStmtConditionElement(SmallVectorImpl<StmtConditionElement> &result,
 
     declRefExpr->setImplicit();
     Init = makeParserResult(declRefExpr);
-  } else if (!ThePattern.isNull()) {
+  } else if (!ThePattern.isNull() && BindingKindStr != "case") {
     // If the pattern is present but isn't an identifier, the user wrote
     // something invalid like `let foo.bar`. Emit a special diagnostic for this,
     // with a fix-it prepending "<#identifier#> = "
+    //  - We don't emit this fix-it if the user wrote `case let` (etc),
+    //    since the shorthand syntax isn't available for pattern matching
     auto diagLoc = ThePattern.get()->getSemanticsProvidingPattern()->getStartLoc();
     diagnose(diagLoc, diag::conditional_var_valid_identifiers_only)
       .fixItInsert(diagLoc, "<#identifier#> = ");

test/stmt/if_while_var.swift

@@ -55,8 +55,8 @@ class B {} // expected-note * {{did you mean 'B'?}}
 class D : B {}// expected-note * {{did you mean 'D'?}}
 
 // TODO poor recovery in these cases
-if let {} // expected-error {{expected '{' after 'if' condition}} expected-error {{pattern matching in a condition requires the 'case' keyword}}
-if let x = { } // expected-error{{'{' after 'if'}} expected-error {{variable binding in a condition requires an initializer}} expected-error{{initializer for conditional binding must have Optional type, not '() -> ()'}}
+if let {} // expected-error {{expected '{' after 'if' condition}} expected-error {{pattern matching in a condition requires the 'case' keyword}} expected-error {{unwrap condition requires a valid identifier}}
+if let x = { } // expected-error{{'{' after 'if'}} expected-error{{initializer for conditional binding must have Optional type, not '() -> ()'}}
 // expected-warning@-1{{value 'x' was defined but never used}}
 
 if let x = foo() {